De-localize Material and FlightDataType objects when persisting in ork files. Added...

[debian/openrocket] / core / src / net / sf / openrocket / startup / Preferences.java

diff --git a/core/src/net/sf/openrocket/startup/Preferences.java b/core/src/net/sf/openrocket/startup/Preferences.java
index 0a5e62b94e0441a75d7124e6976d7ab281a1f87c..b8270a14e193cb68ebeba93dac3273b136fd1e72 100644 (file)
--- a/core/src/net/sf/openrocket/startup/Preferences.java
+++ b/core/src/net/sf/openrocket/startup/Preferences.java
@@ -7,6 +7,7 @@ import java.util.Set;
 import net.sf.openrocket.database.Databases;\r
 import net.sf.openrocket.l10n.Translator;\r
 import net.sf.openrocket.material.Material;\r
+import net.sf.openrocket.preset.ComponentPreset;\r
 import net.sf.openrocket.rocketcomponent.BodyComponent;\r
 import net.sf.openrocket.rocketcomponent.FinSet;\r
 import net.sf.openrocket.rocketcomponent.InternalComponent;\r
@@ -233,7 +234,7 @@ public abstract class Preferences {
                String material = get("componentMaterials", componentClass, null);\r
                if (material != null) {\r
                        try {\r
-                               Material m = Material.fromStorableString(material, false);\r
+                               Material m = Material.fromStorableString(material);\r
                                if (m.getType() == type)\r
                                        return m;\r
                        } catch (IllegalArgumentException ignore) {\r
@@ -363,6 +364,9 @@ public abstract class Preferences {
        public abstract Set<Material> getUserMaterials();\r
        public abstract void removeUserMaterial(Material m);\r
 \r
+       public abstract void setComponentFavorite( ComponentPreset preset, boolean favorite );\r
+       public abstract Set<String> getComponentFavorites( );\r
+\r
        /*\r
         * Map of default line styles\r
         */\r
@@ -381,14 +385,13 @@ public abstract class Preferences {
                \r
                //// Elastic cord (round 2mm, 1/16 in)\r
                private static final Material DEFAULT_LINE_MATERIAL =\r
-                               Databases.findMaterial(Material.Type.LINE, trans.get("Databases.materials.Elasticcordround2mm"),\r
-                                               0.0018, false);\r
+                               Databases.findMaterial(Material.Type.LINE, "Elasticcordround2mm", trans.get("Databases.materials.Elasticcordround2mm"),0.0018);\r
                //// Ripstop nylon\r
                private static final Material DEFAULT_SURFACE_MATERIAL =\r
-                               Databases.findMaterial(Material.Type.SURFACE, trans.get("Databases.materials.Ripstopnylon"), 0.067, false);\r
+                               Databases.findMaterial(Material.Type.SURFACE, "Ripstopnylon", trans.get("Databases.materials.Ripstopnylon"), 0.067);\r
                //// Cardboard\r
                private static final Material DEFAULT_BULK_MATERIAL =\r
-                               Databases.findMaterial(Material.Type.BULK, trans.get("Databases.materials.Cardboard"), 680, false);\r
+                               Databases.findMaterial(Material.Type.BULK, "Cardboard", trans.get("Databases.materials.Cardboard"), 680);\r
        }\r
        \r
        private static final HashMap<Class<?>, String> DEFAULT_COLORS =\r