X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fpreset%2Fxml%2FBaseComponentDTO.java;h=b39bc23ec4245a2cb3cb07e3e1d9be36d58a903e;hb=4da92a4e994992a78d62a7ca21c88d6c41292d6f;hp=52029304989ba691213486cd5d3610922808a79b;hpb=62408659e7ab5cf73bce0038d8fb918b3a93afac;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java
index 52029304..b39bc23e 100644
--- a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java
+++ b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java
@@ -196,16 +196,7 @@ public abstract class BaseComponentDTO {
         	return m;
         }
 
-        switch( dto.getORMaterialType() ) {
-        case BULK:
-			return new Material.Bulk(dto.material, 0.0, true);
-        case SURFACE:
-			return new Material.Surface(dto.material, 0.0, true);
-        case LINE:
-			return new Material.Line(dto.material, 0.0, true);
-        }
-        
-        return null;
+        return Material.newUserMaterial(dto.getORMaterialType(), dto.material, 0.0);
 
 	}
 
@@ -269,6 +260,7 @@ public abstract class BaseComponentDTO {
 	}
 
     static class Base64Adapter extends XmlAdapter<String, byte[]> {
+    	@Override
         public byte[] unmarshal(String s) {
             if (s == null) {
                 return null;
@@ -276,6 +268,7 @@ public abstract class BaseComponentDTO {
             return DatatypeConverter.parseBase64Binary(s);
         }
 
+    	@Override
         public String marshal(byte[] bytes) {
             if (bytes == null) {
                 return null;