diff options
| author | Paul Buetow <paul@buetow.org> | 2008-05-22 22:23:35 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-05-22 22:23:35 +0000 |
| commit | b88ec1d81dd650c702a662b46fc22b78578765d0 (patch) | |
| tree | 9e576d1248eb670c727d05e211395f5decbcca5b | |
| parent | b761d274313c35205fec941d6d2d16d8de797a5c (diff) | |
run astyle.
| -rw-r--r-- | sources/prefs/editors/VSEditorFrame.java | 2 | ||||
| -rw-r--r-- | sources/prefs/editors/VSSimulationEditor.java | 18 | ||||
| -rw-r--r-- | sources/simulator/VSSimulationCanvas.java | 2 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorFrame.java | 18 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java index 5cdecf1..a0a5be8 100644 --- a/sources/prefs/editors/VSEditorFrame.java +++ b/sources/prefs/editors/VSEditorFrame.java @@ -57,7 +57,7 @@ public class VSEditorFrame extends VSFrame implements ActionListener { dispose(); } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { - editor.actionPerformed(e); + editor.actionPerformed(e); dispose(); } else { diff --git a/sources/prefs/editors/VSSimulationEditor.java b/sources/prefs/editors/VSSimulationEditor.java index e274c0b..538ba70 100644 --- a/sources/prefs/editors/VSSimulationEditor.java +++ b/sources/prefs/editors/VSSimulationEditor.java @@ -51,15 +51,15 @@ public class VSSimulationEditor extends VSBetterEditor { if (actionCommand.equals(prefs.getString("lang.takeover"))) { savePrefs(); - if (simulation != null) { - if (expertModeChanged()) - simulation.fireExpertModeChanged(); - simulation.updateFromPrefs(); - } + if (simulation != null) { + if (expertModeChanged()) + simulation.fireExpertModeChanged(); + simulation.updateFromPrefs(); + } } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { - if (!dontStartNewSimulation) - simulatorFrame.dispose(); + if (!dontStartNewSimulation) + simulatorFrame.dispose(); } else if (actionCommand.equals(prefs.getString("lang.ok"))) { savePrefs(); @@ -69,8 +69,8 @@ public class VSSimulationEditor extends VSBetterEditor { } if (!dontStartNewSimulation) simulatorFrame.addSimulation(new VSSimulation(prefsToEdit, simulatorFrame)); - else if (simulation != null) - simulation.updateFromPrefs(); + else if (simulation != null) + simulation.updateFromPrefs(); } else { super.actionPerformed(e); diff --git a/sources/simulator/VSSimulationCanvas.java b/sources/simulator/VSSimulationCanvas.java index 9388bb3..f9fbbe8 100644 --- a/sources/simulator/VSSimulationCanvas.java +++ b/sources/simulator/VSSimulationCanvas.java @@ -265,7 +265,7 @@ public class VSSimulationCanvas extends Canvas implements Runnable, MouseMotionL } if (simulationTime > untilTime) - simulationTime = untilTime; + simulationTime = untilTime; offset = simulationTime - lastSimulationTime; diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java index dd52ed8..4aac4ea 100644 --- a/sources/simulator/VSSimulatorFrame.java +++ b/sources/simulator/VSSimulatorFrame.java @@ -33,7 +33,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener { private Vector<VSSimulation> simulations; private VSSimulation currentSimulation; private JTabbedPane tabbedPane; - //private JSlider speedSlider; + //private JSlider speedSlider; public VSSimulatorFrame(VSPrefs prefs, Component relativeTo) { super(prefs.getString("lang.name"), relativeTo); @@ -182,11 +182,11 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener { pane.add(toolBar, BorderLayout.PAGE_START); pane.add(tabbedPane, BorderLayout.CENTER); - /* - speedSlider = new JSlider(JSlider.HORIZONTAL, - 0, 200, (int) (100 * prefs.getFloat("sim.clock.speed"))); - toolBar.add(speedSlider); - */ + /* + speedSlider = new JSlider(JSlider.HORIZONTAL, + 0, 200, (int) (100 * prefs.getFloat("sim.clock.speed"))); + toolBar.add(speedSlider); + */ return pane; } @@ -198,9 +198,9 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener { globalPrefsItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) { VSPrefs simulationPrefs = currentSimulation.getPrefs(); - VSSimulationEditor.TAKEOVER_BUTTON = true; - VSSimulationEditor simulationEditor = new VSSimulationEditor( - simulationPrefs, VSSimulatorFrame.this, currentSimulation); + VSSimulationEditor.TAKEOVER_BUTTON = true; + VSSimulationEditor simulationEditor = new VSSimulationEditor( + simulationPrefs, VSSimulatorFrame.this, currentSimulation); new VSEditorFrame(prefs, VSSimulatorFrame.this, simulationEditor); } }); |