Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / gui / adaptors / MaterialModel.java

diff --git a/core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
index a914df00e2d49633787612108765426f354db4e9..c3ebf83596c2b57bc5465ad1898c79f7565f60cd 100644 (file)
--- a/core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
+++ b/core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
@@ -22,7 +22,7 @@ import net.sf.openrocket.util.Reflection;
 public class MaterialModel extends AbstractListModel implements
                ComboBoxModel, ComponentChangeListener, DatabaseListener<Material> {
        
-       private static final String CUSTOM = "Custom";
+       private final String custom;
 
        
        private final Component parentComponent;
@@ -47,6 +47,7 @@ public class MaterialModel extends AbstractListModel implements
                this.parentComponent = parent;
                this.component = component;
                this.type = type;
+               this.custom = trans.get ("Material.CUSTOM");
                
                switch (type) {
                case LINE:
@@ -90,7 +91,7 @@ public class MaterialModel extends AbstractListModel implements
                        return;
                }
 
-               if (item == CUSTOM) {
+               if (item == custom) {
                        
                        // Open custom material dialog in the future, after combo box has closed
                        SwingUtilities.invokeLater(new Runnable() {
@@ -129,7 +130,7 @@ public class MaterialModel extends AbstractListModel implements
        @Override
        public Object getElementAt(int index) {
                if (index == database.size()) {
-                       return CUSTOM;
+                       return custom;
                } else if (index >= database.size()+1) {
                        return null;
                }