Save settings to the correct location

Author: Redande

tmc-plugin/src/fi/helsinki/cs/tmc/actions/MigrateSettings.java

@@ -0,0 +1,33 @@
+package fi.helsinki.cs.tmc.actions;
+
+import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
+import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
+import fi.helsinki.cs.tmc.model.PersistableSettings;
+
+import java.util.logging.Logger;
+import java.util.prefs.BackingStoreException;
+
+public class MigrateSettings {
+    
+    private static Logger logger = Logger.getLogger(MigrateSettings.class.getName());
+    
+    public static void run() {
+        PersistableSettings rightSettings = PersistableSettings.forModule(TmcCoreSettingsImpl.class);
+        PersistableSettings wrongSettings = PersistableSettings.forModule(TmcSettings.class);
+        try {
+            final String[] keys = wrongSettings.getPreferences().keys();
+            for (String key : keys) {
+                String wrongValue = wrongSettings.get(key, null);
+                if (wrongValue == null) {
+                    continue;
+                }
+                rightSettings.put(key, wrongValue);
+                wrongSettings.remove(key);
+            }
+            wrongSettings.saveAll();
+            rightSettings.saveAll();
+        } catch (BackingStoreException ex) {
+            logger.fine("Could not migrate wrong settings.");
+        }
+    }
+}

tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java

@@ -43,6 +43,8 @@ public void restored() {
         WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
             @Override
             public void run() {
+                MigrateSettings.run();
+
                 CheckForOutdatedNetbeans.run();
 
                 TmcCore.setInstance(new TmcCore());

tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java

@@ -37,7 +37,7 @@ public class TmcCoreSettingsImpl implements TmcSettings {
     private static final String PREF_RESOLVE_DEPENDENCIES = "resolveDependencies";
     private static final String PREF_SEND_DIAGNOSTICS = "sendDiagnostics";
 
-    private static PersistableSettings settings = PersistableSettings.forModule(TmcSettings.class);
+    private static PersistableSettings settings = PersistableSettings.forModule(TmcCoreSettingsImpl.class);
 
     private Tailoring tailoring = SelectedTailoring.get();
     private TmcEventBus eventBus = TmcEventBus.getDefault();

tmc-plugin/src/fi/helsinki/cs/tmc/model/PersistableSettings.java

@@ -83,6 +83,10 @@ public void cancel() {
         transients.clear();
     }
 
+    public Preferences getPreferences() {
+        return prefs;
+    }
+
     private void flushPrefsOrThrow() {
         try {
             prefs.flush();