From 923258562e059976ee502e0d1a152d7966d5691e Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Tue, 1 Sep 2009 01:09:16 +0000 Subject: [PATCH] Logging, organized imports --- src/com/billkuker/rocketry/motorsim/ChangeListening.aj | 10 ++++------ src/com/billkuker/rocketry/motorsim/Motor.java | 1 - .../billkuker/rocketry/motorsim/QuantityChecking.aj | 6 +++--- src/com/billkuker/rocketry/motorsim/Validating.java | 2 ++ .../motorsim/fuel/PiecewiseSaintRobertFuel.java | 7 +++++-- src/com/billkuker/rocketry/motorsim/grain/Finocyl.java | 1 - .../billkuker/rocketry/motorsim/grain/Moonburner.java | 1 - .../rocketry/motorsim/grain/util/BurningShape.java | 5 ++++- .../motorsim/grain/util/ExtrudedShapeGrain.java | 3 +-- .../rocketry/motorsim/grain/util/ShapeUtil.java | 5 +---- .../motorsim/test/ConvergentDivergentNozzleTest.java | 2 -- .../billkuker/rocketry/motorsim/visual/BurnPanel.java | 1 - src/com/billkuker/rocketry/motorsim/visual/Editor.java | 2 -- .../motorsim/visual/workbench/MotorEditor.java | 7 +++---- .../motorsim/visual/workbench/MultiBurnChart.java | 4 +--- 15 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/com/billkuker/rocketry/motorsim/ChangeListening.aj b/src/com/billkuker/rocketry/motorsim/ChangeListening.aj index 3df1603..fb04929 100644 --- 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 91c2c10..11872a6 100644 --- 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; import org.jscience.physics.amount.Amount; -import com.billkuker.rocketry.motorsim.Validating.ValidationException; public class Motor implements Validating{ private Chamber chamber; diff --git a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj index 50f674b..95a8c5a 100644 --- 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 b020c63..98058a8 100644 --- 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 0324363..0d2cb0b 100644 --- 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; import javax.measure.quantity.Pressure; +import org.apache.log4j.Logger; import org.jscience.physics.amount.Amount; public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel { + + private static final Logger log = Logger.getLogger(PiecewiseSaintRobertFuel.class); private class Entry{ double a; @@ -32,7 +35,7 @@ public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel { Entry e = entries.get(samplePressure); return e.a; } catch ( NoSuchElementException e ){ - System.err.println("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName()); + log.warn("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName()); return entries.get(entries.lastKey()).a; } } @@ -44,7 +47,7 @@ public abstract class PiecewiseSaintRobertFuel extends SaintRobertFuel { Entry e = entries.get(samplePressure); return e.n; } catch ( NoSuchElementException e ){ - System.err.println("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName()); + log.warn("Pressure " + pressure + " is outside of expiermental range for " + this.getClass().getSimpleName()); return entries.get(entries.lastKey()).n; } } diff --git a/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java b/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java index 3364e60..aefaf32 100644 --- 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; import com.billkuker.rocketry.motorsim.Validating; -import com.billkuker.rocketry.motorsim.Validating.ValidationException; import com.billkuker.rocketry.motorsim.grain.util.BurningShape; import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain; import com.billkuker.rocketry.motorsim.visual.Editor; diff --git a/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java b/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java index 9ffbec8..9844f3e 100644 --- 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; import com.billkuker.rocketry.motorsim.Validating; -import com.billkuker.rocketry.motorsim.Validating.ValidationException; import com.billkuker.rocketry.motorsim.grain.util.BurningShape; import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain; import com.billkuker.rocketry.motorsim.visual.Editor; diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java b/src/com/billkuker/rocketry/motorsim/grain/util/BurningShape.java index af05a5c..0d716e4 100644 --- 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; import javax.measure.unit.SI; +import org.apache.log4j.Logger; import org.jscience.physics.amount.Amount; public class BurningShape { + private static final Logger log = Logger.getLogger(BurningShape.class); + private static class RegressableShape { private Area a; public RegressableShape( Shape s ){ @@ -244,7 +247,7 @@ public class BurningShape { } else { RegressableShape r = new RegressableShape(s); - System.err.println("Warning: Complex (non circle / square) geometry slows me down."); + log.warn("Warning: Complex (non circle / square) geometry slows me down."); return r.getRegressedShape(mm * (plus?-1:1)); } diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java index a6fe60a..513f5ca 100644 --- 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; while (true) { guess = min + (max - min) / 2; // Guess halfway through - //System.out.println("Min: " + min + " Guess: " + guess + " Max: " - //+ max); + a = getCrossSection(Amount.valueOf(guess, SI.MILLIMETER)); if (a.isEmpty()) { // guess is too big diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java b/src/com/billkuker/rocketry/motorsim/grain/util/ShapeUtil.java index 6c8945b..a9b3176 100644 --- 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]; int type = i.currentSegment(coords); if (type == PathIterator.SEG_LINETO) { - // System.out.println("Line"); double nx = coords[0]; double ny = coords[1]; - // System.out.println(x+","+y+ " to " + nx+"," + ny); len += Math.sqrt(Math.pow(x - nx, 2) + Math.pow(y - ny, 2)); x = nx; y = ny; } else if (type == PathIterator.SEG_MOVETO) { - // System.out.println("Move"); x = coords[0]; y = coords[1]; } else { - // System.err.println("Got " + type); + } i.next(); } diff --git a/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java b/src/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java index 81ece53..f9ee4c2 100644 --- 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 expected = Amount.valueOf(87.2, .1, SI.NEWTON); assertApproximate(t, expected); - - System.out.println(t); } @Test diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index f9e0d9c..ebaf532 100644 --- 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 { NumberFormat nf = NumberFormat.getInstance(); nf.setMaximumFractionDigits(2); - //System.out.println("Time: " + nf.format(displayedTime.doubleValue(SI.SECOND)) + "s"); pressure.mark(displayedTime); thrust.mark(displayedTime); diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java index 000fedc..3bd1941 100644 --- 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; import javax.swing.WindowConstants; import javax.swing.table.TableCellRenderer; -import javax.swing.text.TableView.TableCell; import org.apache.log4j.Logger; import org.jscience.physics.amount.Amount; @@ -177,7 +176,6 @@ public class Editor extends PropertySheetPanel { @Override public void setAsText(String text) throws IllegalArgumentException { - System.out.println("Setting text " + text); editor.setText(text); }; diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index e638e3d..3a22980 100644 --- 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; import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -28,6 +27,7 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.WindowConstants; +import org.apache.log4j.Logger; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.jscience.physics.amount.Amount; @@ -60,6 +60,7 @@ import com.billkuker.rocketry.motorsim.visual.NozzlePanel; public class MotorEditor extends JTabbedPane implements PropertyChangeListener { private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(MotorEditor.class); RSyntaxTextArea text = new RSyntaxTextArea(); Motor motor; GrainEditor grainEditor; @@ -156,7 +157,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener { } }); } catch (BurnCanceled c){ - System.err.println("Burn Canceled!"); + log.info("Burn Canceled!"); } catch (Exception e) { remove(bar); JTextArea t = new JTextArea(e.getMessage()); @@ -193,7 +194,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener { p.add(new Editor(ng), grainEditorIndex); p.remove(0); p.add(new Editor(g), 0); - // System.out.println("Chose new grain"); } } }); @@ -287,7 +287,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener { public void focusLost(FocusEvent e) { String n = t.getText(); if (!"".equals(n) && !n.equals(motor.getName())) { - System.out.println("Name Changed"); motor.setName(n); } else { t.setText(motor.getName()); diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MultiBurnChart.java index 554d74b..e47e3d6 100644 --- 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 low = Amount.valueOf(1, SI.NEWTON); for( Burn.Interval i : b.getData().values() ){ s.add(i.time.doubleValue(time), i.thrust.doubleValue(force)); } -- 2.47.2