From e4ac5f70765657dfab2a615a2bfcf6dc5c4ffdab Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 13 Jun 2008 19:19:25 +0000 Subject: run astyle --- sources/core/VSTask.java | 8 ++++---- sources/prefs/VSPrefs.java | 2 +- sources/prefs/VSPrefsRestriction.java | 16 ++++++++-------- sources/serialize/VSSerialize.java | 20 ++++++++++---------- sources/simulator/VSMain.java | 2 +- sources/simulator/VSSimulator.java | 26 +++++++++++++------------- 6 files changed, 37 insertions(+), 37 deletions(-) (limited to 'sources') diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java index daa85eb..40928a0 100644 --- a/sources/core/VSTask.java +++ b/sources/core/VSTask.java @@ -101,10 +101,10 @@ public class VSTask implements Comparable, VSSerializable { * @param task the task to copy */ public VSTask(VSTask task) { - init(task.getTaskTime(), - task.getProcess(), - task.getEvent(), - !task.isGlobalTimed()); + init(task.getTaskTime(), + task.getProcess(), + task.getEvent(), + !task.isGlobalTimed()); } /** diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java index be50a76..70f378f 100644 --- a/sources/prefs/VSPrefs.java +++ b/sources/prefs/VSPrefs.java @@ -997,7 +997,7 @@ public class VSPrefs implements VSSerializable { vectorPrefs = (HashMap>) objectInputStream.readObject(); restrictions = (HashMap) - objectInputStream.readObject(); + objectInputStream.readObject(); /** For later backwards compatibility, to add more stuff */ objectInputStream.readObject(); diff --git a/sources/prefs/VSPrefsRestriction.java b/sources/prefs/VSPrefsRestriction.java index 32ab213..0709713 100644 --- a/sources/prefs/VSPrefsRestriction.java +++ b/sources/prefs/VSPrefsRestriction.java @@ -77,8 +77,8 @@ abstract public class VSPrefsRestriction implements Serializable { */ public void writeObject(ObjectOutputStream out) throws IOException { - out.writeObject(new Integer(minValue)); - out.writeObject(new Integer(maxValue)); + out.writeObject(new Integer(minValue)); + out.writeObject(new Integer(maxValue)); } /* (non-Javadoc) @@ -86,8 +86,8 @@ abstract public class VSPrefsRestriction implements Serializable { */ public void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - minValue = ((Integer) in.readObject()).intValue(); - maxValue = ((Integer) in.readObject()).intValue(); + minValue = ((Integer) in.readObject()).intValue(); + maxValue = ((Integer) in.readObject()).intValue(); } } @@ -126,17 +126,17 @@ abstract public class VSPrefsRestriction implements Serializable { */ public void writeObject(ObjectOutputStream out) throws IOException { - out.writeObject(possibleSelections); + out.writeObject(possibleSelections); } /* (non-Javadoc) * @see prefs.VSPrefsRestriction#readObject(java.io.ObjectInputStream) */ - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") public void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - possibleSelections = (Vector) in.readObject(); - } + possibleSelections = (Vector) in.readObject(); + } } /** diff --git a/sources/serialize/VSSerialize.java b/sources/serialize/VSSerialize.java index 70ba7e0..d70c582 100644 --- a/sources/serialize/VSSerialize.java +++ b/sources/serialize/VSSerialize.java @@ -194,18 +194,18 @@ public final class VSSerialize { VSPrefs prefs = simulator.getPrefs(); VSSimulatorFrame simulatorFrame = simulator.getSimulatorFrame(); - String saveText = prefs.getString("lang.save"); + String saveText = prefs.getString("lang.save"); JFileChooser fileChooser = new JFileChooser(); fileChooser.setMultiSelectionEnabled(false); fileChooser.addChoosableFileFilter(createFileFilter(prefs)); - fileChooser.setApproveButtonText(saveText); + fileChooser.setApproveButtonText(saveText); if (fileChooser.showOpenDialog(simulatorFrame) == JFileChooser.APPROVE_OPTION) { - String fileName = fileChooser.getSelectedFile().getAbsolutePath(); - System.out.println(saveText + ": " + fileName); + String fileName = fileChooser.getSelectedFile().getAbsolutePath(); + System.out.println(saveText + ": " + fileName); saveSimulator(fileName, simulator); - } + } } /** @@ -255,18 +255,18 @@ public final class VSSerialize { public VSSimulator openSimulator(VSSimulatorFrame simulatorFrame) { VSPrefs prefs = simulatorFrame.getPrefs(); - String openText = prefs.getString("lang.open"); + String openText = prefs.getString("lang.open"); JFileChooser fileChooser = new JFileChooser(); fileChooser.setMultiSelectionEnabled(false); fileChooser.addChoosableFileFilter(createFileFilter(prefs)); - fileChooser.setApproveButtonText(openText); + fileChooser.setApproveButtonText(openText); if (fileChooser.showOpenDialog(simulatorFrame) == JFileChooser.APPROVE_OPTION) { - String fileName = fileChooser.getSelectedFile().getAbsolutePath(); - System.out.println(openText + ": " + fileName); + String fileName = fileChooser.getSelectedFile().getAbsolutePath(); + System.out.println(openText + ": " + fileName); return openSimulator(fileName, simulatorFrame); - } + } return null; } diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java index 7367c9b..e6e0906 100644 --- a/sources/simulator/VSMain.java +++ b/sources/simulator/VSMain.java @@ -87,7 +87,7 @@ public class VSMain { UIManager.getCrossPlatformLookAndFeelClassName()); } catch (Exception e) { } - Locale.setDefault(Locale.GERMAN); + Locale.setDefault(Locale.GERMAN); javax.swing.JPopupMenu.setDefaultLightWeightPopupEnabled(false); VSPrefs prefs = VSDefaultPrefs.init(); VSRegisteredEvents.init(prefs); diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index ea552f6..d2788a0 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -329,16 +329,16 @@ public class VSSimulator extends JPanel implements VSSerializable { * @param rows the rows */ private void copyTasksAtRows(int rows[]) { - ArrayList copiedTasks = new ArrayList(); + ArrayList copiedTasks = new ArrayList(); - for (int row : rows) - /* Use the copy constructor */ - copiedTasks.add(new VSTask(tasks.get(row))); + for (int row : rows) + /* Use the copy constructor */ + copiedTasks.add(new VSTask(tasks.get(row))); - for (VSTask task : copiedTasks) { - taskManager.addTask(task, VSTaskManager.PROGRAMMED); - addTask(task); - } + for (VSTask task : copiedTasks) { + taskManager.addTask(task, VSTaskManager.PROGRAMMED); + addTask(task); + } fireTableDataChanged(); } @@ -356,15 +356,15 @@ public class VSSimulator extends JPanel implements VSSerializable { ActionListener actionListener = new ActionListener() { public void actionPerformed(ActionEvent ae) { String command = ae.getActionCommand(); - int rows[] = source.getSelectedRows(); + int rows[] = source.getSelectedRows(); if (command.equals(prefs.getString("lang.remove"))) { - for (int i = rows.length - 1; i >= 0; --i) - removeTaskAtRow(rows[i]); + for (int i = rows.length - 1; i >= 0; --i) + removeTaskAtRow(rows[i]); } else if (command.equals( - prefs.getString("lang.copy"))) { - copyTasksAtRows(rows); + prefs.getString("lang.copy"))) { + copyTasksAtRows(rows); } } }; -- cgit v1.2.3