Material localization support

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / SurfaceMaterialColumnParser.java

diff --git a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
index 80eaae5ffb8657842b38b951829d94cabc55e106..703d128c3998a9f7dfb12f201e32c84f95c48447 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
@@ -1,13 +1,14 @@
 package net.sf.openrocket.preset.loader;
 
+import net.sf.openrocket.database.Databases;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.preset.TypedKey;
 import net.sf.openrocket.preset.TypedPropertyMap;
 
 public class SurfaceMaterialColumnParser extends BaseColumnParser {
-
+       
        private final MaterialHolder materialMap;
-
+       
        private final TypedKey<Material> param;
        
        public SurfaceMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) {
@@ -16,18 +17,18 @@ public class SurfaceMaterialColumnParser extends BaseColumnParser {
                this.materialMap = materialMap;
        }
        
-
+       
        @Override
        protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
-
-               if ( columnData == null || "".equals(columnData.trim())) {
+               
+               if (columnData == null || "".equals(columnData.trim())) {
                        return;
                }
                
-               Material.Surface myMaterial = (Material.Surface) Material.newUserMaterial(Material.Type.SURFACE,columnData, 0.0);
+               Material.Surface myMaterial = (Material.Surface) Databases.findMaterial(Material.Type.SURFACE, columnData, 0.0);
                Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null);
-               props.put(param, m!=null ? m : myMaterial);
-
+               props.put(param, m != null ? m : myMaterial);
+               
        }
-
+       
 }