diff options
| author | Paul Buetow <paul@buetow.org> | 2008-06-14 00:43:00 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-06-14 00:43:00 +0000 |
| commit | 044b410cde94862687b05f3b820676a65b1ea9d7 (patch) | |
| tree | b61e21395b44d693dba878620ee85569b844821d /sources | |
| parent | 2ff8bec447058ed606b278c1cd2a3f5120321550 (diff) | |
run astyle
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/core/VSTask.java | 36 | ||||
| -rw-r--r-- | sources/events/VSAbstractEvent.java | 12 | ||||
| -rw-r--r-- | sources/prefs/VSDefaultPrefs.java | 2 | ||||
| -rw-r--r-- | sources/serialize/VSSerialize.java | 2 | ||||
| -rw-r--r-- | sources/simulator/VSSimulator.java | 34 |
5 files changed, 43 insertions, 43 deletions
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java index c06aad2..9167498 100644 --- a/sources/core/VSTask.java +++ b/sources/core/VSTask.java @@ -312,24 +312,24 @@ public class VSTask implements Comparable, VSSerializable { * @param process the process */ public void setProcess(VSProcess process) { - /* Only do it if the process differs */ - if (!this.process.equals(process)) { - this.process = process; - - try { - // Use the copy of the event object - event = event.getCopy(process); - - } catch (VSEventNotCopyableException e) { - if (event instanceof VSAbstractProtocol) { - String eventShortname = event.getShortname(); - event = process.getProtocolObject(event.getClassname()); - event.setShortname(eventShortname); - } else { - System.out.println(e); - } - } - } + /* Only do it if the process differs */ + if (!this.process.equals(process)) { + this.process = process; + + try { + // Use the copy of the event object + event = event.getCopy(process); + + } catch (VSEventNotCopyableException e) { + if (event instanceof VSAbstractProtocol) { + String eventShortname = event.getShortname(); + event = process.getProtocolObject(event.getClassname()); + event.setShortname(eventShortname); + } else { + System.out.println(e); + } + } + } } /** diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java index 7f0a4e8..7adf535 100644 --- a/sources/events/VSAbstractEvent.java +++ b/sources/events/VSAbstractEvent.java @@ -60,22 +60,22 @@ abstract public class VSAbstractEvent extends VSPrefs { * @param newProcess The new process * @return The copy */ - final public VSAbstractEvent getCopy(VSProcess theProcess) - throws VSEventNotCopyableException { + final public VSAbstractEvent getCopy(VSProcess theProcess) + throws VSEventNotCopyableException { - if (theProcess == null) - theProcess = process; + if (theProcess == null) + theProcess = process; if (!(this instanceof VSCopyableEvent)) throw new VSEventNotCopyableException( - eventShortname + " (" + eventClassname + ")"); + eventShortname + " (" + eventClassname + ")"); VSAbstractEvent copy = VSRegisteredEvents.createEventInstanceByClassname( eventClassname, theProcess); ((VSCopyableEvent) this).initCopy(copy); - copy.setShortname(eventShortname); + copy.setShortname(eventShortname); return copy; } diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java index b644333..c2f807f 100644 --- a/sources/prefs/VSDefaultPrefs.java +++ b/sources/prefs/VSDefaultPrefs.java @@ -53,7 +53,7 @@ public class VSDefaultPrefs extends VSPrefs { */ public void fillWithDefaults() { super.clear(); - addWithDefaults(); + addWithDefaults(); } /** diff --git a/sources/serialize/VSSerialize.java b/sources/serialize/VSSerialize.java index 8924beb..7364acb 100644 --- a/sources/serialize/VSSerialize.java +++ b/sources/serialize/VSSerialize.java @@ -229,7 +229,7 @@ public final class VSSerialize { VSDefaultPrefs prefs = new VSDefaultPrefs(); prefs.deserialize(this, objectInputStream); - prefs.addWithDefaults(); + prefs.addWithDefaults(); this.setObject("prefs", prefs); simulator = new VSSimulator(prefs, simulatorFrame); diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index 7259bfc..222fe62 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -352,13 +352,13 @@ public class VSSimulator extends JPanel implements VSSerializable { * @return True, if the row exists. False, if not */ public boolean rowExists(int row) { - if (row < 0) - return false; + if (row < 0) + return false; - if (tasks.size() <= row) - return false; + if (tasks.size() <= row) + return false; - return true; + return true; } /** @@ -484,14 +484,14 @@ public class VSSimulator extends JPanel implements VSSerializable { */ public VSTaskManagerCellEditor(VSTaskManagerTableModel model) { this.model = model; - model.setEditor(this); + model.setEditor(this); } /** * Stops editing */ public void stopEditing() { - fireEditingStopped(); + fireEditingStopped(); } /** @@ -554,8 +554,8 @@ public class VSSimulator extends JPanel implements VSSerializable { simulatorCanvas.getProcess(index); task.setProcess(process); taskManager.addTask(task, VSTaskManager.PROGRAMMED); - if (allProcessesAreSelected()) - model.addTask(task); + if (allProcessesAreSelected()) + model.addTask(task); } fireEditingStopped(); @@ -962,11 +962,11 @@ public class VSSimulator extends JPanel implements VSSerializable { if (localTasks) { taskManagerLocalModel = model; - taskManagerLocalEditor = cellEditor; - } else { + taskManagerLocalEditor = cellEditor; + } else { taskManagerGlobalModel = model; - taskManagerGlobalEditor = cellEditor; - } + taskManagerGlobalEditor = cellEditor; + } JTable table = new JTable(model); table.setDefaultEditor(Object.class, cellEditor); @@ -1236,13 +1236,13 @@ public class VSSimulator extends JPanel implements VSSerializable { } /** - * Checks if 'all processes' is selected + * Checks if 'all processes' is selected * * @return True, if 'all processes' are selected, else false */ private boolean allProcessesAreSelected() { return processesComboBox.getSelectedIndex() + 1 - == processesComboBox.getItemCount(); + == processesComboBox.getItemCount(); } /** @@ -1284,8 +1284,8 @@ public class VSSimulator extends JPanel implements VSSerializable { VSProcess process = getSelectedProcess(); boolean allProcesses = process == null; - taskManagerLocalEditor.stopEditing(); - taskManagerGlobalEditor.stopEditing(); + taskManagerLocalEditor.stopEditing(); + taskManagerGlobalEditor.stopEditing(); taskManagerLocalModel.set(process, VSTaskManagerTableModel.LOCAL, |
