Rework the CustomExpression evaluation to use SimulationListeners. Removed the OpenR...

[debian/openrocket] / core / src / net / sf / openrocket / gui / util / SwingPreferences.java

diff --git a/core/src/net/sf/openrocket/gui/util/SwingPreferences.java b/core/src/net/sf/openrocket/gui/util/SwingPreferences.java
index 40b4942afa6cac5cdd58b54debcd3b7caa1fa9c2..55aed61661ccdd53ffe12d9fe7c43f9b5f66ec33 100644 (file)
--- a/core/src/net/sf/openrocket/gui/util/SwingPreferences.java
+++ b/core/src/net/sf/openrocket/gui/util/SwingPreferences.java
@@ -15,7 +15,6 @@ import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
 import net.sf.openrocket.arch.SystemInfo;
-import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.logging.LogHelper;
 import net.sf.openrocket.material.Material;
@@ -399,7 +398,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
        }
        
        public Simulation getBackgroundSimulation(Rocket rocket) {
-               Simulation s = new Simulation(new OpenRocketDocument(rocket), rocket);
+               Simulation s = new Simulation(rocket);
                SimulationOptions cond = s.getOptions();
                
                cond.setTimeStep(RK4SimulationStepper.RECOMMENDED_TIME_STEP * 2);
@@ -471,6 +470,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
         * 
         * @param m             the material to add.
         */
+       @Override
        public void addUserMaterial(Material m) {
                Preferences prefs = PREFNODE.node("userMaterials");
                
@@ -498,6 +498,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
         * 
         * @param m             the material to remove.
         */
+       @Override
        public void removeUserMaterial(Material m) {
                Preferences prefs = PREFNODE.node("userMaterials");
                
@@ -508,7 +509,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
                                String value = prefs.get(key, null);
                                try {
                                        
-                                       Material existing = Material.fromStorableString(value, true);
+                                       Material existing = Material.fromStorableString(value);
                                        if (existing.equals(m)) {
                                                prefs.remove(key);
                                        }
@@ -530,6 +531,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
         * 
         * @return      a set of all user-defined materials.
         */
+       @Override
        public Set<Material> getUserMaterials() {
                Preferences prefs = PREFNODE.node("userMaterials");
                
@@ -540,7 +542,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
                                String value = prefs.get(key, null);
                                try {
                                        
-                                       Material m = Material.fromStorableString(value, true);
+                                       Material m = Material.fromStorableString(value);
                                        materials.add(m);
                                        
                                } catch (IllegalArgumentException e) {
@@ -556,8 +558,9 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
                return materials;
        }
        
-       public void setComponentFavorite( ComponentPreset preset, boolean favorite ) {
-               Preferences prefs = PREFNODE.node("favoritePresets");
+       @Override
+       public void setComponentFavorite( ComponentPreset preset, ComponentPreset.Type type, boolean favorite ) {
+               Preferences prefs = PREFNODE.node("favoritePresets").node(type.name());
                if ( favorite ) {
                        prefs.putBoolean(preset.preferenceKey(), true);
                } else {
@@ -565,8 +568,9 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
                }
        }
        
-       public Set<String> getComponentFavorites( ) {
-               Preferences prefs = PREFNODE.node("favoritePresets");
+       @Override
+       public Set<String> getComponentFavorites( ComponentPreset.Type type) {
+               Preferences prefs = PREFNODE.node("favoritePresets").node(type.name());
                Set<String> collection = new HashSet<String>();
                try {
                        collection.addAll( Arrays.asList(prefs.keys()));