From b7323911f3a0f07a4c6db1b7576f45ba36f85738 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Thu, 2 Dec 2010 00:48:24 +0000 Subject: [PATCH] cleared some minor TODOs --- MotorIOTest.xml | 5 +++-- gui/com/billkuker/rocketry/motorsim/visual/Chart.java | 9 +++------ gui/com/billkuker/rocketry/motorsim/visual/Editor.java | 3 +-- .../billkuker/rocketry/motorsim/visual/GrainPanel.java | 9 +++++---- .../rocketry/motorsim/visual/workbench/MotorEditor.java | 6 ++---- .../rocketry/motorsim/visual/workbench/MotorsEditor.java | 7 +++++-- src/com/billkuker/rocketry/motorsim/RocketScience.java | 6 ++---- .../billkuker/rocketry/motorsim/fuel/EditableFuel.java | 2 -- src/com/billkuker/rocketry/motorsim/io/MotorIO.java | 7 +++---- 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/MotorIOTest.xml b/MotorIOTest.xml index 52d462d..2bc2171 100644 --- a/MotorIOTest.xml +++ b/MotorIOTest.xml @@ -5,10 +5,10 @@ 31 mm 200 mm - + - motorsim:KNSU + motorsim:KNSB @@ -23,6 +23,7 @@ 70 mm true + 5 mm IOTestMotor diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java index ce85bc2..9040386 100644 --- 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 extends JPanel implem } }); } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } catch (InvocationTargetException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } log.debug(f.getName() + " " + calculatedSkip + " Done"); } diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java index 29cecce..c22398c 100644 --- 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."); writeToObject(obj); } catch (Exception v) { - // TODO - v.printStackTrace(); + log.error(v); java.awt.Toolkit.getDefaultToolkit().beep(); } finally { readFromObject(obj); diff --git a/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/GrainPanel.java index 35974ec..0e42dd8 100644 --- 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; import javax.swing.event.ChangeListener; +import org.apache.log4j.Logger; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.ChangeListening; import com.billkuker.rocketry.motorsim.Grain; public class GrainPanel extends JPanel { + private static Logger log = Logger.getLogger(GrainPanel.class); + private static final long serialVersionUID = 1L; private Amount displayedRegression = Amount.valueOf(0, SI.MILLIMETER); private JLabel l = new JLabel(); @@ -77,11 +80,9 @@ public class GrainPanel extends JPanel { } catch (ClassCastException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } catch (NoSuchMethodException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } addComponents( diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index f08c4f5..38e47fb 100644 --- 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 } return motor.getChamber(); } catch (InstantiationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } return null; } diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java index 181a851..d7064ea 100644 --- 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; import javax.swing.JTabbedPane; +import org.apache.log4j.Logger; + import com.billkuker.rocketry.motorsim.Burn; import com.billkuker.rocketry.motorsim.Motor; import com.billkuker.rocketry.motorsim.io.ENGExporter; @@ -32,6 +34,8 @@ import com.billkuker.rocketry.motorsim.visual.MultiObjectEditor; import com.billkuker.rocketry.motorsim.visual.RememberJFrame; public class MotorsEditor extends MultiObjectEditor { + private static Logger log = Logger.getLogger(MotorsEditor.class); + private static final long serialVersionUID = 1L; MultiMotorThrustChart mbc = new MultiMotorThrustChart(); @@ -166,8 +170,7 @@ public class MotorsEditor extends MultiObjectEditor { try { ENGExporter.export(bb, file); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } } } diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java index b92f63c..f400ffb 100644 --- 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) { e.printStackTrace(); } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e); } return null; } diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java index 4973903..a53909e 100644 --- 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; import org.jscience.physics.amount.Amount; - -//TODO Implement MotorPart public class EditableFuel extends SaintRobertFuel { private String name; private double a = 0.0665; diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java index 379200d..a3b3a6f 100644 --- 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; import java.net.URISyntaxException; +import org.jfree.util.Log; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Fuel; @@ -64,11 +65,9 @@ public class MotorIO { try { return FuelResolver.getFuel(new URI("motorsim:" + c.getSimpleName())); } catch (FuelNotFound e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Log.error(e); } catch (URISyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Log.error(e); } return null; } -- 2.30.2