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

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

diff --git a/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java b/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
index 1e0f1ed2173cb42a70fb4d59ac9268661ae89615..3a8dbfaaed6e78ad70dfd13694d13f5dbb6ae53e 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
+++ b/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
@@ -3,6 +3,7 @@ package net.sf.openrocket.preset.loader;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import net.sf.openrocket.database.Database;
@@ -17,6 +18,17 @@ public class MaterialHolder {
 
        private final Map<String, Material.Line> lineMaterials = new HashMap<String,Material.Line>();
 
+       public MaterialHolder() {}
+       
+       public MaterialHolder( List<Material> materials ) {
+               if (materials == null) {
+                       return;
+               }
+               for (Material material : materials) {
+                       this.put(material);
+               }
+       }
+       
        public void put( Material material ) {
                switch ( material.getType() ) {
                case BULK:
@@ -31,9 +43,22 @@ public class MaterialHolder {
                }
        }
 
+       public Material getMaterial ( Material material ) {
+               switch ( material.getType() ) {
+               case BULK:
+                       return getBulkMaterial( (Material.Bulk)material );
+               case SURFACE:
+                       return getSurfaceMaterial( (Material.Surface) material, null );
+               case LINE:
+                       return getLineMaterial( (Material.Line) material );
+               default:
+                       return null;
+               }
+       }
+
        public Material.Bulk getBulkMaterial( Material.Bulk material ) {
                Material.Bulk m = bulkMaterials.get( material.getName() );
-               return (m==null) ? material : m;
+               return m;
        }
 
        public Material.Surface getSurfaceMaterial( Material.Surface material, Double thickness ) {
@@ -44,7 +69,7 @@ public class MaterialHolder {
                // Try to see if we can convert a bulk material.
                if ( thickness == null ) {
                        // if we have no thickness, there is nothing we can do
-                       return material;
+                       return null;
                }
                String thicknessName = UnitGroup.UNITS_LENGTH.getUnit("mm").toString(thickness);
                String convertedMaterialName = material.getName() + "(" + thicknessName + ")";
@@ -55,13 +80,13 @@ public class MaterialHolder {
                Material.Bulk bulk = bulkMaterials.get(material.getName() );
 
                if ( bulk == null ) {
-                       return material;
+                       return null;
                }
 
                // Ok, now we have a thickness and a bulk material of the correct name,
                // we can make our own surface material.
 
-               Material.Surface surface = new Material.Surface( convertedMaterialName, bulk.getDensity() * thickness , true);
+               Material.Surface surface = (Material.Surface) Material.newUserMaterial(Material.Type.SURFACE, convertedMaterialName, bulk.getDensity() * thickness);
 
                this.put(surface);
 
@@ -71,7 +96,7 @@ public class MaterialHolder {
 
        public Material.Line getLineMaterial( Material.Line material ) {
                Material.Line m = lineMaterials.get( material.getName() );
-               return (m==null) ? material : m;
+               return m;
        }
 
        public int size() {
@@ -89,19 +114,19 @@ public class MaterialHolder {
 
        }
 
-    public Database<Material> asDatabase(Material.Type theType) {
-        Database<Material> result = new Database<Material>();
-        switch (theType) {
-            case LINE:
-                result.addAll(lineMaterials.values());
-                break;
-            case SURFACE:
-                result.addAll(surfaceMaterials.values());
-                break;
-            case BULK:
-            default:
-                result.addAll(bulkMaterials.values());
-        }
-        return result;
-    }
+       public Database<Material> asDatabase(Material.Type theType) {
+               Database<Material> result = new Database<Material>();
+               switch (theType) {
+               case LINE:
+                       result.addAll(lineMaterials.values());
+                       break;
+               case SURFACE:
+                       result.addAll(surfaceMaterials.values());
+                       break;
+               case BULK:
+               default:
+                       result.addAll(bulkMaterials.values());
+               }
+               return result;
+       }
 }