From: Bill Kuker Date: Thu, 16 Feb 2012 01:36:24 +0000 (+0000) Subject: Removed some system.err output. Bad Monkey X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ce66574535bf39751cc44e4f49e5828164f16201;p=sw%2Fmotorsim Removed some system.err output. Bad Monkey --- diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java index 3ec5cd4..c6a032f 100644 --- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java +++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/OneMotorDatabase.java @@ -15,6 +15,7 @@ import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Inertia; import net.sf.openrocket.util.MathUtil; +import org.apache.log4j.Logger; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Burn; @@ -24,6 +25,8 @@ import com.billkuker.rocketry.motorsim.ICylindricalChamber; import com.billkuker.rocketry.motorsim.RocketScience; public class OneMotorDatabase implements MotorDatabase { + + private static final Logger log = Logger.getLogger(OneMotorDatabase.class); static Burn burn; static BurnSummary bs; @@ -320,7 +323,6 @@ public class OneMotorDatabase implements MotorDatabase { for (Interval d : burn.getData().values()) { lastWeight = lastWeight - d.fuelBurnt.doubleValue(SI.KILOGRAM); cg[i] = new Coordinate(len / 2.0, 0, 0, lastWeight); - System.err.println(lastWeight); double t = d.thrust.doubleValue(SI.NEWTON); t = Math.max(t, 0.0001); @@ -342,7 +344,7 @@ public class OneMotorDatabase implements MotorDatabase { String manufacturer, String designation, double diameter, double length) { List ret = new Vector(); - System.err.println("Returning " + motor.getDescription()); + log.debug("Returning " + motor.getDescription()); ret.add(motor); return ret; } diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java index 2e7023a..7945371 100644 --- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java +++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java @@ -282,10 +282,8 @@ public class RocketSimTable extends JPanel implements BurnWatcher, public void preferredUnitsChanged() { tm.fireTableDataChanged(); if (UnitPreference.getUnitPreference() == UnitPreference.NONSI) { - System.err.println("NONSI"); UnitGroup.setDefaultImperialUnits(); } else { - System.err.println("SI"); UnitGroup.setDefaultMetricUnits(); } } diff --git a/gui/com/billkuker/rocketry/motorsim/fuel/MultiFuelChart.java b/gui/com/billkuker/rocketry/motorsim/fuel/MultiFuelChart.java index 587073a..6e76807 100644 --- a/gui/com/billkuker/rocketry/motorsim/fuel/MultiFuelChart.java +++ b/gui/com/billkuker/rocketry/motorsim/fuel/MultiFuelChart.java @@ -58,7 +58,6 @@ public class MultiFuelChart extends JPanel implements FuelResolver.FuelsChangeLi .getPreferredUnit(SI.PASCAL); rateUnit = RocketScience.UnitPreference.getUnitPreference() .getPreferredUnit(SI.METERS_PER_SECOND); - System.err.println(pressureUnit); removeAll(); JFreeChart chart = ChartFactory.createXYLineChart( "", // Title @@ -84,7 +83,6 @@ public class MultiFuelChart extends JPanel implements FuelResolver.FuelsChangeLi f.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - System.err.println("PropertyChanged :" + evt.getPropertyName()); removeFuel(f); addFuel(f, keep); } diff --git a/gui/com/billkuker/rocketry/motorsim/fuel/SRFuelEditor.java b/gui/com/billkuker/rocketry/motorsim/fuel/SRFuelEditor.java index eaebabd..a99216e 100644 --- a/gui/com/billkuker/rocketry/motorsim/fuel/SRFuelEditor.java +++ b/gui/com/billkuker/rocketry/motorsim/fuel/SRFuelEditor.java @@ -193,10 +193,8 @@ public class SRFuelEditor extends AbstractFuelEditor { @Override public void stateChanged(ChangeEvent e) { if ( si.isSelected() ){ - System.err.println("SI"); f.setType(Type.SI); } else { - System.err.println("NONSI"); f.setType(Type.NONSI); } update();