diff --git a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java index 3db31341c..8e3bcabb2 100644 --- a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java +++ b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java @@ -228,14 +228,16 @@ public abstract class BaseComponentDTO { static class AnnotatedLengthDTO { @XmlAttribute(name = "Unit", required = false) - private final String unitName = "m"; + private final String unitName; @XmlValue private double length; AnnotatedLengthDTO() { + this.unitName = "m"; } AnnotatedLengthDTO(double length) { + this.unitName = "m"; this.length = length; } @@ -246,14 +248,16 @@ public abstract class BaseComponentDTO { static class AnnotatedMassDTO { @XmlAttribute(name = "Unit", required = false) - private final String unitName = "kg"; + private final String unitName; @XmlValue private double mass; AnnotatedMassDTO() { + unitName = "kg"; } AnnotatedMassDTO(double mass) { + unitName = "kg"; this.mass = mass; } diff --git a/swing/build.xml b/swing/build.xml index d74eba620..cb86eab5c 100644 --- a/swing/build.xml +++ b/swing/build.xml @@ -125,11 +125,13 @@ - - + + + + @@ -138,7 +140,7 @@ Generating ORC file for vendor @{vendor} - diff --git a/swing/resources-src/datafiles/presets/Estes.orc b/swing/resources-src/datafiles/legacy_components/Estes.orc similarity index 100% rename from swing/resources-src/datafiles/presets/Estes.orc rename to swing/resources-src/datafiles/legacy_components/Estes.orc diff --git a/swing/resources-src/datafiles/presets/LocPrecision.orc b/swing/resources-src/datafiles/legacy_components/LocPrecision.orc similarity index 100% rename from swing/resources-src/datafiles/presets/LocPrecision.orc rename to swing/resources-src/datafiles/legacy_components/LocPrecision.orc diff --git a/swing/resources-src/datafiles/presets/Quest.orc b/swing/resources-src/datafiles/legacy_components/Quest.orc similarity index 100% rename from swing/resources-src/datafiles/presets/Quest.orc rename to swing/resources-src/datafiles/legacy_components/Quest.orc diff --git a/swing/resources-src/datafiles/presets/bluetube.orc b/swing/resources-src/datafiles/legacy_components/bluetube.orc similarity index 100% rename from swing/resources-src/datafiles/presets/bluetube.orc rename to swing/resources-src/datafiles/legacy_components/bluetube.orc diff --git a/swing/resources-src/datafiles/presets/bms.orc b/swing/resources-src/datafiles/legacy_components/bms.orc similarity index 100% rename from swing/resources-src/datafiles/presets/bms.orc rename to swing/resources-src/datafiles/legacy_components/bms.orc diff --git a/swing/resources-src/datafiles/presets/fliskits.orc b/swing/resources-src/datafiles/legacy_components/fliskits.orc similarity index 100% rename from swing/resources-src/datafiles/presets/fliskits.orc rename to swing/resources-src/datafiles/legacy_components/fliskits.orc diff --git a/swing/resources-src/datafiles/presets/giantleaprocketry.orc b/swing/resources-src/datafiles/legacy_components/giantleaprocketry.orc similarity index 100% rename from swing/resources-src/datafiles/presets/giantleaprocketry.orc rename to swing/resources-src/datafiles/legacy_components/giantleaprocketry.orc diff --git a/swing/resources-src/datafiles/presets/publicmissiles.orc b/swing/resources-src/datafiles/legacy_components/publicmissiles.orc similarity index 100% rename from swing/resources-src/datafiles/presets/publicmissiles.orc rename to swing/resources-src/datafiles/legacy_components/publicmissiles.orc diff --git a/swing/resources-src/datafiles/presets/semroc.orc b/swing/resources-src/datafiles/legacy_components/semroc.orc similarity index 100% rename from swing/resources-src/datafiles/presets/semroc.orc rename to swing/resources-src/datafiles/legacy_components/semroc.orc diff --git a/swing/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/bluetube/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/bluetube/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/bluetube/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/bluetube/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/bluetube/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/bluetube/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/bluetube/readme.txt b/swing/resources-src/datafiles/rocksim_src/bluetube/readme.txt similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bluetube/readme.txt rename to swing/resources-src/datafiles/rocksim_src/bluetube/readme.txt diff --git a/swing/resources-src/datafiles/rocksim_components/bms/BHdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/BHdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/BHdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/BHdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/BTdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/BTdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/BTdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/BTdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/CRdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/CRdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/CRdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/CRdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/LLdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/LLdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/LLdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/LLdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/bms/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/bms/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/bms/NCdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/NCdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/NCdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/NCdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/TCdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/TCdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/TCdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/TCdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/TRdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/TRdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/TRdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/TRdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/bms/ebdata.csv b/swing/resources-src/datafiles/rocksim_src/bms/ebdata.csv similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/bms/ebdata.csv rename to swing/resources-src/datafiles/rocksim_src/bms/ebdata.csv diff --git a/swing/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/EBDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/EBDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/LLDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/LLDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/estes/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/MODATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/MODATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/MODATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/NCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/NCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/PCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/PCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/estes/TRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/estes/TRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/BHDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/BHDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/CRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/CRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/LLDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/LLDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/MODATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/MODATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/NCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/NCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/PCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/PCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/giantleaprocketry/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/giantleaprocketry/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/BHDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/BHDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/CFDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/CFDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/CRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/CRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/EBDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/EBDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/FSDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/FSDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/GRAPHS.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/GRAPHS.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/LLDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/LLDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/MODATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/MODATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/NCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/NCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/PCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/PCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/SLDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/SLDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/STDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/STDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/publicmissiles/TRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/publicmissiles/TRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/CRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/CRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/EBDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/EBDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/quest/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/NCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/NCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/PCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/PCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/STDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/STDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/STDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/quest/TRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/quest/TRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/BHDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/BHDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/BTDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/BTDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/CRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/CRDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/EBDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/EBDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/LLDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/LLDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/MATERIAL.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/MATERIAL.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/NCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/NCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/PCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/PCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/STDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/STDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/TCDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/TCDATA.CSV diff --git a/swing/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_src/semroc/TRDATA.CSV similarity index 100% rename from swing/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_src/semroc/TRDATA.CSV diff --git a/swing/resources/datafiles/presets/system.ser b/swing/resources/datafiles/presets/system.ser index 28a7bbe93..8cc48cdf2 100644 Binary files a/swing/resources/datafiles/presets/system.ser and b/swing/resources/datafiles/presets/system.ser differ diff --git a/swing/src/net/sf/openrocket/utils/SerializePresets.java b/swing/src/net/sf/openrocket/utils/SerializePresets.java index fb082f53b..d872fc223 100644 --- a/swing/src/net/sf/openrocket/utils/SerializePresets.java +++ b/swing/src/net/sf/openrocket/utils/SerializePresets.java @@ -17,6 +17,11 @@ import net.sf.openrocket.preset.xml.OpenRocketComponentLoader; import net.sf.openrocket.util.Pair; public class SerializePresets extends BasicApplication { + + private static void printUsage() { + System.err.println("SerializePresets ... "); + System.err.println(" (may be repeated) is base directory for a set of .orc preset files"); + } /** * @param args @@ -26,25 +31,36 @@ public class SerializePresets extends BasicApplication { SerializePresets app = new SerializePresets(); app.initializeApplication(); + if (args.length < 1) { + printUsage(); + throw new IllegalArgumentException("Invalid Command Line Params"); + } + Locale.setDefault(Locale.ENGLISH); ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(); - - FileIterator iterator = DirectoryIterator.findDirectory("resources-src/datafiles/presets", new SimpleFileFilter("", false, "orc")); - - if (iterator == null) { - throw new RuntimeException("Can't find resources-src/presets directory"); - } - while (iterator.hasNext()) { - Pair f = iterator.next(); - String fileName = f.getU(); - InputStream is = f.getV(); + + for (int i = 0; i < args.length; i++) { + + System.err.println("Processing .orc files in directory " + args[i]); - OpenRocketComponentLoader loader = new OpenRocketComponentLoader(); - Collection presets = loader.load(is, fileName); - - componentPresetDao.addAll(presets); + FileIterator iterator = DirectoryIterator.findDirectory(args[i], new SimpleFileFilter("", false, "orc")); + if (iterator == null) { + throw new RuntimeException("Can't find " + args[i] + " directory"); + } + while (iterator.hasNext()) { + Pair f = iterator.next(); + String fileName = f.getU(); + InputStream is = f.getV(); + + OpenRocketComponentLoader loader = new OpenRocketComponentLoader(); + Collection presets = loader.load(is, fileName); + + componentPresetDao.addAll(presets); + + } + } List list = componentPresetDao.listAll();