9 files changed, 88 insertions, 88 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();
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index 4563493..b33ad89 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -29,7 +29,7 @@ import core.VSInternalProcess;
 import events.*;
 import protocols.VSAbstractProtocol;
 import serialize.VSSerialize;
-import simulator.VSSimulatorCanvas;
+import simulator.VSSimulatorVisualization;
 
 /**
  * The class VSProtocolEvent, this event is used if a protocol (server or
diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java
index cea2856..c812367 100644
--- a/sources/protocols/VSAbstractProtocol.java
+++ b/sources/protocols/VSAbstractProtocol.java
@@ -30,7 +30,7 @@ import core.*;
 import events.*;
 import events.internal.*;
 import serialize.*;
-import simulator.VSSimulatorCanvas;
+import simulator.VSSimulatorVisualization;
 import utils.*;
 
 /**
@@ -314,7 +314,7 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
         else
             clientSchedules.add(scheduleTask);
 
-        VSSimulatorCanvas canvas = internalProcess.getSimulatorCanvas();
+        VSSimulatorVisualization canvas = internalProcess.getSimulatorCanvas();
         canvas.getTaskManager().addTask(scheduleTask);
     }
 
diff --git a/sources/simulator/VSLogging.java b/sources/simulator/VSLogging.java
index 4570b0f..e867c6b 100644
--- a/sources/simulator/VSLogging.java
+++ b/sources/simulator/VSLogging.java
@@ -54,7 +54,7 @@ public class VSLogging {
     private ArrayList<StringBuffer> loggingLines;
 
     /** The simulator canvas. */
-    private VSSimulatorCanvas simulatorCanvas;
+    private VSSimulatorVisualization simulatorVisualization;
 
     /** The logging messages are filtered. */
     private boolean isFiltered;
@@ -81,10 +81,10 @@ public class VSLogging {
     /**
      * Sets the simulator canvas.
      *
-     * @param simulatorCanvas the simulator canvas
+     * @param simulatorVisualization the simulator canvas
      */
-    public void setSimulatorCanvas(VSSimulatorCanvas simulatorCanvas) {
-        this.simulatorCanvas = simulatorCanvas;
+    public void setSimulatorCanvas(VSSimulatorVisualization simulatorVisualization) {
+        this.simulatorVisualization = simulatorVisualization;
     }
 
     /**
@@ -102,10 +102,10 @@ public class VSLogging {
      * @param message the message
      */
     public void logg(String message) {
-        if (simulatorCanvas == null)
+        if (simulatorVisualization == null)
             logg(message, 0);
         else
-            logg(message, simulatorCanvas.getTime());
+            logg(message, simulatorVisualization.getTime());
     }
 
     /**
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index feaf197..48959f5 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -130,7 +130,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
     private VSPrefs prefs;
 
     /** The simulator canvas. */
-    private VSSimulatorCanvas simulatorCanvas;
+    private VSSimulatorVisualization simulatorVisualization;
 
     /** The simulator frame. */
     private VSSimulatorFrame simulatorFrame;
@@ -548,7 +548,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                 Integer current[] = { (Integer) model.getValueAt(row, col) };
                 final JComboBox comboBox = new JComboBox(current);
 
-                Integer pids[] = simulatorCanvas.getProcessIDs();
+                Integer pids[] = simulatorVisualization.getProcessIDs();
                 for (Integer pid : pids)
                     comboBox.addItem(pid);
 
@@ -559,7 +559,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                         if (model.rowExists(row)) {
                             VSTask task = model.removeTaskAtRow(row);
                             VSInternalProcess process =
-                                simulatorCanvas.getProcess(index);
+                                simulatorVisualization.getProcess(index);
                             task.setProcess(process);
                             taskManager.addTask(task, VSTaskManager.PROGRAMMED);
                             if (allProcessesAreSelected())
@@ -629,7 +629,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         splitPane1.setDividerLocation((int) (getPaintSize()/2) - 20);
 
-        int numProcesses = simulatorCanvas.getNumProcesses();
+        int numProcesses = simulatorVisualization.getNumProcesses();
         for (int i = 0; i <= numProcesses; ++i) {
             localTextFields.add("0000");
             globalTextFields.add("0000");
@@ -639,7 +639,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         localPIDComboBox.setSelectedIndex(0);
         globalPIDComboBox.setSelectedIndex(0);
 
-        thread = new Thread(simulatorCanvas);
+        thread = new Thread(simulatorVisualization);
         thread.start();
     }
 
@@ -653,15 +653,15 @@ public class VSSimulator extends JPanel implements VSSerializable {
         splitPaneV = new JSplitPane();
 
         /* Not null if init has been called from the deserialization */
-        if (this.simulatorCanvas == null)
-            simulatorCanvas = new VSSimulatorCanvas(prefs, this, logging);
+        if (this.simulatorVisualization == null)
+            simulatorVisualization = new VSSimulatorVisualization(prefs, this, logging);
 
-        taskManager = simulatorCanvas.getTaskManager();
-        logging.setSimulatorCanvas(simulatorCanvas);
+        taskManager = simulatorVisualization.getTaskManager();
+        logging.setSimulatorCanvas(simulatorVisualization);
 
         JPanel canvasPanel = new JPanel();
         canvasPanel.setLayout(new GridLayout(1, 1, 3, 3));
-        canvasPanel.add(simulatorCanvas);
+        canvasPanel.add(simulatorVisualization);
         canvasPanel.setMinimumSize(new Dimension(0, 0));
         canvasPanel.setMaximumSize(new Dimension(0, 0));
 
@@ -722,7 +722,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     AbstractButton abstractButton =
                         (AbstractButton) ce.getSource();
                     ButtonModel buttonModel = abstractButton.getModel();
-                    simulatorCanvas.showLamport(buttonModel.isSelected());
+                    simulatorVisualization.showLamport(buttonModel.isSelected());
                     if (buttonModel.isSelected())
                         vectorTimeActiveCheckBox.setSelected(false);
                 }
@@ -737,7 +737,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     AbstractButton abstractButton =
                         (AbstractButton) ce.getSource();
                     ButtonModel buttonModel = abstractButton.getModel();
-                    simulatorCanvas.showVectorTime(buttonModel.isSelected());
+                    simulatorVisualization.showVectorTime(buttonModel.isSelected());
                     if (buttonModel.isSelected())
                         lamportActiveCheckBox.setSelected(false);
                 }
@@ -752,7 +752,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     AbstractButton abstractButton =
                         (AbstractButton) ce.getSource();
                     ButtonModel buttonModel = abstractButton.getModel();
-                    simulatorCanvas.isAntiAliased(buttonModel.isSelected());
+                    simulatorVisualization.isAntiAliased(buttonModel.isSelected());
                 }
             });
             toolsPanel.add(antiAliasing);
@@ -834,11 +834,11 @@ public class VSSimulator extends JPanel implements VSSerializable {
         globalPIDComboBox = new JComboBox();
 
         lastSelectedProcessNum = 0;
-        int numProcesses = simulatorCanvas.getNumProcesses();
+        int numProcesses = simulatorVisualization.getNumProcesses();
         String processString = prefs.getString("lang.process");
 
         for (int i = 0; i < numProcesses; ++i) {
-            int pid = simulatorCanvas.getProcess(i).getProcessID();
+            int pid = simulatorVisualization.getProcess(i).getProcessID();
             processesComboBox.addItem(processString + " " + pid);
             localPIDComboBox.addItem("PID: " + pid);
             globalPIDComboBox.addItem("PID: " + pid);
@@ -883,7 +883,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                 localPIDComboBox.setSelectedIndex(processNum);
                 globalPIDComboBox.setSelectedIndex(processNum);
 
-                if (processNum == simulatorCanvas.getNumProcesses()) {
+                if (processNum == simulatorVisualization.getNumProcesses()) {
                     tabbedPane.setEnabledAt(1, false);
                     if (tabbedPane.getSelectedIndex() == 1)
                         tabbedPane.setSelectedIndex(0);
@@ -892,7 +892,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     tabbedPane.setEnabledAt(1, true);
                 }
 
-                if (processNum != simulatorCanvas.getNumProcesses()) {
+                if (processNum != simulatorVisualization.getNumProcesses()) {
                     VSInternalProcess process = getSelectedProcess();
                     VSProcessEditor processEditor =
                         new VSProcessEditor(prefs, process);
@@ -1269,7 +1269,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      */
     private VSInternalProcess getSelectedProcess() {
         int processNum = getSelectedProcessNum();
-        return simulatorCanvas.getProcess(processNum);
+        return simulatorVisualization.getProcess(processNum);
     }
 
     /**
@@ -1286,11 +1286,11 @@ public class VSSimulator extends JPanel implements VSSerializable {
                          ? localPIDComboBox.getSelectedIndex()
                          : globalPIDComboBox.getSelectedIndex();
 
-        if (processNum == simulatorCanvas.getNumProcesses())
-            return simulatorCanvas.getProcessesArray();
+        if (processNum == simulatorVisualization.getNumProcesses())
+            return simulatorVisualization.getProcessesArray();
 
         ArrayList<VSInternalProcess> arr = new ArrayList<VSInternalProcess>();
-        arr.add(simulatorCanvas.getProcess(processNum));
+        arr.add(simulatorVisualization.getProcess(processNum));
 
         return arr;
     }
@@ -1318,11 +1318,11 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * Update the processes combo box
      */
     private void updateProcessesComboBox() {
-        int numProcesses = simulatorCanvas.getNumProcesses();
+        int numProcesses = simulatorVisualization.getNumProcesses();
         String processString = prefs.getString("lang.process");
 
         for (int i = 0; i < numProcesses; ++i) {
-            int processID = simulatorCanvas.getProcess(i).getProcessID();
+            int processID = simulatorVisualization.getProcess(i).getProcessID();
 
             processesComboBox.removeItemAt(i);
             localPIDComboBox.removeItemAt(i);
@@ -1368,8 +1368,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
      *
      * @return the simulator canvas
      */
-    public synchronized VSSimulatorCanvas getSimulatorCanvas() {
-        return simulatorCanvas;
+    public synchronized VSSimulatorVisualization getSimulatorCanvas() {
+        return simulatorVisualization;
     }
 
     /**
@@ -1385,8 +1385,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * Update from prefs.
      */
     public synchronized void updateFromPrefs() {
-        simulatorCanvas.setBackground(prefs.getColor("col.background"));
-        simulatorCanvas.updateFromPrefs();
+        simulatorVisualization.setBackground(prefs.getColor("col.background"));
+        simulatorVisualization.updateFromPrefs();
     }
 
     /**
@@ -1416,7 +1416,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * @param index the index
      */
     public synchronized void addProcessAtIndex(int index) {
-        int processID = simulatorCanvas.getProcess(index).getProcessID();
+        int processID = simulatorVisualization.getProcess(index).getProcessID();
         String processString = prefs.getString("lang.process");
 
         localTextFields.add(index, "0000");
@@ -1460,7 +1460,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         tabbedPane.setSelectedIndex(selectedIndex);
 
         /* Update the 'Variables tab' */
-        if (getSelectedProcessNum() != simulatorCanvas.getNumProcesses()) {
+        if (getSelectedProcessNum() != simulatorVisualization.getNumProcesses()) {
             VSInternalProcess process = getSelectedProcess();
             VSProcessEditor editor = new VSProcessEditor(prefs, process);
             tabbedPane.setComponentAt(1, editor.getContentPane());
@@ -1502,7 +1502,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         /** For later backwards compatibility, to add more stuff */
         objectOutputStream.writeObject(new Boolean(false));
 
-        simulatorCanvas.serialize(serialize, objectOutputStream);
+        simulatorVisualization.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
         objectOutputStream.writeObject(new Boolean(false));
@@ -1526,7 +1526,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
 
-        simulatorCanvas.deserialize(serialize, objectInputStream);
+        simulatorVisualization.deserialize(serialize, objectInputStream);
 
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index b4985ff..a6d261c 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -158,11 +158,11 @@ public class VSSimulatorFrame extends VSFrame {
 
                 } else if (sourceText.equals(
                 finalPrefs.getString("lang.save"))) {
-                    VSSimulatorCanvas simulatorCanvas =
+                    VSSimulatorVisualization simulatorVisualization =
                         currentSimulator.getSimulatorCanvas();
-                    boolean flag = !simulatorCanvas.isPaused()
-                                   && !simulatorCanvas.isResetted()
-                                   && !simulatorCanvas.hasFinished();
+                    boolean flag = !simulatorVisualization.isPaused()
+                                   && !simulatorVisualization.isResetted()
+                                   && !simulatorVisualization.hasFinished();
 
                     if (flag)
                         pauseCurrentSimulator();
@@ -175,11 +175,11 @@ public class VSSimulatorFrame extends VSFrame {
 
                 } else if (sourceText.equals(
                 finalPrefs.getString("lang.saveas"))) {
-                    VSSimulatorCanvas simulatorCanvas =
+                    VSSimulatorVisualization simulatorVisualization =
                         currentSimulator.getSimulatorCanvas();
-                    boolean flag = !simulatorCanvas.isPaused()
-                                   && !simulatorCanvas.isResetted()
-                                   && !simulatorCanvas.hasFinished();
+                    boolean flag = !simulatorVisualization.isPaused()
+                                   && !simulatorVisualization.isResetted()
+                                   && !simulatorVisualization.hasFinished();
                     if (flag)
                         pauseCurrentSimulator();
 
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorVisualization.java
index 106e2f8..ed38004 100644
--- a/sources/simulator/VSSimulatorCanvas.java
+++ b/sources/simulator/VSSimulatorVisualization.java
@@ -41,7 +41,7 @@ import serialize.*;
 import utils.*;
 
 /**
- * The class VSSimulatorCanvas. An instance of this object represents the
+ * The class VSSimulatorVisualization. An instance of this object represents the
  * graphical paint area of a simulator. It contains all graphic calculations.
  * Also the simulator thread takes place in this class in a loop! This class
  * is probably the most cryptic of the whole simulator source code. This is
@@ -49,7 +49,7 @@ import utils.*;
  *
  * @author Paul C. Buetow
  */
-public class VSSimulatorCanvas extends Canvas
+public class VSSimulatorVisualization extends Canvas
             implements Runnable, VSSerializable {
 
     /** The serial version uid */
@@ -468,19 +468,19 @@ public class VSSimulatorCanvas extends Canvas
     }
 
     /**
-     * Instantiates a new VSSimulatorCanvas object.
+     * Instantiates a new VSSimulatorVisualization object.
      *
      * @param prefs the prefs
      * @param simulator the simulator
      * @param logging the logging
      */
-    public VSSimulatorCanvas(VSPrefs prefs, VSSimulator simulator,
+    public VSSimulatorVisualization(VSPrefs prefs, VSSimulator simulator,
                              VSLogging logging) {
         init(prefs, simulator, logging);
     }
 
     /**
-     * Instantiates inits the VSSimulatorCanvas object.
+     * Instantiates inits the VSSimulatorVisualization object.
      *
      * @param prefs the prefs
      * @param simulator the simulator
@@ -1790,7 +1790,7 @@ public class VSSimulatorCanvas extends Canvas
                                          ObjectInputStream objectInputStream)
     throws IOException, ClassNotFoundException {
         if (VSSerialize.DEBUG)
-            System.out.println("Deserializing: VSSimulatorCanvas");
+            System.out.println("Deserializing: VSSimulatorVisualization");
 
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();