X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fpreset%2FMaterialModel.java;h=f51f2146bc8e6a7efbaad0bd94ee62e34baffe73;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=a80e6847e0e975777c54765ed42e754786ca4d84;hpb=a36a036d1b0ee59ac7764d2783cdec6f5ef1f772;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/preset/MaterialModel.java b/core/src/net/sf/openrocket/gui/preset/MaterialModel.java
index a80e6847..f51f2146 100644
--- a/core/src/net/sf/openrocket/gui/preset/MaterialModel.java
+++ b/core/src/net/sf/openrocket/gui/preset/MaterialModel.java
@@ -6,10 +6,12 @@ import net.sf.openrocket.database.Databases;
 import net.sf.openrocket.gui.dialogs.CustomMaterialDialog;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.material.Material;
+import net.sf.openrocket.preset.loader.MaterialHolder;
 import net.sf.openrocket.startup.Application;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.SwingUtilities;
+import java.awt.Component;
 
 /**
  * A material model specifically for presets.
@@ -22,9 +24,20 @@ public class MaterialModel extends DefaultComboBoxModel implements DatabaseListe
 
     private static final Translator trans = Application.getTranslator();
 
+    private Material.Type type;
+
     private Component parent;
-    public MaterialModel(Component theParent, Material.Type type) {
+
+    public MaterialModel(Component theParent, Material.Type theType, Database<Material> materials) {
         parent = theParent;
+        type = theType;
+        database = materials;
+        database.addDatabaseListener(this);
+    }
+
+    public MaterialModel(Component theParent, Material.Type theType) {
+        parent = theParent;
+        type = theType;
 
         switch (type) {
             case LINE:
@@ -59,9 +72,7 @@ public class MaterialModel extends DefaultComboBoxModel implements DatabaseListe
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    CustomMaterialDialog dialog = new CustomMaterialDialog(
-                            SwingUtilities.getWindowAncestor(parent),
-                            (Material) getSelectedItem(), true,
+                    CustomMaterialDialog dialog = new CustomMaterialDialog(SwingUtilities.getWindowAncestor(parent), (Material) getSelectedItem(), true,
                             //// Define custom material
                             trans.get("MaterialModel.title.Defcustmat"));
 
@@ -117,4 +128,11 @@ public class MaterialModel extends DefaultComboBoxModel implements DatabaseListe
         this.fireContentsChanged(this, 0, database.size());
     }
 
+    public Material.Type getType() {
+        return type;
+    }
+
+    public void removeListener() {
+        database.removeChangeListener(this);
+    }
 }