projects / debian / openrocket / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream
[debian/openrocket] / core / src / net / sf / openrocket / gui / dialogs / CustomMaterialDialog.java
diff --git a/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
index 5e5aece88236278b28b4e56ea451daa372f006f0..9ef95a9b6c38c4f505fb69638303f2358159e75b 100644 (file)
--- a/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
@@ -15,6 +15,7 @@ import javax.swing.JSpinner;
 import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.database.Databases;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.components.UnitSelector;
@@ -24,7 +25,8 @@ import net.sf.openrocket.material.Material;
 import net.sf.openrocket.startup.Application;
 
 public class CustomMaterialDialog extends JDialog {
-
+       private static final Translator trans = Application.getTranslator();
+       
        private final Material originalMaterial;
        
        private boolean okClicked = false;
@@ -34,14 +36,13 @@ public class CustomMaterialDialog extends JDialog {
        private JSpinner densitySpinner;
        private UnitSelector densityUnit;
        private JCheckBox addBox;
-       private static final Translator trans = Application.getTranslator();
-
+       
        public CustomMaterialDialog(Window parent, Material material, boolean saveOption,
                        String title) {
                this(parent, material, saveOption, title, null);
        }
        
-               
+       
        public CustomMaterialDialog(Window parent, Material material, boolean saveOption,
                        String title, String note) {
                //// Custom material
@@ -54,14 +55,14 @@ public class CustomMaterialDialog extends JDialog {
                
                // Add title and note
                if (title != null) {
-                       panel.add(new JLabel("<html><b>" + title + ":"), 
-                                       "gapleft para, span, wrap" + (note == null ? " para":""));
+                       panel.add(new JLabel("<html><b>" + title + ":"),
+                                       "gapleft para, span, wrap" + (note == null ? " para" : ""));
                }
                if (note != null) {
                        panel.add(new StyledLabel(note, -1), "span, wrap para");
                }
                
-
+               
                //// Material name
                panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialname")));
                nameField = new JTextField(15);
@@ -93,7 +94,7 @@ public class CustomMaterialDialog extends JDialog {
                panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialdensity")));
                densitySpinner = new JSpinner();
                panel.add(densitySpinner, "w 70lp");
-               densityUnit = new UnitSelector((DoubleModel)null);
+               densityUnit = new UnitSelector((DoubleModel) null);
                panel.add(densityUnit, "w 30lp");
                panel.add(new JPanel(), "growx, wrap");
                updateDensityModel();
@@ -103,9 +104,9 @@ public class CustomMaterialDialog extends JDialog {
                if (saveOption) {
                        //// Add material to database
                        addBox = new JCheckBox(trans.get("custmatdlg.checkbox.Addmaterial"));
-                       panel.add(addBox,"span, wrap");
+                       panel.add(addBox, "span, wrap");
                }
-                       
+               
                //// OK button
                JButton okButton = new JButton(trans.get("dlg.but.ok"));
                
@@ -116,7 +117,7 @@ public class CustomMaterialDialog extends JDialog {
                                CustomMaterialDialog.this.setVisible(false);
                        }
                });
-               panel.add(okButton,"span, split, tag ok");
+               panel.add(okButton, "span, split, tag ok");
                
                ////  Cancel
                JButton closeButton = new JButton(trans.get("dlg.but.cancel"));
@@ -127,7 +128,7 @@ public class CustomMaterialDialog extends JDialog {
                                CustomMaterialDialog.this.setVisible(false);
                        }
                });
-               panel.add(closeButton,"tag cancel");
+               panel.add(closeButton, "tag cancel");
                
                this.setContentPane(panel);
                this.pack();
@@ -149,7 +150,7 @@ public class CustomMaterialDialog extends JDialog {
        public Material getMaterial() {
                Material.Type type;
                String name;
-               double density;
+               double materialDensity;
                
                if (typeBox != null) {
                        type = (Material.Type) typeBox.getSelectedItem();
@@ -159,9 +160,9 @@ public class CustomMaterialDialog extends JDialog {
                
                name = nameField.getText().trim();
                
-               density = this.density.getValue();
+               materialDensity = this.density.getValue();
                
-               return Material.newMaterial(type, name, density, true);
+               return Databases.findMaterial(type, name, materialDensity);
        }
        
        
Debian packaging of openrocket