From 0776f8af4c9fc131db299c2cf615bce75dcccad7 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 8 Aug 2008 16:37:58 +0000 Subject: --- sources/core/VSTaskManager.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'sources/core/VSTaskManager.java') diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java index 2161469..17caba7 100644 --- a/sources/core/VSTaskManager.java +++ b/sources/core/VSTaskManager.java @@ -43,7 +43,7 @@ public class VSTaskManager implements VSSerializable { private static final long serialVersionUID = 1L; /** The simulator canvas. */ - private VSSimulatorCanvas simulatorCanvas; + private VSSimulatorVisualization simulatorVisualization; /** The global tasks. */ private PriorityQueue globalTasks; @@ -64,21 +64,21 @@ public class VSTaskManager implements VSSerializable { * Instantiates a new task manager object. * * @param prefs the simulator's default prefs - * @param simulatorCanvas the simulator canvas + * @param simulatorVisualization the simulator canvas */ - public VSTaskManager(VSPrefs prefs, VSSimulatorCanvas simulatorCanvas) { - init(prefs, simulatorCanvas); + public VSTaskManager(VSPrefs prefs, VSSimulatorVisualization simulatorVisualization) { + init(prefs, simulatorVisualization); } /** * Inits the task manager. * * @param prefs the simulator's default prefs - * @param simulatorCanvas the simulator canvas + * @param simulatorVisualization the simulator canvas */ - private void init(VSPrefs prefs, VSSimulatorCanvas simulatorCanvas) { + private void init(VSPrefs prefs, VSSimulatorVisualization simulatorVisualization) { this.prefs = prefs; - this.simulatorCanvas = simulatorCanvas; + this.simulatorVisualization = simulatorVisualization; /* May be not null if called from deserialization */ if (globalTasks == null) @@ -104,7 +104,7 @@ public class VSTaskManager implements VSSerializable { long globalTime; final long globalOffsetTime = lastGlobalTime + step; boolean redo; - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); do { redo = false; @@ -232,7 +232,7 @@ public class VSTaskManager implements VSSerializable { * Resets the task manager. */ public synchronized void reset() { - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); PriorityQueue tmp = null; synchronized (processes) { @@ -366,7 +366,7 @@ public class VSTaskManager implements VSSerializable { */ public synchronized ArrayList getLocalTasks() { ArrayList localTasks = new ArrayList(); - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); for (VSTask task : fullfilledProgrammedTasks) if (!task.isGlobalTimed()) @@ -476,7 +476,7 @@ public class VSTaskManager implements VSSerializable { buffer.append(prefs.getString("lang.tasks.local")); buffer.append(": "); - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); synchronized (processes) { for (VSInternalProcess process : processes) { VSPriorityQueue tasks = process.getTasks(); @@ -517,7 +517,7 @@ public class VSTaskManager implements VSSerializable { serializeThoseTasks.add(task); } - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); synchronized (processes) { for (VSInternalProcess process : processes) { @@ -554,7 +554,7 @@ public class VSTaskManager implements VSSerializable { globalTasks.clear(); - ArrayList processes = simulatorCanvas.getProcesses(); + ArrayList processes = simulatorVisualization.getProcesses(); synchronized (processes) { for (VSInternalProcess process : processes) process.getTasks().clear(); -- cgit v1.2.3