bug fixes and rocket optimization

[debian/openrocket] / src / net / sf / openrocket / file / openrocket / OpenRocketLoader.java

diff --git a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
index 090ee3ea0e4cae923ba1a7637133b92bafdfc6d0..a487e48c3c6988b76b96bb1b1b1f9b6356437757 100644 (file)
--- a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
+++ b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
@@ -14,8 +14,8 @@ import net.sf.openrocket.aerodynamics.WarningSet;
 import net.sf.openrocket.database.Databases;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
-import net.sf.openrocket.document.StorageOptions;
 import net.sf.openrocket.document.Simulation.Status;
+import net.sf.openrocket.document.StorageOptions;
 import net.sf.openrocket.file.RocketLoadException;
 import net.sf.openrocket.file.RocketLoader;
 import net.sf.openrocket.file.simplesax.ElementHandler;
@@ -35,7 +35,9 @@ import net.sf.openrocket.rocketcomponent.Clusterable;
 import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
 import net.sf.openrocket.rocketcomponent.EngineBlock;
 import net.sf.openrocket.rocketcomponent.ExternalComponent;
+import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.FinSet;
+import net.sf.openrocket.rocketcomponent.FinSet.TabRelativePosition;
 import net.sf.openrocket.rocketcomponent.FreeformFinSet;
 import net.sf.openrocket.rocketcomponent.IllegalFinPointException;
 import net.sf.openrocket.rocketcomponent.InnerTube;
@@ -52,6 +54,7 @@ import net.sf.openrocket.rocketcomponent.ReferenceType;
 import net.sf.openrocket.rocketcomponent.RingComponent;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.rocketcomponent.RocketComponent.Position;
 import net.sf.openrocket.rocketcomponent.ShockCord;
 import net.sf.openrocket.rocketcomponent.Stage;
 import net.sf.openrocket.rocketcomponent.Streamer;
@@ -61,15 +64,12 @@ import net.sf.openrocket.rocketcomponent.ThicknessRingComponent;
 import net.sf.openrocket.rocketcomponent.Transition;
 import net.sf.openrocket.rocketcomponent.TrapezoidFinSet;
 import net.sf.openrocket.rocketcomponent.TubeCoupler;
-import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
-import net.sf.openrocket.rocketcomponent.FinSet.TabRelativePosition;
-import net.sf.openrocket.rocketcomponent.RocketComponent.Position;
 import net.sf.openrocket.simulation.FlightData;
 import net.sf.openrocket.simulation.FlightDataBranch;
 import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.simulation.FlightEvent;
-import net.sf.openrocket.simulation.GUISimulationConditions;
 import net.sf.openrocket.simulation.FlightEvent.Type;
+import net.sf.openrocket.simulation.GUISimulationConditions;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
@@ -244,9 +244,9 @@ class DocumentConfig {
                
                // BodyTube
                setters.put("BodyTube:radius", new DoubleSetter(
-                               Reflection.findMethodStatic(BodyTube.class, "setRadius", double.class),
+                               Reflection.findMethodStatic(BodyTube.class, "setOuterRadius", double.class),
                                "auto",
-                               Reflection.findMethodStatic(BodyTube.class, "setRadiusAutomatic", boolean.class)));
+                               Reflection.findMethodStatic(BodyTube.class, "setOuterRadiusAutomatic", boolean.class)));
                
                // Transition
                setters.put("Transition:shape", new EnumSetter<Transition.Shape>(
@@ -329,7 +329,7 @@ class DocumentConfig {
                
                // LaunchLug
                setters.put("LaunchLug:radius", new DoubleSetter(
-                               Reflection.findMethodStatic(LaunchLug.class, "setRadius", double.class)));
+                               Reflection.findMethodStatic(LaunchLug.class, "setOuterRadius", double.class)));
                setters.put("LaunchLug:length", new DoubleSetter(
                                Reflection.findMethodStatic(LaunchLug.class, "setLength", double.class)));
                setters.put("LaunchLug:thickness", new DoubleSetter(
@@ -753,7 +753,6 @@ class ComponentParameterHandler extends ElementHandler {
                        Setter s = DocumentConfig.setters.get(setterKey);
                        if (s != null) {
                                // Setter found
-                               System.out.println("Calling with key " + setterKey);
                                s.set(component, content, attributes, warnings);
                                break;
                        }
@@ -1670,6 +1669,7 @@ class StringSetter implements Setter {
                setMethod = set;
        }
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                setMethod.invoke(c, s);
@@ -1684,6 +1684,7 @@ class IntSetter implements Setter {
                setMethod = set;
        }
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                try {
@@ -1704,6 +1705,7 @@ class BooleanSetter implements Setter {
                setMethod = set;
        }
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -1768,6 +1770,7 @@ class DoubleSetter implements Setter {
        }
        
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -1799,6 +1802,7 @@ class OverrideSetter implements Setter {
                this.enabledMethod = enabledMethod;
        }
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -1845,6 +1849,7 @@ class ColorSetter implements Setter {
                setMethod = set;
        }
        
+       @Override
        public void set(RocketComponent c, String s, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -1892,6 +1897,7 @@ class MaterialSetter implements Setter {
                this.type = type;
        }
        
+       @Override
        public void set(RocketComponent c, String name, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -1948,6 +1954,7 @@ class MaterialSetter implements Setter {
 
 class PositionSetter implements Setter {
        
+       @Override
        public void set(RocketComponent c, String value, HashMap<String, String> attributes,
                        WarningSet warnings) {
                
@@ -2023,6 +2030,7 @@ class FinTabPositionSetter extends DoubleSetter {
 
 class ClusterConfigurationSetter implements Setter {
        
+       @Override
        public void set(RocketComponent component, String value, HashMap<String, String> attributes,
                        WarningSet warnings) {