cleared some minor TODOs

diff --git a/MotorIOTest.xml b/MotorIOTest.xml
index 52d462d4804275b360f8bf7403500800325f1254..2bc2171c0422c2512306a5dba60aafa3cfa190c3 100644 (file)
--- a/MotorIOTest.xml
+++ b/MotorIOTest.xml
@@ -5,10 +5,10 @@
       <OD>31 mm</OD>
       <length>200 mm</length>
     </chamber>
-    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSU" serialization="custom">
+    <fuel class="com.billkuker.rocketry.motorsim.fuel.KNSB" serialization="custom">
       <java.net.URI>
         <default>
-          <string>motorsim:KNSU</string>
+          <string>motorsim:KNSB</string>
         </default>
       </java.net.URI>
     </fuel>
@@ -23,6 +23,7 @@
         <length>70 mm</length>
         <outerSurfaceInhibited>true</outerSurfaceInhibited>
       </grain>
+      <spacing>5 mm</spacing>
     </grain>
     <name>IOTestMotor</name>
     <nozzle class="com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle">

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
index ce85bc2c480e9b88ad0878c29cd923cf09611b41..9040386106c7a88bb4d0e813b27a44edf1100c78 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -324,14 +324,11 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel implem
                                }\r
                        });\r
                } catch (IllegalArgumentException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+                       log.error(e);\r
                } catch (IllegalAccessException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+                       log.error(e);\r
                } catch (InvocationTargetException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+                       log.error(e);\r
                }\r
                log.debug(f.getName() + " " + calculatedSkip + " Done");\r
        }\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
index 29ceccee697feb17cfcf228e120405e47a1ab8d1..c22398c74d6e454724d2dd46c50d322b687a4c60 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -90,8 +90,7 @@ public class Editor extends PropertySheetPanel {
                                        log.debug("Writing properties to object.");\r
                                        writeToObject(obj);\r
                                } catch (Exception v) {\r
-                                       // TODO\r
-                                       v.printStackTrace();\r
+                                       log.error(v);\r
                                        java.awt.Toolkit.getDefaultToolkit().beep();\r
                                } finally {\r
                                        readFromObject(obj);\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index 35974ec0efbb4ef8a81702591036bc69e7ae4763..0e42dd8a6f89fe86a2bed1a12841e041edc323c3 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
@@ -26,12 +26,15 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;\r
 import javax.swing.event.ChangeListener;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.ChangeListening;\r
 import com.billkuker.rocketry.motorsim.Grain;\r
 \r
 public class GrainPanel extends JPanel {\r
+       private static Logger log = Logger.getLogger(GrainPanel.class);\r
+                       \r
        private static final long serialVersionUID = 1L;\r
        private Amount<Length> displayedRegression = Amount.valueOf(0, SI.MILLIMETER);\r
        private JLabel l = new JLabel();\r
@@ -77,11 +80,9 @@ public class GrainPanel extends JPanel {
                        \r
 \r
                } catch (ClassCastException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+                       log.error(e);\r
                } catch (NoSuchMethodException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+                       log.error(e);\r
                }\r
                \r
                addComponents(\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index f08c4f5f370324018c9dd0703ccd71595eb14835..38e47fb38822be08473c48ddc18668cf488dcbb8 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -395,11 +395,9 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                                                }\r
                                                return motor.getChamber();\r
                                        } catch (InstantiationException e) {\r
-                                               // TODO Auto-generated catch block\r
-                                               e.printStackTrace();\r
+                                               log.error(e);\r
                                        } catch (IllegalAccessException e) {\r
-                                               // TODO Auto-generated catch block\r
-                                               e.printStackTrace();\r
+                                               log.error(e);\r
                                        }\r
                                        return null;\r
                                }\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
index 181a8514ddf2c08d378692c617a9802e1cd12a8e..d7064ea475ef8a2afa7ebd8f1cec5674eefffbbd 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
@@ -23,6 +23,8 @@ import javax.swing.JScrollPane;
 import javax.swing.JSeparator;\r
 import javax.swing.JTabbedPane;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
 import com.billkuker.rocketry.motorsim.Burn;\r
 import com.billkuker.rocketry.motorsim.Motor;\r
 import com.billkuker.rocketry.motorsim.io.ENGExporter;\r
@@ -32,6 +34,8 @@ import com.billkuker.rocketry.motorsim.visual.MultiObjectEditor;
 import com.billkuker.rocketry.motorsim.visual.RememberJFrame;\r
 \r
 public class MotorsEditor extends MultiObjectEditor<Motor, MotorEditor> {\r
+       private static Logger log = Logger.getLogger(MotorsEditor.class);\r
+                       \r
        private static final long serialVersionUID = 1L;\r
 \r
        MultiMotorThrustChart mbc = new MultiMotorThrustChart();\r
@@ -166,8 +170,7 @@ public class MotorsEditor extends MultiObjectEditor<Motor, MotorEditor> {
                                                                        try {\r
                                                                                ENGExporter.export(bb, file);\r
                                                                        } catch (IOException e) {\r
-                                                                               // TODO Auto-generated catch block\r
-                                                                               e.printStackTrace();\r
+                                                                               log.error(e);\r
                                                                        }\r
                                                                }\r
                                                        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index b92f63cb4887ac6ad8e8bcb1be27e45ad1114201..f400ffb5a3724ca73bd635e3c7313d3092dbab43 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -140,11 +140,9 @@ public class RocketScience {
                        } catch (NoSuchFieldException e) {\r
                                e.printStackTrace();\r
                        } catch (IllegalArgumentException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               log.error(e);\r
                        } catch (IllegalAccessException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               log.error(e);\r
                        }\r
                        return null;\r
                }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
index 49739039a8c27cf0418907443db22f4bfa6f3522..a53909e6c296559c47da1fc278b357131012f3a7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
@@ -6,8 +6,6 @@ import javax.measure.unit.SI;
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
-\r
-//TODO Implement MotorPart\r
 public class EditableFuel extends SaintRobertFuel {\r
        private String name;\r
        private double a = 0.0665;\r

diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
index 379200dc6bfb44b3a3a053b44d5c3e4c81be7e49..a3b3a6f910678bc6a88b9c2b6b53d266425faf87 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
+++ b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
@@ -8,6 +8,7 @@ import java.io.OutputStream;
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
+import org.jfree.util.Log;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Fuel;\r
@@ -64,11 +65,9 @@ public class MotorIO {
                        try {\r
                                return FuelResolver.getFuel(new URI("motorsim:" + c.getSimpleName()));\r
                        } catch (FuelNotFound e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               Log.error(e);\r
                        } catch (URISyntaxException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               Log.error(e);\r
                        }\r
                        return null;\r
                }\r