From 4d75b0e6c3eb281d2199bf40ca3796939ef0603b Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Thu, 16 Feb 2012 01:50:10 +0000 Subject: [PATCH] Removed some system.out --- .../visual/openRocket/RocketPanel.java | 51 +------------------ .../visual/workbench/MotorEditor.java | 2 +- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java index 6079c2f..8b6d747 100644 --- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java +++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketPanel.java @@ -138,7 +138,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, configuration.addChangeListener(new StateChangeListener() { @Override public void stateChanged(EventObject e) { - // System.out.println("Configuration changed, calling updateFigure"); updateExtras(); figure.updateFigure(); } @@ -153,49 +152,9 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, setPreferredSize(new Dimension(800, 250)); - // // Create toolbar - - /* - * // Side/back buttons FigureTypeAction action = new - * FigureTypeAction(RocketFigure.TYPE_SIDE); // // Side view - * action.putValue(Action.NAME, - * trans.get("RocketPanel.FigTypeAct.Sideview")); // // Side view - * action.putValue(Action.SHORT_DESCRIPTION, - * trans.get("RocketPanel.FigTypeAct.ttip.Sideview")); JToggleButton - * toggle = new JToggleButton(action); add(toggle, "spanx, split"); - * - * action = new FigureTypeAction(RocketFigure.TYPE_BACK); // // Back - * view action.putValue(Action.NAME, - * trans.get("RocketPanel.FigTypeAct.Backview")); // // Back view - * action.putValue(Action.SHORT_DESCRIPTION, - * trans.get("RocketPanel.FigTypeAct.ttip.Backview")); toggle = new - * JToggleButton(action); add(toggle, "gap rel"); - */ - /* - * // Zoom level selector ScaleSelector scaleSelector = new - * ScaleSelector(scrollPane); add(scaleSelector); - */ - // add(new JLabel()); - - /* - * // Stage selector StageSelector stageSelector = new - * StageSelector(configuration); add(stageSelector, ""); - * - * add(new JLabel(), "wrap"); - */ - /* - * - * // Motor configuration selector //// Motor configuration: JLabel - * label = new JLabel(trans.get("RocketPanel.lbl.Motorcfg")); - * label.setHorizontalAlignment(JLabel.RIGHT); add(label, - * "growx, right"); add(new JComboBox(new - * MotorConfigurationModel(configuration)), "wrap"); - */ + configuration.setMotorConfigurationID(null); - // add(new JLabel(), "growx, right"); - // add(new JLabel(), "wrap"); - // Create slider and scroll pane DoubleModel theta = new DoubleModel(figure, "Rotation", @@ -216,13 +175,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, JSlider.VERTICAL, true), "ax 50%, wrap, width " + (d.width + 6) + "px:null:null, growy"); - /* - * // // Click to select    Shift+click to select other - * //    Double-click to edit    Click+drag to move - * infoMessage = new JLabel(trans.get("RocketPanel.lbl.infoMessage")); - * infoMessage.setFont(new Font("Sans Serif", Font.PLAIN, 9)); - * add(infoMessage, "skip, span, gapleft 25, wrap"); - */ addExtras(); } @@ -420,7 +372,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, extraText.setTheta(cpTheta); cg = massCalculator.getCG(configuration, MassCalcType.LAUNCH_MASS); - // System.out.println("CG computed as "+cg+ " CP as "+cp); if (cp.weight > 0.000001) cpx = cp.x; diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index 303e7aa..3df2ceb 100644 --- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java +++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java @@ -380,7 +380,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR @Override public void actionPerformed(ActionEvent e) { motor.setFuel((Fuel)getSelectedItem()); - System.out.println("FUEL CHANGED"); + log.debug("FUEL CHANGED"); }}); } }); -- 2.47.2