bug[ats_ATS349137]: Moving preference store out of start.

Having the call to preference store in the start method made the eclipse
workspace selection prompt be skipped.  Moved into the creation of the
Console instead.

Change-Id: Id53e1d501e45f39f701d910e5a2140c1bc873aa5

2 files changed, 17 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
index 66012953fb7..ec11f7064f8 100644
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
+++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/TestCoreGuiPlugin.java
@@ -55,8 +55,6 @@ public class TestCoreGuiPlugin extends AbstractUIPlugin {
       if (System.getProperty("NO_OTE_ARTIFACT_BULK_LOAD") == null) {
          startOTEArtifactBulkLoad();
       }
-      setDefaultPreferences();
-      
       super.start(context);
    }
 
diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/prefs/OteConsolePrefsUtil.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/prefs/OteConsolePrefsUtil.java
index 0760b0e6bfc..d4a6a2dadf4 100644
--- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/prefs/OteConsolePrefsUtil.java
+++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/internal/prefs/OteConsolePrefsUtil.java
@@ -18,15 +18,21 @@ import org.eclipse.osee.ote.ui.internal.TestCoreGuiPlugin;
 public class OteConsolePrefsUtil {
 
    public static int getInt(OteConsolePreferences bufferLimit) {
-      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getInt(bufferLimit.getPropKey());
+      String propKey = bufferLimit.getPropKey();
+      lateLoadDefaults(propKey);
+      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getInt(propKey);
    }
 
    public static String getString(OteConsolePreferences bufferLimit) {
-      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getString(bufferLimit.getPropKey());
+      String propKey = bufferLimit.getPropKey();
+      lateLoadDefaults(propKey);
+      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getString(propKey);
    }
    
    public static boolean getBoolean(OteConsolePreferences bufferLimit) {
-      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getBoolean(bufferLimit.getPropKey());
+      String propKey = bufferLimit.getPropKey();
+      lateLoadDefaults(propKey);
+      return TestCoreGuiPlugin.getDefault().getPreferenceStore().getBoolean(propKey);
    }
    
    public static void setInt(OteConsolePreferences preference, int value) {
@@ -40,5 +46,13 @@ public class OteConsolePrefsUtil {
    public static void setBoolean(OteConsolePreferences preference, boolean value) {
       TestCoreGuiPlugin.getDefault().getPreferenceStore().setValue(preference.getPropKey(), value);
    }
+   
+   private static void lateLoadDefaults(String keyStr) {
+      TestCoreGuiPlugin plugin = TestCoreGuiPlugin.getDefault();
+      String defaultString = plugin.getPreferenceStore().getDefaultString(keyStr);
+      if(defaultString == null || defaultString.length() <= 0) {
+         TestCoreGuiPlugin.setDefaultPreferences();
+      }
+   }
 
 }