create changelog entry

[debian/openrocket] / core / src / net / sf / openrocket / preset / xml / OpenRocketComponentDTO.java

diff --git a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentDTO.java b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentDTO.java
index 51c868539844d90b41c5a6971d7227b63b4f1fb8..69da4e859154046a9bb25f7465dc8795beb4d991 100644 (file)
--- a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentDTO.java
+++ b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentDTO.java
@@ -1,7 +1,7 @@
 package net.sf.openrocket.preset.xml;
 
-import net.sf.openrocket.preset.ComponentPreset;
-import net.sf.openrocket.preset.InvalidComponentPresetException;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -10,8 +10,10 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.List;
+
+import net.sf.openrocket.material.Material;
+import net.sf.openrocket.preset.ComponentPreset;
+import net.sf.openrocket.preset.InvalidComponentPresetException;
 
 /**
  * The real 'root' element in an XML document.
@@ -35,7 +37,10 @@ public class OpenRocketComponentDTO {
             @XmlElementRef(name = "Transitions", type = TransitionDTO.class),
             @XmlElementRef(name = "BulkHeads", type = BulkHeadDTO.class),
             @XmlElementRef(name = "CenteringRings", type = CenteringRingDTO.class),
-            @XmlElementRef(name = "EngineBlocks", type = EngineBlockDTO.class)})
+            @XmlElementRef(name = "EngineBlocks", type = EngineBlockDTO.class),
+            @XmlElementRef(name = "LaunchLugs", type = LaunchLugDTO.class),
+            @XmlElementRef(name = "Streamers", type = StreamerDTO.class),
+            @XmlElementRef(name = "Parachutes", type = ParachuteDTO.class)})
     private List<BaseComponentDTO> components = new ArrayList<BaseComponentDTO>();
 
     public OpenRocketComponentDTO() {
@@ -71,10 +76,18 @@ public class OpenRocketComponentDTO {
     }
 
     public List<ComponentPreset> asComponentPresets() throws InvalidComponentPresetException {
-        List<ComponentPreset> result = new ArrayList<ComponentPreset>();
+        List<ComponentPreset> result = new ArrayList<ComponentPreset>(components.size());
         for (int i = 0; i < components.size(); i++) {
             result.add(components.get(i).asComponentPreset(materials));
         }
         return result;
     }
+    
+    public List<Material> asMaterialList() {
+       List<Material> result = new ArrayList<Material>( materials.size() );
+       for( MaterialDTO material : materials ) {
+               result.add( material.asMaterial() );
+       }
+       return result;
+    }
 }