X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fpreset%2Floader%2FLineMaterialColumnParser.java;h=eace7f3fb7dd1d5070ef4b046d6ed5888efaa7d0;hb=4da92a4e994992a78d62a7ca21c88d6c41292d6f;hp=c888845e0a074f7676c1d46d2506e01719c9322d;hpb=5d535a0ddafc681a7d5e539482ebf76014282453;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.java b/core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.java
index c888845e..eace7f3f 100644
--- a/core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.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 LineMaterialColumnParser extends BaseColumnParser {
 
-	private Map<String,Material> materialMap = Collections.<String,Material>emptyMap();
+	private final MaterialHolder materialMap;
 
 	private final TypedKey<Material> param;
 	
-	public LineMaterialColumnParser(Map<String,Material> materialMap, String columnName, TypedKey<Material> param) {
+	public LineMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) {
 		super(columnName);
 		this.param = param;
 		this.materialMap = materialMap;
@@ -27,17 +24,10 @@ public class LineMaterialColumnParser extends BaseColumnParser {
 			return;
 		}
 		
-		Material.Line myMaterial;
+		Material.Line myMaterial = (Material.Line) Material.newUserMaterial(Material.Type.LINE, columnData, 0.0);
 
-		Material m = materialMap.get(columnData);
-		
-		if ( m == null || m.getType() != Material.Type.LINE ) {
-			myMaterial = new Material.Line(columnData, 0.0, true);
-		} else {
-			myMaterial =(Material.Line) m;
-		}
-		
-		props.put(param, myMaterial);
+		Material.Line m = materialMap.getLineMaterial(myMaterial);
+		props.put(param, m!=null? m : myMaterial);
 
 	}