diff options
| author | Paul Buetow <paul@buetow.org> | 2008-06-14 18:06:46 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-06-14 18:06:46 +0000 |
| commit | 9a03a3dd9ce5cc9a0172b15ff92231e1b6c499c7 (patch) | |
| tree | 1b7af433cdbe51a46c7c725ee1351fca9386af68 /sources/simulator | |
| parent | 2a9ef47030dd29a5927ca0d63b662f5c42fa4ca8 (diff) | |
run astyle
Diffstat (limited to 'sources/simulator')
| -rw-r--r-- | sources/simulator/VSSimulatorCanvas.java | 24 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorFrame.java | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java index 6c86d66..688f845 100644 --- a/sources/simulator/VSSimulatorCanvas.java +++ b/sources/simulator/VSSimulatorCanvas.java @@ -556,14 +556,14 @@ public class VSSimulatorCanvas extends Canvas JPopupMenu popup = new JPopupMenu(); JMenuItem item = null; - if (process != null) { - item = new JMenuItem( - finalPrefs.getString("lang.process.selected") + - ": " + process.getProcessID()); - item.setEnabled(false); - popup.add(item); - popup.addSeparator(); - } + if (process != null) { + item = new JMenuItem( + finalPrefs.getString("lang.process.selected") + + ": " + process.getProcessID()); + item.setEnabled(false); + popup.add(item); + popup.addSeparator(); + } item = new JMenuItem( finalPrefs.getString("lang.process.edit")); @@ -612,8 +612,8 @@ public class VSSimulatorCanvas extends Canvas JMenu subMenu = new JMenu( finalPrefs.getString("lang.event.add.local") + " " + timeString); - if (process == null) - subMenu.setEnabled(false); + if (process == null) + subMenu.setEnabled(false); //subMenu.addActionListener(actionListener); popup.add(subMenu); item = new JMenuItem("foo"); @@ -623,8 +623,8 @@ public class VSSimulatorCanvas extends Canvas subMenu = new JMenu( finalPrefs.getString("lang.event.add.global") + " " + timeString); - if (process == null) - subMenu.setEnabled(false); + if (process == null) + subMenu.setEnabled(false); popup.add(subMenu); } diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java index e087376..b42f6f7 100644 --- a/sources/simulator/VSSimulatorFrame.java +++ b/sources/simulator/VSSimulatorFrame.java @@ -161,7 +161,7 @@ public class VSSimulatorFrame extends VSFrame { VSSimulatorCanvas simulatorCanvas = currentSimulator.getSimulatorCanvas(); boolean flag = !simulatorCanvas.isPaused() - && !simulatorCanvas.isResetted() + && !simulatorCanvas.isResetted() && !simulatorCanvas.hasFinished(); if (flag) @@ -178,7 +178,7 @@ public class VSSimulatorFrame extends VSFrame { VSSimulatorCanvas simulatorCanvas = currentSimulator.getSimulatorCanvas(); boolean flag = !simulatorCanvas.isPaused() - && !simulatorCanvas.isResetted() + && !simulatorCanvas.isResetted() && !simulatorCanvas.hasFinished(); if (flag) pauseCurrentSimulator(); |