create changelog entry

[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 fc797fbd872c9ce8ef193725f05731781785d789..703d128c3998a9f7dfb12f201e32c84f95c48447 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
@@ -1,44 +1,34 @@
 package net.sf.openrocket.preset.loader;
 
-import java.util.Collections;
-import java.util.Map;
-
+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 Map<String,Material> materialMap = Collections.<String,Material>emptyMap();
-
+       
+       private final MaterialHolder materialMap;
+       
        private final TypedKey<Material> param;
        
-       public SurfaceMaterialColumnParser(Map<String,Material> materialMap, String columnName, TypedKey<Material> param) {
+       public SurfaceMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) {
                super(columnName);
                this.param = param;
                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 m = materialMap.get(columnData);
-               
-               if ( m == null || m.getType() != Material.Type.SURFACE ) {
-                       myMaterial = new Material.Surface(columnData, 0.0, true);
-               } else {
-                       myMaterial =(Material.Surface) m;
-               }
+               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, myMaterial);
-
        }
-
+       
 }