All abstract classes now have an Abstract in it's name

2 files changed, 15 insertions, 15 deletions

diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java
index ffb17e4..caa081f 100644
--- a/sources/core/VSProcess.java
+++ b/sources/core/VSProcess.java
@@ -22,7 +22,7 @@ public class VSProcess extends VSPrefs {
     private static final long serialVersionUID = 1L;
 
     /** The protocols to reset if the simulation is over or the reset button has been pressed. */
-    private ArrayList<VSProtocol> protocolsToReset;
+    private ArrayList<VSAbstractProtocol> protocolsToReset;
 
     /** The crash history. represents all crashes of the process using the global simulation time. */
     private ArrayList<Long> crashHistory;
@@ -161,7 +161,7 @@ public class VSProcess extends VSPrefs {
      * @param logging the logging object
      */
     public VSProcess(VSPrefs prefs, int processNum, VSSimulatorCanvas simulationCanvas, VSLogging logging) {
-        this.protocolsToReset = new ArrayList<VSProtocol>();
+        this.protocolsToReset = new ArrayList<VSAbstractProtocol>();
         this.processNum = processNum;
         this.prefs = prefs;
         this.simulationCanvas = simulationCanvas;
@@ -305,7 +305,7 @@ public class VSProcess extends VSPrefs {
         globalTime = 0;
         clockOffset = 0;
 
-        for (VSProtocol protocol : protocolsToReset)
+        for (VSAbstractProtocol protocol : protocolsToReset)
             protocol.reset();
 
         setCurrentColor(getColor("col.process.default"));
@@ -328,7 +328,7 @@ public class VSProcess extends VSPrefs {
 
 
             if (crashTime >= getGlobalTime())  {
-                VSEvent event = new ProcessCrashEvent();
+                VSAbstractEvent event = new ProcessCrashEvent();
                 //event.init(this);
                 randomCrashTask = new VSTask(crashTime, this, event, VSTask.GLOBAL);
                 taskManager.addTask(randomCrashTask);
@@ -885,17 +885,17 @@ public class VSProcess extends VSPrefs {
      *
      * @return the protocol object
      */
-    public VSProtocol getProtocolObject(String protocolClassname) {
-        VSProtocol protocol = null;
+    public VSAbstractProtocol getProtocolObject(String protocolClassname) {
+        VSAbstractProtocol protocol = null;
 
         if (!objectExists(protocolClassname)) {
-            protocol = (VSProtocol)
+            protocol = (VSAbstractProtocol)
                        VSRegisteredEvents.createEventInstanceByClassname(protocolClassname, this);
             setObject(protocolClassname, protocol);
             protocolsToReset.add(protocol);
 
         } else {
-            protocol = (VSProtocol) getObject(protocolClassname);
+            protocol = (VSAbstractProtocol) getObject(protocolClassname);
         }
 
         return protocol;
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index 2c6500f..dc55fcc 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -8,7 +8,7 @@ import events.*;
 import events.implementations.*;
 import events.internal.*;
 import prefs.VSPrefs;
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 
 /**
  * The Class VSTask. An object of this class represents a task to do or done.
@@ -29,7 +29,7 @@ public class VSTask implements Comparable {
     private long taskTime;
 
     /** The event. */
-    private VSEvent event;
+    private VSAbstractEvent event;
 
     /** The process. */
     private VSProcess process;
@@ -57,7 +57,7 @@ public class VSTask implements Comparable {
      * @param event the event
      * @param isLocal the taks is local timed
      */
-    public VSTask(long taskTime, VSProcess process, VSEvent event, boolean isLocal) {
+    public VSTask(long taskTime, VSProcess process, VSAbstractEvent event, boolean isLocal) {
         this.process = process;
         this.taskTime = taskTime > 0 ? taskTime : 0;
         this.event = event;
@@ -118,9 +118,9 @@ public class VSTask implements Comparable {
      *
      * @return true, if it's a task using the protocol object.
      */
-    public boolean isProtocol(VSProtocol protocol) {
-        if (event instanceof VSProtocol)
-            return ((VSProtocol) event).equals(protocol);
+    public boolean isProtocol(VSAbstractProtocol protocol) {
+        if (event instanceof VSAbstractProtocol)
+            return ((VSAbstractProtocol) event).equals(protocol);
 
         return false;
     }
@@ -200,7 +200,7 @@ public class VSTask implements Comparable {
      *
      * @return the event
      */
-    public VSEvent getEvent() {
+    public VSAbstractEvent getEvent() {
         return event;
     }