Issue #31, #19

mattcasters · Aug 1, 2019 · 7af53f8 · 7af53f8
1 parent dfa09a8
commit 7af53f8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/main/java/org/kettle/env/spoon/EnvironmentHelper.java b/src/main/java/org/kettle/env/spoon/EnvironmentHelper.java
@@ -165,6 +165,9 @@ public static void editActiveEnvironment() {
       if ( dialog.open() ) {
         MetaStoreFactory<Environment> factory = EnvironmentSingleton.getEnvironmentFactory();
         factory.saveElement( environment );
+        if (!environment.getName().equals( activeEnvironment )) {
+          factory.deleteElement( activeEnvironment );
+        }
         EnvironmentUtil.enableEnvironment( environment, spoon.getMetaStore() );
       }
 

diff --git a/src/main/java/org/kettle/env/util/EnvironmentUtil.java b/src/main/java/org/kettle/env/util/EnvironmentUtil.java
@@ -129,7 +129,9 @@ public static void enableEnvironment( Environment environment, DelegatingMetaSto
 
       // Refresh the currently active graph
       //
-      spoon.refreshGraph();
+      if (spoon.getActiveMeta()!=null) {
+        spoon.refreshGraph();
+      }
     }
   }
 

diff --git a/src/main/java/org/kettle/env/xp/SpoonStartEnvironmentPrompt.java b/src/main/java/org/kettle/env/xp/SpoonStartEnvironmentPrompt.java
@@ -63,19 +63,35 @@ public class SpoonStartEnvironmentPrompt implements ExtensionPointInterface {
           EnvironmentsDialog environmentsDialog = new EnvironmentsDialog( spoon.getShell(), spoon.getMetaStore() );
           selectedEnvironment = environmentsDialog.open();
         }
+
         if ( StringUtils.isNotEmpty( selectedEnvironment ) ) {
 
+          Environment environment = EnvironmentSingleton.getEnvironmentFactory().loadElement( selectedEnvironment );
+          if (environment==null) {
+            // Environment no longer exists, pop up dialog
+            //
+            EnvironmentsDialog environmentsDialog = new EnvironmentsDialog( spoon.getShell(), spoon.getMetaStore() );
+            selectedEnvironment = environmentsDialog.open();
+            if (selectedEnvironment==null) {
+              return; // Canceled
+            }
+            environment = EnvironmentSingleton.getEnvironmentFactory().loadElement( selectedEnvironment );
+          }
+
           // Save the last used configuration
           //
           EnvironmentConfigSingleton.getConfig().setLastUsedEnvironment( selectedEnvironment );
           EnvironmentConfigSingleton.saveConfig();
 
-          Environment environment = EnvironmentSingleton.getEnvironmentFactory().loadElement( selectedEnvironment );
-          logChannelInterface.logBasic( "Setting environment : '" + environment.getName() + "'" );
-
-          // Set system variables for KETTLE_HOME, PENTAHO_METASTORE_FOLDER, ...
+          // Double check!
           //
-          EnvironmentUtil.enableEnvironment( environment, spoon.getMetaStore() );
+          if (environment!=null) {
+            logChannelInterface.logBasic( "Setting environment : '" + environment.getName() + "'" );
+
+            // Set system variables for KETTLE_HOME, PENTAHO_METASTORE_FOLDER, ...
+            //
+            EnvironmentUtil.enableEnvironment( environment, spoon.getMetaStore() );
+          }
         }
       }
     } catch ( Exception e ) {