From 9a03a3dd9ce5cc9a0172b15ff92231e1b6c499c7 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 14 Jun 2008 18:06:46 +0000 Subject: run astyle --- sources/core/VSProcess.java | 4 ++-- sources/simulator/VSSimulatorCanvas.java | 24 ++++++++++++------------ sources/simulator/VSSimulatorFrame.java | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java index 68b8c86..ae08828 100644 --- a/sources/core/VSProcess.java +++ b/sources/core/VSProcess.java @@ -1067,8 +1067,8 @@ public class VSProcess extends VSPrefs implements VSSerializable { protocol.deserialize(serialize, objectInputStream); } - localTime = 0; - setLong("process.localTime", localTime); + localTime = 0; + setLong("process.localTime", localTime); /** For later backwards compatibility, to add more stuff */ objectInputStream.readObject(); 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(); -- cgit v1.2.3