diff options
Diffstat (limited to 'sources/simulator')
| -rw-r--r-- | sources/simulator/VSCreateTask.java | 2 | ||||
| -rw-r--r-- | sources/simulator/VSSimulator.java | 32 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorCanvas.java | 70 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorFrame.java | 4 |
4 files changed, 54 insertions, 54 deletions
diff --git a/sources/simulator/VSCreateTask.java b/sources/simulator/VSCreateTask.java index 1363c6c..346263d 100644 --- a/sources/simulator/VSCreateTask.java +++ b/sources/simulator/VSCreateTask.java @@ -174,7 +174,7 @@ public class VSCreateTask { * * @return the new task */ - public VSTask createTask(VSProcess process, long time, + public VSTask createTask(VSInternalProcess process, long time, boolean localTimedTask) { VSAbstractEvent event = null; diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index ae3c2db..31b5631 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -212,7 +212,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * @param localTask true, if this table manages the local task. false, * if this table manages the global tasks. */ - public VSTaskManagerTableModel(VSProcess process, boolean localTask) { + public VSTaskManagerTableModel(VSInternalProcess process, boolean localTask) { tasks = new ArrayList<VSTask>(); set(process, localTask, ONE_PROCESS); columnNames = new String[3]; @@ -249,7 +249,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * @param allProcesses true, if this table shows tasks of all processes. * false, if this table only shows tasks of the specified process. */ - public void set(VSProcess process, boolean localTasks, + public void set(VSInternalProcess process, boolean localTasks, boolean allProcesses) { this.allProcesses = allProcesses; @@ -516,8 +516,8 @@ public class VSSimulator extends JPanel implements VSSerializable { public void actionPerformed(ActionEvent ae) { try { Long val = Long.valueOf(valField.getText()); - if (val.longValue() < 0) - throw new VSNegativeNumberException(); + if (val.longValue() < 0) + throw new VSNegativeNumberException(); VSTask task = model.removeTaskAtRow(row); task.setTaskTime(val.longValue()); taskManager.addTask(task, VSTaskManager.PROGRAMMED); @@ -539,7 +539,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } catch (VSNegativeNumberException exc) { valField.setBackground(Color.RED); isRed = true; - } + } } }); return valField; @@ -557,7 +557,7 @@ public class VSSimulator extends JPanel implements VSSerializable { int index = comboBox.getSelectedIndex() - 1; if (model.rowExists(row)) { VSTask task = model.removeTaskAtRow(row); - VSProcess process = + VSInternalProcess process = simulatorCanvas.getProcess(index); task.setProcess(process); taskManager.addTask(task, VSTaskManager.PROGRAMMED); @@ -892,7 +892,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } if (processNum != simulatorCanvas.getNumProcesses()) { - VSProcess process = getSelectedProcess(); + VSInternalProcess process = getSelectedProcess(); VSProcessEditor processEditor = new VSProcessEditor(prefs, process); tabbedPane.setComponentAt(1, @@ -961,7 +961,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * @return the table */ private JTable createTaskTable(boolean localTasks) { - VSProcess process = getSelectedProcess(); + VSInternalProcess process = getSelectedProcess(); VSTaskManagerTableModel model = new VSTaskManagerTableModel(process, localTasks); VSTaskManagerCellEditor cellEditor = @@ -1076,17 +1076,17 @@ public class VSSimulator extends JPanel implements VSSerializable { } private boolean takeover(long time) { - VSProcess selectedProcess = getSelectedProcess(); + VSInternalProcess selectedProcess = getSelectedProcess(); int index = comboBox.getSelectedIndex(); VSCreateTask createTask = createTasks.get(index); if (createTask.isDummy()) return false; - ArrayList<VSProcess> processes = + ArrayList<VSInternalProcess> processes = getConcernedProcesses(localTasks); - for (VSProcess process : processes) { + for (VSInternalProcess process : processes) { VSTask task = createTask.createTask(process, time, localTasks); taskManager.addTask(task, VSTaskManager.PROGRAMMED); @@ -1266,7 +1266,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * * @return the selected process */ - private VSProcess getSelectedProcess() { + private VSInternalProcess getSelectedProcess() { int processNum = getSelectedProcessNum(); return simulatorCanvas.getProcess(processNum); } @@ -1279,7 +1279,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * * @return the concerned processes */ - private ArrayList<VSProcess> getConcernedProcesses(boolean localTasks) { + private ArrayList<VSInternalProcess> getConcernedProcesses(boolean localTasks) { int processNum = localTasks ? localPIDComboBox.getSelectedIndex() : globalPIDComboBox.getSelectedIndex(); @@ -1287,7 +1287,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (processNum == simulatorCanvas.getNumProcesses()) return simulatorCanvas.getProcessesArray(); - ArrayList<VSProcess> arr = new ArrayList<VSProcess>(); + ArrayList<VSInternalProcess> arr = new ArrayList<VSInternalProcess>(); arr.add(simulatorCanvas.getProcess(processNum)); return arr; @@ -1297,7 +1297,7 @@ public class VSSimulator extends JPanel implements VSSerializable { * Update task manager table. */ public synchronized void updateTaskManagerTable() { - VSProcess process = getSelectedProcess(); + VSInternalProcess process = getSelectedProcess(); boolean allProcesses = process == null; taskManagerLocalEditor.stopEditing(); @@ -1459,7 +1459,7 @@ public class VSSimulator extends JPanel implements VSSerializable { /* Update the 'Variables tab' */ if (getSelectedProcessNum() != simulatorCanvas.getNumProcesses()) { - VSProcess process = getSelectedProcess(); + VSInternalProcess process = getSelectedProcess(); VSProcessEditor editor = new VSProcessEditor(prefs, process); tabbedPane.setComponentAt(1, editor.getContentPane()); } diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java index a00d3ad..baf4b3e 100644 --- a/sources/simulator/VSSimulatorCanvas.java +++ b/sources/simulator/VSSimulatorCanvas.java @@ -56,7 +56,7 @@ public class VSSimulatorCanvas extends Canvas private static final long serialVersionUID = 1L; /** The highlighted process. */ - private VSProcess highlightedProcess; + private VSInternalProcess highlightedProcess; /** The simulator. */ private VSSimulator simulator; @@ -125,7 +125,7 @@ public class VSSimulatorCanvas extends Canvas private LinkedList<VSMessageLine> messageLinesToRemove; /** The processes. */ - private ArrayList<VSProcess> processes; + private ArrayList<VSInternalProcess> processes; /** The clock speed. */ private double clockSpeed; @@ -242,7 +242,7 @@ public class VSSimulatorCanvas extends Canvas private static final long serialVersionUID = 1L; /** The receiver process. */ - private VSProcess receiverProcess; + private VSInternalProcess receiverProcess; /** The color. */ private Color color; @@ -312,7 +312,7 @@ public class VSSimulatorCanvas extends Canvas * @param receiverNum the receiver num * @param task the task */ - public VSMessageLine(VSProcess receiverProcess, long sendTime, + public VSMessageLine(VSInternalProcess receiverProcess, long sendTime, long recvTime, long outageTime, int senderNum , int receiverNum, VSTask task) { this.receiverProcess = receiverProcess; @@ -500,7 +500,7 @@ public class VSSimulatorCanvas extends Canvas /* May be not null if called from deserialization */ if (this.processes == null) { - this.processes = new ArrayList<VSProcess>(); + this.processes = new ArrayList<VSInternalProcess>(); numProcesses = prefs.getInteger("sim.process.num"); @@ -515,7 +515,7 @@ public class VSSimulatorCanvas extends Canvas addMouseListener(new MouseListener() { public void mouseClicked(MouseEvent me) { - final VSProcess process = getProcessAtYPos(me.getY()); + final VSInternalProcess process = getProcessAtYPos(me.getY()); if (SwingUtilities.isRightMouseButton(me)) { ActionListener actionListener = new ActionListener() { @@ -721,7 +721,7 @@ public class VSSimulatorCanvas extends Canvas public void mouseDragged(MouseEvent e) { } public void mouseMoved(MouseEvent e) { - VSProcess p = getProcessAtYPos(e.getY()); + VSInternalProcess p = getProcessAtYPos(e.getY()); if (p == null) { if (highlightedProcess != null) { @@ -864,7 +864,7 @@ public class VSSimulatorCanvas extends Canvas taskManager.runTasks(l, offset, lastSimulatorTime); synchronized (processes) { - for (VSProcess process : processes) + for (VSInternalProcess process : processes) process.syncTime(simulatorTime); } } @@ -939,7 +939,7 @@ public class VSSimulatorCanvas extends Canvas }; synchronized (processes) { - for (VSProcess process : processes) { + for (VSInternalProcess process : processes) { final long localTime = process.getTime(); g.setColor(process.getColor()); @@ -1006,7 +1006,7 @@ public class VSSimulatorCanvas extends Canvas * @param distance the distance */ private void paintTime(final Graphics2D g, final VSTime times[], - final VSProcess process, final int yStart, + final VSInternalProcess process, final int yStart, final int distance) { final int lastPos[] = { -1, -1, -1, -1 }; @@ -1106,7 +1106,7 @@ public class VSSimulatorCanvas extends Canvas * * @return the process at y pos */ - private VSProcess getProcessAtYPos(int yPos) { + private VSInternalProcess getProcessAtYPos(int yPos) { final int reachDistance = (int) (yDistance/3); int y = YOFFSET + YOUTER_SPACEING + YSEPLINE_SPACEING; @@ -1120,7 +1120,7 @@ public class VSSimulatorCanvas extends Canvas for (int i = 0; i < numProcesses; ++i) { if (yPos < y + reachDistance && yPos > y - reachDistance - LINE_WIDTH) { - VSProcess process = null; + VSInternalProcess process = null; synchronized (processes) { process = processes.get(i); } @@ -1244,7 +1244,7 @@ public class VSSimulatorCanvas extends Canvas * * @return the process */ - public VSProcess getProcess(int processNum) { + public VSInternalProcess getProcess(int processNum) { synchronized (processes) { if (processNum >= processes.size()) return null; @@ -1304,7 +1304,7 @@ public class VSSimulatorCanvas extends Canvas final long currentTime = System.currentTimeMillis(); synchronized (processes) { - for (VSProcess p : processes) + for (VSInternalProcess p : processes) p.play(); } @@ -1332,7 +1332,7 @@ public class VSSimulatorCanvas extends Canvas */ public void finish() { synchronized (processes) { - for (VSProcess p : processes) + for (VSInternalProcess p : processes) p.finish(); } @@ -1354,7 +1354,7 @@ public class VSSimulatorCanvas extends Canvas public void pause() { isPaused = true; synchronized (processes) { - for (VSProcess p : processes) + for (VSInternalProcess p : processes) p.pause(); } @@ -1380,7 +1380,7 @@ public class VSSimulatorCanvas extends Canvas simulatorTime = 0; synchronized (processes) { - for (VSProcess process : processes) + for (VSInternalProcess process : processes) process.reset(); } @@ -1389,7 +1389,7 @@ public class VSSimulatorCanvas extends Canvas taskManager.reset(); synchronized (processes) { - for (VSProcess process : processes) + for (VSInternalProcess process : processes) process.createRandomCrashTask(); } @@ -1466,12 +1466,12 @@ public class VSSimulatorCanvas extends Canvas public void sendMessage(VSMessage message) { VSTask task = null; VSAbstractEvent receiveEvent = null; - VSProcess sendingProcess = message.getSendingProcess(); + VSInternalProcess sendingProcess = message.getSendingProcess(); long deliverTime, outageTime, durationTime; boolean recvOwn = prefs.getBoolean("sim.message.own.recv"); synchronized (processes) { - for (VSProcess receiverProcess : processes) { + for (VSInternalProcess receiverProcess : processes) { if (receiverProcess.equals(sendingProcess)) { if (recvOwn) { deliverTime = sendingProcess.getGlobalTime(); @@ -1523,7 +1523,7 @@ public class VSSimulatorCanvas extends Canvas */ public void editProcess(int processNum) { synchronized (processes) { - VSProcess process = processes.get(processNum); + VSInternalProcess process = processes.get(processNum); /* May be null if another thread changed the processes arraylist before this process actually called editProcess */ if (process != null) @@ -1536,7 +1536,7 @@ public class VSSimulatorCanvas extends Canvas * * @param process the process */ - public void editProcess(VSProcess process) { + public void editProcess(VSInternalProcess process) { if (process != null) { process.updatePrefs(); new VSEditorFrame(prefs, simulator.getSimulatorFrame(), @@ -1549,11 +1549,11 @@ public class VSSimulatorCanvas extends Canvas * * @return the processes array */ - public ArrayList<VSProcess> getProcessesArray() { - ArrayList<VSProcess> arr = new ArrayList<VSProcess>(); + public ArrayList<VSInternalProcess> getProcessesArray() { + ArrayList<VSInternalProcess> arr = new ArrayList<VSInternalProcess>(); synchronized (processes) { - for (VSProcess process : processes) + for (VSInternalProcess process : processes) arr.add(process); } @@ -1582,7 +1582,7 @@ public class VSSimulatorCanvas extends Canvas * * @return the processes */ - public ArrayList<VSProcess> getProcesses() { + public ArrayList<VSInternalProcess> getProcesses() { return processes; } @@ -1621,7 +1621,7 @@ public class VSSimulatorCanvas extends Canvas * * @param process the process */ - private void removeProcess(VSProcess process) { + private void removeProcess(VSInternalProcess process) { if (numProcesses == 1) { simulator.getSimulatorFrame().removeSimulator(simulator); @@ -1631,7 +1631,7 @@ public class VSSimulatorCanvas extends Canvas index = processes.indexOf(process); processes.remove(index); - for (VSProcess p : processes) + for (VSInternalProcess p : processes) p.removedAProcessAtIndex(index); numProcesses = processes.size(); @@ -1668,8 +1668,8 @@ public class VSSimulatorCanvas extends Canvas * * @return the new process */ - private VSProcess createProcess(int processNum) { - VSProcess process = new VSProcess(prefs, processNum, this, logging); + private VSInternalProcess createProcess(int processNum) { + VSInternalProcess process = new VSInternalProcess(prefs, processNum, this, logging); logging.logg(prefs.getString("lang.process.new") + "; " + process); return process; } @@ -1679,8 +1679,8 @@ public class VSSimulatorCanvas extends Canvas * * @return The process which has been added */ - private VSProcess addProcess() { - VSProcess newProcess = null; + private VSInternalProcess addProcess() { + VSInternalProcess newProcess = null; //int foo = -1; //System.out.println("ADD " + ++foo); synchronized (processes) { @@ -1703,14 +1703,14 @@ public class VSSimulatorCanvas extends Canvas * * @newProcess The process to add */ - private void addProcess(VSProcess newProcess) { + private void addProcess(VSInternalProcess newProcess) { //int foo = -1; //System.out.println("ADD_ " + ++foo); synchronized (processes) { //System.out.println("ADD_ " + ++foo); processes.add(newProcess); - for (VSProcess process : processes) + for (VSInternalProcess process : processes) if (!process.equals(newProcess)) process.addedAProcess(); //System.out.println("ADD_ " + ++foo); @@ -1764,7 +1764,7 @@ public class VSSimulatorCanvas extends Canvas synchronized (processes) { objectOutputStream.writeObject(new Integer(numProcesses)); - for (VSProcess process : processes) + for (VSInternalProcess process : processes) process.serialize(serialize, objectOutputStream); } diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java index b42f6f7..4d97b6e 100644 --- a/sources/simulator/VSSimulatorFrame.java +++ b/sources/simulator/VSSimulatorFrame.java @@ -440,13 +440,13 @@ public class VSSimulatorFrame extends VSFrame { return; String processString = prefs.getString("lang.process"); - ArrayList<VSProcess> arr = + ArrayList<VSInternalProcess> arr = currentSimulator.getSimulatorCanvas().getProcessesArray(); int numProcesses = arr.size(); int processNum = 0; - for (VSProcess process : arr) { + for (VSInternalProcess process : arr) { int processID = process.getProcessID(); JMenuItem processItem = new JMenuItem(processString + " " + processID); |