For the short term put the user material functions in the base Preferences.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@258 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/database/Databases.java b/src/net/sf/openrocket/database/Databases.java
index 4652445a4af318d713f479ceb95be761aecfba48..d8a132b02345037f2ca840d09f638dd78b1302ad 100644 (file)
--- a/src/net/sf/openrocket/database/Databases.java
+++ b/src/net/sf/openrocket/database/Databases.java
@@ -1,6 +1,5 @@
 package net.sf.openrocket.database;
 
-import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.LogHelper;
 import net.sf.openrocket.material.Material;
@@ -96,7 +95,7 @@ public class Databases {
                
 
                // Add user-defined materials
-               for (Material m : ((SwingPreferences) Application.getPreferences()).getUserMaterials()) {
+               for (Material m : Application.getPreferences().getUserMaterials()) {
                        switch (m.getType()) {
                        case LINE:
                                LINE_MATERIAL.add(m);

diff --git a/src/net/sf/openrocket/material/MaterialStorage.java b/src/net/sf/openrocket/material/MaterialStorage.java
index 5438ece289afa057de607b5e57de97af77074b4c..0d7f11b44a7637f3aab6b6ca7a10ec12020f29ec 100644 (file)
--- a/src/net/sf/openrocket/material/MaterialStorage.java
+++ b/src/net/sf/openrocket/material/MaterialStorage.java
@@ -2,7 +2,6 @@ package net.sf.openrocket.material;
 
 import net.sf.openrocket.database.Database;
 import net.sf.openrocket.database.DatabaseListener;
-import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.startup.Application;
 
 /**
@@ -16,13 +15,13 @@ public class MaterialStorage implements DatabaseListener<Material> {
        @Override
        public void elementAdded(Material material, Database<Material> source) {
                if (material.isUserDefined()) {
-                       ((SwingPreferences) Application.getPreferences()).addUserMaterial(material);
+                       Application.getPreferences().addUserMaterial(material);
                }
        }
 
        @Override
        public void elementRemoved(Material material, Database<Material> source) {
-               ((SwingPreferences) Application.getPreferences()).removeUserMaterial(material);
+               Application.getPreferences().removeUserMaterial(material);
        }
 
 }

diff --git a/src/net/sf/openrocket/startup/Preferences.java b/src/net/sf/openrocket/startup/Preferences.java
index e728d396f0c0f405bef140319b165945714c260c..0a5e62b94e0441a75d7124e6976d7ab281a1f87c 100644 (file)
--- a/src/net/sf/openrocket/startup/Preferences.java
+++ b/src/net/sf/openrocket/startup/Preferences.java
@@ -2,6 +2,7 @@ package net.sf.openrocket.startup;
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
+import java.util.Set;\r
 \r
 import net.sf.openrocket.database.Databases;\r
 import net.sf.openrocket.l10n.Translator;\r
@@ -358,6 +359,10 @@ public abstract class Preferences {
                return null;\r
        }\r
 \r
+       public abstract void addUserMaterial(Material m);\r
+       public abstract Set<Material> getUserMaterials();\r
+       public abstract void removeUserMaterial(Material m);\r
+\r
        /*\r
         * Map of default line styles\r
         */\r