Logging, organized imports

diff --git a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
index 3df160317ea89ffc77f1c63064d35a60aa50b586..fb049293c3475d400d97638dbd063736a6e8fb90 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
+++ b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj
@@ -5,8 +5,11 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Method;
 
+import org.apache.log4j.Logger;
+
 public aspect ChangeListening {
 
+       private static Logger log = Logger.getLogger(ChangeListening.class);
        public interface Subject {
                // public void addPropertyChangeListener(PropertyChangeListener l);
        }
@@ -14,12 +17,10 @@ public aspect ChangeListening {
        private PropertyChangeSupport Subject.pcs;
 
        public void Subject.addPropertyChangeListener(PropertyChangeListener l) {
-               //System.out.println("PCS Added");
                pcs.addPropertyChangeListener(l);
        }
        
        public void Subject.removePropertyChangeListener(PropertyChangeListener l) {
-               //System.out.println("PCS Removed");
                pcs.addPropertyChangeListener(l);
        }
        
@@ -31,7 +32,6 @@ public aspect ChangeListening {
 
        void around(Subject s, Object newVal):
                execution(void Subject+.set*(..)) && target(s) && args(newVal) {
-               System.out.println(s);
                String name = thisJoinPointStaticPart.getSignature().getName();
                name = name.replaceFirst("set", "");
                Object old = null;
@@ -43,12 +43,10 @@ public aspect ChangeListening {
                        old = m.invoke(s);
 
                } catch (Throwable t) {
-                       System.err.print("Error getting old value for " + name);
+                       log.warn("Error getting old value for " + name);
                }
                proceed(s, newVal);
                if (old != newVal) {
-                       System.out.println(name + " changed from " + old + " to "
-                                       + newVal);
                        s.pcs.firePropertyChange(name, old, newVal);
                }
        }

diff --git a/src/com/billkuker/rocketry/motorsim/Motor.java b/src/com/billkuker/rocketry/motorsim/Motor.java
index 91c2c1013bfb43b762b1188753ab9777295d5ff3..11872a6e0f0602229e925d9d6bfb5709b3689892 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Motor.java
+++ b/src/com/billkuker/rocketry/motorsim/Motor.java
@@ -3,7 +3,6 @@ package com.billkuker.rocketry.motorsim;
 import javax.measure.unit.SI;\r
 \r
 import org.jscience.physics.amount.Amount;\r
-import com.billkuker.rocketry.motorsim.Validating.ValidationException;\r
 \r
 public class Motor implements Validating{\r
        private Chamber chamber;\r

diff --git a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
index 50f674b348e7edb70bf659771f3069d2417b2871..95a8c5ad0edbf010d755a3edffd85372c818787f 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
+++ b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
@@ -9,10 +9,12 @@ import java.lang.reflect.Type;
 
 import javax.measure.unit.Unit;
 
+import org.apache.log4j.Logger;
 import org.jscience.physics.amount.Amount;
 
 public aspect QuantityChecking {
 
+       private static Logger log = Logger.getLogger(QuantityChecking.class);
        public interface Checked {
        };
 
@@ -21,8 +23,6 @@ public aspect QuantityChecking {
        @SuppressWarnings("unchecked")
        void around(Checked c, Amount amt):
                execution(void Checked+.set*(Amount)) && target(c) && args(amt) {
-               System.out.println(thisJoinPointStaticPart.getSignature().getName()
-                               + " set to " + amt);
                try {
                        BeanInfo b = Introspector.getBeanInfo(c.getClass());
                        PropertyDescriptor ps[] = b.getPropertyDescriptors();
@@ -38,7 +38,7 @@ public aspect QuantityChecking {
 
                                        Amount a = amt;
                                        if (!a.getUnit().isCompatible(u)) {
-                                               System.err.println("Aspect Expected " + expected
+                                               log.warn("Aspect Expected " + expected
                                                                + " got " + u);
 
                                                throw new Error(ps[i].getShortDescription()

diff --git a/src/com/billkuker/rocketry/motorsim/Validating.java b/src/com/billkuker/rocketry/motorsim/Validating.java
index b020c634096c4dfb9a5c229565d87cb4e0445bd6..98058a891f6d12dcd65613b7132d8c9d8bc2c83b 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Validating.java
+++ b/src/com/billkuker/rocketry/motorsim/Validating.java
@@ -3,6 +3,8 @@ package com.billkuker.rocketry.motorsim;
 public interface Validating {
 
        public class ValidationException extends Exception{
+               private static final long serialVersionUID = 1L;
+
                public ValidationException(Validating part, String error){
                        super(error);
                }

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/PiecewiseSaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/PiecewiseSaintRobertFuel.java
index 032436339f2d01748866d2ddb27ecb6947b8be27..0d2cb0bbd95079f8b3e527830ae5e4f4833d355e 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/PiecewiseSaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/PiecewiseSaintRobertFuel.java
@@ -6,9 +6,12 @@ import java.util.TreeMap;
 \r
 import javax.measure.quantity.Pressure;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel {\r
+       \r
+       private static final Logger log = Logger.getLogger(PiecewiseSaintRobertFuel.class);\r
 \r
        private class Entry{\r
                double a;\r
@@ -32,7 +35,7 @@ public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel {
                        Entry e = entries.get(samplePressure);\r
                        return e.a;\r
                } catch ( NoSuchElementException e ){\r
-                       System.err.println("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName());\r
+                       log.warn("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName());\r
                        return entries.get(entries.lastKey()).a;\r
                }\r
        }\r
@@ -44,7 +47,7 @@ public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel {
                        Entry e = entries.get(samplePressure);\r
                        return e.n;\r
                } catch ( NoSuchElementException e ){\r
-                       System.err.println("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName());\r
+                       log.warn("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName());\r
                        return entries.get(entries.lastKey()).n;\r
                }\r
        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java b/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
index 3364e60e5aafea5b04d88fb947c44a753521a436..aefaf327a338948f2e03ece292a1bc672dac61bc 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
@@ -12,7 +12,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Validating;\r
-import com.billkuker.rocketry.motorsim.Validating.ValidationException;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
 import com.billkuker.rocketry.motorsim.visual.Editor;\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java b/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
index 9ffbec89f8ed2eb55bcfad2f26a3458f8b6cf906..9844f3e7873faff32378adcbcf67fd101c6b27a2 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
@@ -10,7 +10,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.Validating;\r
-import com.billkuker.rocketry.motorsim.Validating.ValidationException;\r
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;\r
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;\r
 import com.billkuker.rocketry.motorsim.visual.Editor;\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java b/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java
index af05a5cd0caa9aa5558767c08216ae244cc30b56..0d716e436c8c73d2e8905aaeb29bb13f34ac00dd 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java
@@ -14,10 +14,13 @@ import java.util.Set;
 import javax.measure.quantity.Length;\r
 import javax.measure.unit.SI;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 public class BurningShape {\r
        \r
+       private static final Logger log = Logger.getLogger(BurningShape.class);\r
+       \r
        private static class RegressableShape {\r
                private Area a;\r
                public RegressableShape( Shape s ){\r
@@ -244,7 +247,7 @@ public class BurningShape {
 \r
                } else {\r
                        RegressableShape r = new RegressableShape(s);\r
-                       System.err.println("Warning: Complex (non circle / square) geometry slows me down.");\r
+                       log.warn("Warning: Complex (non circle / square) geometry slows me down.");\r
                        return r.getRegressedShape(mm * (plus?-1:1));\r
                }\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
index a6fe60ab52b239adb716545c2d759ad4a53a9734..513f5cad5f632f697145e6169a359b329d433ba8 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
@@ -92,8 +92,7 @@ public abstract class ExtrudedShapeGrain extends ExtrudedGrain {
                double guess;\r
                while (true) {\r
                        guess = min + (max - min) / 2; // Guess halfway through\r
-                       //System.out.println("Min: " + min + " Guess: " + guess + " Max: "\r
-                                       //+ max);\r
+\r
                        a = getCrossSection(Amount.valueOf(guess, SI.MILLIMETER));\r
                        if (a.isEmpty()) {\r
                                // guess is too big\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java b/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java
index 6c8945b9aaf313b144dbe10b70594e6a1dd0f348..a9b31763c7d729f157b75e994826f658bcb8516f 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java
@@ -84,19 +84,16 @@ public class ShapeUtil {
                        double coords[] = new double[6];\r
                        int type = i.currentSegment(coords);\r
                        if (type == PathIterator.SEG_LINETO) {\r
-                               // System.out.println("Line");\r
                                double nx = coords[0];\r
                                double ny = coords[1];\r
-                               // System.out.println(x+","+y+ " to " + nx+"," + ny);\r
                                len += Math.sqrt(Math.pow(x - nx, 2) + Math.pow(y - ny, 2));\r
                                x = nx;\r
                                y = ny;\r
                        } else if (type == PathIterator.SEG_MOVETO) {\r
-                               // System.out.println("Move");\r
                                x = coords[0];\r
                                y = coords[1];\r
                        } else {\r
-                               // System.err.println("Got " + type);\r
+                       \r
                        }\r
                        i.next();\r
                }\r

diff --git a/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java b/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
index 81ece5308e0d9b1bbabe04e4c9d63fc20c8a48f0..f9ee4c25baf0d3b349f5902f2b961a8df04734c7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
+++ b/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
@@ -48,8 +48,6 @@ public class ConvergentDivergentNozzleTest extends RocketTest {
                Amount<Force> expected = Amount.valueOf(87.2, .1, SI.NEWTON);\r
                \r
                assertApproximate(t, expected);\r
-               \r
-               System.out.println(t);\r
        }\r
 \r
        @Test\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index f9e0d9c51133f415229c4267a64bc2023841cb47..ebaf532c2c3e0d312a4f26aae611c4d632101019 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -183,7 +183,6 @@ public class BurnPanel extends JPanel {
                        \r
                        NumberFormat nf = NumberFormat.getInstance();\r
                        nf.setMaximumFractionDigits(2);\r
-                       //System.out.println("Time: " + nf.format(displayedTime.doubleValue(SI.SECOND)) + "s");\r
                        \r
                        pressure.mark(displayedTime);\r
                        thrust.mark(displayedTime);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 000fedc3d659a9afd10243c5a31d15ade72b8e24..3bd194178ee9df029b069da684965edb225d837a 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -20,7 +20,6 @@ import javax.swing.JTable;
 import javax.swing.JTextField;\r
 import javax.swing.WindowConstants;\r
 import javax.swing.table.TableCellRenderer;\r
-import javax.swing.text.TableView.TableCell;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
@@ -177,7 +176,6 @@ public class Editor extends PropertySheetPanel {
 \r
                @Override\r
                public void setAsText(String text) throws IllegalArgumentException {\r
-                       System.out.println("Setting text " + text);\r
                        editor.setText(text);\r
                };\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index e638e3de0864a273940d7bf086e1b27f466db52e..3a229807e0227203f3513605d28fa35e79aa27c3 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -1,7 +1,6 @@
 package com.billkuker.rocketry.motorsim.visual.workbench;\r
 \r
 import java.awt.BorderLayout;\r
-import java.awt.Dimension;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
 import java.awt.event.FocusEvent;\r
@@ -28,6 +27,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;\r
 import javax.swing.WindowConstants;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;\r
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;\r
 import org.jscience.physics.amount.Amount;\r
@@ -60,6 +60,7 @@ import com.billkuker.rocketry.motorsim.visual.NozzlePanel;
 \r
 public class MotorEditor extends JTabbedPane implements PropertyChangeListener {\r
        private static final long serialVersionUID = 1L;\r
+       private static Logger log = Logger.getLogger(MotorEditor.class);\r
        RSyntaxTextArea text = new RSyntaxTextArea();\r
        Motor motor;\r
        GrainEditor grainEditor;\r
@@ -156,7 +157,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                                                        }\r
                                                });\r
                                        } catch (BurnCanceled c){\r
-                                               System.err.println("Burn Canceled!");\r
+                                               log.info("Burn Canceled!");\r
                                        } catch (Exception e) {\r
                                                remove(bar);\r
                                                JTextArea t = new JTextArea(e.getMessage());\r
@@ -193,7 +194,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                                                                p.add(new Editor(ng), grainEditorIndex);\r
                                                                p.remove(0);\r
                                                                p.add(new Editor(g), 0);\r
-                                                               // System.out.println("Chose new grain");\r
                                                        }\r
                                                }\r
                                        });\r
@@ -287,7 +287,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                                                public void focusLost(FocusEvent e) {\r
                                                        String n = t.getText();\r
                                                        if (!"".equals(n) && !n.equals(motor.getName())) {\r
-                                                               System.out.println("Name Changed");\r
                                                                motor.setName(n);\r
                                                        } else {\r
                                                                t.setText(motor.getName());\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java
index 554d74b614208ee6f2cc2cb51268b32fe0d752fd..e47e3d646c488f526ba28508c5d54b025b689a1a 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java
@@ -10,7 +10,6 @@ import javax.measure.unit.Unit;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
-import javax.swing.plaf.multi.MultiButtonUI;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
@@ -24,9 +23,9 @@ import com.billkuker.rocketry.motorsim.Burn;
 import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle;
 import com.billkuker.rocketry.motorsim.Motor;
 import com.billkuker.rocketry.motorsim.RocketScience;
-import com.billkuker.rocketry.motorsim.grain.MultiGrain;
 
 public class MultiBurnChart extends JPanel implements BurnWatcher {
+       private static final long serialVersionUID = 1L;
 
        private XYSeriesCollection dataset = new XYSeriesCollection();
 
@@ -61,7 +60,6 @@ public class MultiBurnChart extends JPanel implements BurnWatcher {
 
        private XYSeries createSeries(Burn b) {
                XYSeries s = new XYSeries(b.getMotor().getName());
-               Amount<Force> low = Amount.valueOf(1, SI.NEWTON);
                for( Burn.Interval i : b.getData().values() ){
                        s.add(i.time.doubleValue(time), i.thrust.doubleValue(force));
                }