3 files changed, 34 insertions, 34 deletions

diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java
index 638ad53..0fc8462 100644
--- a/sources/core/VSAbstractProcess.java
+++ b/sources/core/VSAbstractProcess.java
@@ -82,7 +82,7 @@ public abstract class VSAbstractProcess extends VSPrefs
     protected VSRandom random;
 
     /** The simulator canvas. */
-    protected VSSimulatorCanvas simulatorCanvas;
+    protected VSSimulatorVisualization simulatorVisualization;
 
     /** The random crash task. May be null if there is no such random task. */
     protected VSTask randomCrashTask;
@@ -196,13 +196,13 @@ public abstract class VSAbstractProcess extends VSPrefs
      *
      * @param prefs the simulator's default prefs
      * @param processNum the process num
-     * @param simulatorCanvas the simulator canvas
+     * @param simulatorVisualization the simulator canvas
      * @param logging the logging object
      */
     public VSAbstractProcess(VSPrefs prefs, int processNum,
-                             VSSimulatorCanvas simulatorCanvas,
+                             VSSimulatorVisualization simulatorVisualization,
                              VSLogging logging) {
-        init(prefs, processNum, simulatorCanvas, logging);
+        init(prefs, processNum, simulatorVisualization, logging);
     }
 
     /**
@@ -210,21 +210,21 @@ public abstract class VSAbstractProcess extends VSPrefs
      *
      * @param prefs the simulator's default prefs
      * @param processNum the process num
-     * @param simulatorCanvas the simulator canvas
+     * @param simulatorVisualization the simulator canvas
      * @param logging the logging object
      */
     protected void init(VSPrefs prefs, int processNum,
-                        VSSimulatorCanvas simulatorCanvas, VSLogging logging) {
+                        VSSimulatorVisualization simulatorVisualization, VSLogging logging) {
         /* May be not null if called from deserialization */
         if (this.protocolsToReset == null)
             this.protocolsToReset = new ArrayList<VSAbstractProtocol>();
 
         this.processNum = processNum;
         this.prefs = prefs;
-        this.simulatorCanvas = simulatorCanvas;
+        this.simulatorVisualization = simulatorVisualization;
         this.logging = logging;
 
-        processID = simulatorCanvas.processIDCount();
+        processID = simulatorVisualization.processIDCount();
         random = new VSRandom(processID*processNum+processID+processNum);
         tasks = new VSPriorityQueue<VSTask>();
 
@@ -258,7 +258,7 @@ public abstract class VSAbstractProcess extends VSPrefs
         vectorTimeHistory = new ArrayList<VSVectorTime>();
         crashHistory = new ArrayList<Long>();
 
-        final int numProcesses = simulatorCanvas.getNumProcesses();
+        final int numProcesses = simulatorVisualization.getNumProcesses();
         for (int i = 0; i < numProcesses; ++i)
             vectorTime.add(new Long(0));
     }
@@ -274,7 +274,7 @@ public abstract class VSAbstractProcess extends VSPrefs
         vectorTimeHistory.clear();
         crashHistory.clear();
 
-        final int numProcesses = simulatorCanvas.getNumProcesses();
+        final int numProcesses = simulatorVisualization.getNumProcesses();
         for (int i = numProcesses; i > 0; --i)
             vectorTime.add(new Long(0));
     }
@@ -431,8 +431,8 @@ public abstract class VSAbstractProcess extends VSPrefs
         if (getRandomPercentage() < getInteger("process.prob.crash")) {
             /* Calculate the random crash time! */
             final long crashTime =  random.nextLong(
-                                        simulatorCanvas.getUntilTime()+1) %
-                                    simulatorCanvas.getUntilTime();
+                                        simulatorVisualization.getUntilTime()+1) %
+                                    simulatorVisualization.getUntilTime();
             return crashTime;
         }
 
diff --git a/sources/core/VSInternalProcess.java b/sources/core/VSInternalProcess.java
index 9311d0a..1da5f20 100644
--- a/sources/core/VSInternalProcess.java
+++ b/sources/core/VSInternalProcess.java
@@ -48,13 +48,13 @@ public class VSInternalProcess extends VSAbstractProcess {
      *
      * @param prefs the simulator's default prefs
      * @param processNum the process num
-     * @param simulatorCanvas the simulator canvas
+     * @param simulatorVisualization the simulator canvas
      * @param logging the logging object
      */
     public VSInternalProcess(VSPrefs prefs, int processNum,
-                             VSSimulatorCanvas simulatorCanvas,
+                             VSSimulatorVisualization simulatorVisualization,
                              VSLogging logging) {
-        super(prefs, processNum, simulatorCanvas, logging);
+        super(prefs, processNum, simulatorVisualization, logging);
     }
 
     /**
@@ -80,7 +80,7 @@ public class VSInternalProcess extends VSAbstractProcess {
     /**
      * Syncs the process' time. This method is using the clockOffset and
      * clockVariance variables. This method is called repeatedly from the
-     * VSSimulatorCanvas in order to update the process' local and global
+     * VSSimulatorVisualization in order to update the process' local and global
      * time values.
      *
      * @param globalTime the global time.
@@ -151,7 +151,7 @@ public class VSInternalProcess extends VSAbstractProcess {
      */
     public synchronized void createRandomCrashTask() {
         if (!isCrashed) {
-            VSTaskManager taskManager = simulatorCanvas.getTaskManager();
+            VSTaskManager taskManager = simulatorVisualization.getTaskManager();
             long crashTime = getARandomCrashTime();
 
             if (crashTime < 0)
@@ -303,7 +303,7 @@ public class VSInternalProcess extends VSAbstractProcess {
 
             /* Calculate the random outage time! */
             long outageTime = globalTime + random.nextLong(durationTime+1) %
-                              simulatorCanvas.getUntilTime();
+                              simulatorVisualization.getUntilTime();
 
             return outageTime;
         }
@@ -341,7 +341,7 @@ public class VSInternalProcess extends VSAbstractProcess {
         buffer.append("; ");
         buffer.append(message.toStringFull());
         logg(buffer.toString());
-        simulatorCanvas.sendMessage(message);
+        simulatorVisualization.sendMessage(message);
     }
 
     /**
@@ -349,8 +349,8 @@ public class VSInternalProcess extends VSAbstractProcess {
      *
      * @return the simulator canvas
      */
-    public VSSimulatorCanvas getSimulatorCanvas() {
-        return simulatorCanvas;
+    public VSSimulatorVisualization getSimulatorCanvas() {
+        return simulatorVisualization;
     }
 
     /**
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<VSTask> 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<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
 
         do {
             redo = false;
@@ -232,7 +232,7 @@ public class VSTaskManager implements VSSerializable {
      * Resets the task manager.
      */
     public synchronized void reset() {
-        ArrayList<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
         PriorityQueue<VSTask> tmp = null;
 
         synchronized (processes) {
@@ -366,7 +366,7 @@ public class VSTaskManager implements VSSerializable {
      */
     public synchronized ArrayList<VSTask> getLocalTasks() {
         ArrayList<VSTask> localTasks = new ArrayList<VSTask>();
-        ArrayList<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> 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<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
         synchronized (processes) {
             for (VSInternalProcess process : processes) {
                 VSPriorityQueue<VSTask> tasks = process.getTasks();
@@ -517,7 +517,7 @@ public class VSTaskManager implements VSSerializable {
                 serializeThoseTasks.add(task);
         }
 
-        ArrayList<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
 
         synchronized (processes) {
             for (VSInternalProcess process : processes) {
@@ -554,7 +554,7 @@ public class VSTaskManager implements VSSerializable {
 
         globalTasks.clear();
 
-        ArrayList<VSInternalProcess> processes = simulatorCanvas.getProcesses();
+        ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
         synchronized (processes) {
             for (VSInternalProcess process : processes)
                 process.getTasks().clear();