Merge pull request #5286 from hansva/5280

NPE and some other dispose errors, fixes #5280

Author: hansva

ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java

@@ -3915,6 +3915,9 @@ public void checkEmptyExtraView() {
   }
 
   private void disposeExtraView() {
+    if (extraViewTabFolder == null) {
+      return;
+    }
 
     extraViewTabFolder.dispose();
     sashForm.layout();

ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java

@@ -471,6 +471,12 @@ public static HopGuiWorkflowGraph getInstance() {
     return HopGui.getActiveWorkflowGraph();
   }
 
+  @Override
+  public void dispose() {
+    disposeExtraView();
+    super.dispose();
+  }
+
   protected void hideToolTips() {
     toolTip.setVisible(false);
   }
@@ -3468,6 +3474,10 @@ private void rotateExtraView() {
   }
 
   private void disposeExtraView() {
+    if (extraViewTabFolder == null) {
+      return;
+    }
+
     extraViewTabFolder.dispose();
     sashForm.layout();
     sashForm.setWeights(100);

ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopDataOrchestrationPerspective.java

@@ -711,19 +711,15 @@ public void closeTab(CTabFolderEvent event, CTabItem tabItem) {
 
     // Switch to the previous tab
     //
-    if (tabIndex >= 0) {
+    if (tabIndex >= 0 && tabFolder.getItemCount() >= 1) {
       // If last
       if (tabIndex == tabFolder.getItemCount()) {
         tabIndex--;
       }
 
       tabItem = tabFolder.getItem(tabIndex);
-      if (tabIndex < 0) {
-        tabIndex = tabFolder.getItemCount() - 1;
-      }
 
       TabItemHandler activeItem = (TabItemHandler) tabItem.getData();
-      // tabFolder.setSelection(activeIndex);
       activeItem.getTypeHandler().updateGui();
     }
 

ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java

@@ -605,13 +605,13 @@ public void onRenameMetadata() {
             switch (event.keyCode) {
               case SWT.CR, SWT.KEYPAD_CR:
                 // If name changed
-                if (!item.getText().equals(text.getText())) {
+                if (!objectName.equals(text.getText())) {
                   try {
                     MetadataManager<IHopMetadata> manager = getMetadataManager(objectKey);
                     if (manager.rename(objectName, text.getText())) {
-                      item.setText(text.getText());
                       text.dispose();
                     }
+                    hopGui.getEventsHandler().fire(HopGuiEvents.MetadataChanged.name());
                   } catch (Exception e) {
                     new ErrorDialog(
                         getShell(),
@@ -633,12 +633,6 @@ public void onRenameMetadata() {
       text.selectAll();
       text.setFocus();
       treeEditor.setEditor(text, item);
-
-      try {
-        hopGui.getEventsHandler().fire(HopGuiEvents.MetadataChanged.name());
-      } catch (HopException e) {
-        throw new RuntimeException("Error fire metadata changed event", e);
-      }
     }
   }