De-localize Material and FlightDataType objects when persisting in ork files. Added...

[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..80eaae5ffb8657842b38b951829d94cabc55e106 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
@@ -1,19 +1,16 @@
 package net.sf.openrocket.preset.loader;
 
-import java.util.Collections;
-import java.util.Map;
-
 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;
@@ -27,17 +24,9 @@ public class SurfaceMaterialColumnParser extends BaseColumnParser {
                        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;
-               }
-               
-               props.put(param, myMaterial);
+               Material.Surface myMaterial = (Material.Surface) Material.newUserMaterial(Material.Type.SURFACE,columnData, 0.0);
+               Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null);
+               props.put(param, m!=null ? m : myMaterial);
 
        }