From a2cd723c26d9999b752ca5474f7a24de952b5fdb Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Mon, 26 May 2008 19:12:29 +0000
Subject: All abstract classes now have an Abstract in it's name

---
 sources/protocols/VSAbstractProtocol.java          | 178 ++++++++++++++++++++
 sources/protocols/VSProtocol.java                  | 179 ---------------------
 .../implementations/BerkelyTimeProtocol.java       |  20 +--
 .../implementations/BroadcastSturmProtocol.java    |  18 +--
 .../protocols/implementations/DummyProtocol.java   |  18 +--
 .../implementations/ExternalTimeSyncProtocol.java  |  18 +--
 .../implementations/InternalTimeSyncProtocol.java  |  20 +--
 .../implementations/OnePhaseCommitProtocol.java    |  20 +--
 .../implementations/PingPongProtocol.java          |  18 +--
 .../implementations/TwoPhaseCommitProtocol.java    |  18 +--
 10 files changed, 253 insertions(+), 254 deletions(-)
 create mode 100644 sources/protocols/VSAbstractProtocol.java
 delete mode 100644 sources/protocols/VSProtocol.java

(limited to 'sources/protocols')

diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java
new file mode 100644
index 0000000..b726a2e
--- /dev/null
+++ b/sources/protocols/VSAbstractProtocol.java
@@ -0,0 +1,178 @@
+/*
+ * VS is (c) 2008 by Paul C. Buetow
+ * vs@dev.buetow.org
+ */
+package protocols;
+
+import events.*;
+import core.*;
+
+/**
+ * The Class VSAbstractProtocol.
+ */
+abstract public class VSAbstractProtocol extends VSAbstractEvent {
+    private static final long serialVersionUID = 1L;
+
+    /** The protocol object is a server. */
+    private boolean isServer;
+
+    /** The protocol object is a client. */
+    private boolean isClient;
+
+    /** The current protocol object's context is a server. */
+    private boolean currentContextIsServer;
+
+    /**
+     * Send a message.
+     *
+     * @param message the message to send
+     */
+    protected void sendMessage(VSMessage message) {
+        if (process == null)
+            return;
+
+        process.increaseLamportTime();
+        process.increaseVectorTime();
+        message.init(process, getClassname());
+        process.sendMessage(message);
+    }
+
+    /**
+     * Checks if it's the incorrect protocol
+     *
+     * @param message the message to check against
+     *
+     * @return true, if is incorrect protocol
+     */
+    private final boolean isIncorrectProtocol(VSMessage message) {
+        return !message.getProtocolClassname().equals(getClassname());
+    }
+
+    /* (non-Javadoc)
+     * @see events.VSAbstractEvent#onStart()
+     */
+    public final void onStart() {
+        if (isClient) {
+            onClientStart();
+            currentContextIsServer = false;
+        }
+    }
+
+    /**
+     * On message recv.
+     *
+     * @param message the message
+     */
+    public final void onMessageRecv(VSMessage message) {
+        if (isIncorrectProtocol(message))
+            return;
+
+        if (isServer) {
+            currentContextIsServer = true;
+            onServerRecv(message);
+        }
+
+        if (isClient) {
+            currentContextIsServer = false;
+            onClientRecv(message);
+        }
+    }
+
+    /**
+     * Checks if is server.
+     *
+     * @param isServer the is server
+     */
+    public final void isServer(boolean isServer) {
+        this.isServer = isServer;
+    }
+
+    /**
+     * Checks if is client.
+     *
+     * @param isClient the is client
+     */
+    public final void isClient(boolean isClient) {
+        this.isClient = isClient;
+    }
+
+    /**
+     * Reset.
+     */
+    public void reset() {
+        if (isServer) {
+            currentContextIsServer = true;
+            isServer = false;
+            onServerReset();
+        }
+
+        if (isClient) {
+            currentContextIsServer = false;
+            isClient = false;
+            onClientReset();
+        }
+    }
+
+    /**
+     * On client start.
+     */
+    abstract protected void onClientStart();
+
+    /**
+     * On client reset.
+     */
+    abstract protected void onClientReset();
+
+    /**
+     * On client recv.
+     *
+     * @param message the message
+     */
+    abstract protected void onClientRecv(VSMessage message);
+
+    /**
+     * On server reset.
+     */
+    abstract protected void onServerReset();
+
+    /**
+     * On server recv.
+     *
+     * @param message the message
+     */
+    abstract protected void onServerRecv(VSMessage message);
+
+    /**
+     * Gets the num processes.
+     *
+     * @return the num processes
+     */
+    protected int getNumProcesses() {
+        if (process == null)
+            return 0;
+
+        return process.getSimulationCanvas().getNumProcesses();
+    }
+
+    /* (non-Javadoc)
+     * @see prefs.VSPrefs#toString()
+     */
+    public String toString() {
+        if (process == null)
+            return "";
+
+        StringBuffer buffer = new StringBuffer();
+
+        buffer.append(prefs.getString("lang.protocol"));
+        buffer.append(": ");
+        buffer.append(getShortname());
+        buffer.append(" ");
+
+        if (currentContextIsServer)
+            buffer.append(prefs.getString("lang.server"));
+        else
+            buffer.append(prefs.getString("lang.client"));
+
+        return buffer.toString();
+    }
+}
diff --git a/sources/protocols/VSProtocol.java b/sources/protocols/VSProtocol.java
deleted file mode 100644
index 348f194..0000000
--- a/sources/protocols/VSProtocol.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * VS is (c) 2008 by Paul C. Buetow
- * vs@dev.buetow.org
- */
-package protocols;
-
-import events.*;
-import core.*;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class VSProtocol.
- */
-abstract public class VSProtocol extends VSEvent {
-    private static final long serialVersionUID = 1L;
-
-    /** The is server. */
-    private boolean isServer;
-
-    /** The is client. */
-    private boolean isClient;
-
-    /** The current context is server. */
-    private boolean currentContextIsServer;
-
-    /**
-     * Send message.
-     *
-     * @param message the message
-     */
-    protected void sendMessage(VSMessage message) {
-        if (process == null)
-            return;
-
-        process.increaseLamportTime();
-        process.increaseVectorTime();
-        message.init(process, getClassname());
-        process.sendMessage(message);
-    }
-
-    /**
-     * Checks if is incorrect protocol.
-     *
-     * @param message the message
-     *
-     * @return true, if is incorrect protocol
-     */
-    private final boolean isIncorrectProtocol(VSMessage message) {
-        return !message.getProtocolClassname().equals(getClassname());
-    }
-
-    /* (non-Javadoc)
-     * @see events.VSEvent#onStart()
-     */
-    public final void onStart() {
-        if (isClient) {
-            onClientStart();
-            currentContextIsServer = false;
-        }
-    }
-
-    /**
-     * On message recv.
-     *
-     * @param message the message
-     */
-    public final void onMessageRecv(VSMessage message) {
-        if (isIncorrectProtocol(message))
-            return;
-
-        if (isServer) {
-            currentContextIsServer = true;
-            onServerRecv(message);
-        }
-
-        if (isClient) {
-            currentContextIsServer = false;
-            onClientRecv(message);
-        }
-    }
-
-    /**
-     * Checks if is server.
-     *
-     * @param isServer the is server
-     */
-    public final void isServer(boolean isServer) {
-        this.isServer = isServer;
-    }
-
-    /**
-     * Checks if is client.
-     *
-     * @param isClient the is client
-     */
-    public final void isClient(boolean isClient) {
-        this.isClient = isClient;
-    }
-
-    /**
-     * Reset.
-     */
-    public void reset() {
-        if (isServer) {
-            currentContextIsServer = true;
-            isServer = false;
-            onServerReset();
-        }
-
-        if (isClient) {
-            currentContextIsServer = false;
-            isClient = false;
-            onClientReset();
-        }
-    }
-
-    /**
-     * On client start.
-     */
-    abstract protected void onClientStart();
-
-    /**
-     * On client reset.
-     */
-    abstract protected void onClientReset();
-
-    /**
-     * On client recv.
-     *
-     * @param message the message
-     */
-    abstract protected void onClientRecv(VSMessage message);
-
-    /**
-     * On server reset.
-     */
-    abstract protected void onServerReset();
-
-    /**
-     * On server recv.
-     *
-     * @param message the message
-     */
-    abstract protected void onServerRecv(VSMessage message);
-
-    /**
-     * Gets the num processes.
-     *
-     * @return the num processes
-     */
-    protected int getNumProcesses() {
-        if (process == null)
-            return 0;
-
-        return process.getSimulationCanvas().getNumProcesses();
-    }
-
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#toString()
-     */
-    public String toString() {
-        if (process == null)
-            return "";
-
-        StringBuffer buffer = new StringBuffer();
-
-        buffer.append(prefs.getString("lang.protocol"));
-        buffer.append(": ");
-        buffer.append(getShortname());
-        buffer.append(" ");
-
-        if (currentContextIsServer)
-            buffer.append(prefs.getString("lang.server"));
-        else
-            buffer.append(prefs.getString("lang.client"));
-
-        return buffer.toString();
-    }
-}
diff --git a/sources/protocols/implementations/BerkelyTimeProtocol.java b/sources/protocols/implementations/BerkelyTimeProtocol.java
index ded3d1b..9a52c4c 100644
--- a/sources/protocols/implementations/BerkelyTimeProtocol.java
+++ b/sources/protocols/implementations/BerkelyTimeProtocol.java
@@ -4,7 +4,7 @@
  */
 package protocols.implementations;
 
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 import core.VSMessage;
 
 import java.util.ArrayList;
@@ -14,7 +14,7 @@ import java.util.Vector;
 /**
  * The Class BerkelyTimeProtocol.
  */
-public class BerkelyTimeProtocol extends VSProtocol {
+public class BerkelyTimeProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /* Berkely Server variables */
@@ -40,7 +40,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
     public BerkelyTimeProtocol() {
         setClassname(getClass().toString());
 
-        /* Those prefs are editable through the VSProtocol VSEditor GUI. */
+        /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. */
         Vector<Integer> vec = new Vector<Integer>();
         vec.add(2);
         vec.add(3);
@@ -48,13 +48,13 @@ public class BerkelyTimeProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
         processTimes.clear();
@@ -65,7 +65,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         peers.addAll(getVector("processPIDs"));
@@ -76,7 +76,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
         /* Ignore all protocol messages which are not a response message, e.g. itself */
@@ -145,13 +145,13 @@ public class BerkelyTimeProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         if (recvMessage.getBoolean("isRequest")) {
@@ -176,7 +176,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
diff --git a/sources/protocols/implementations/BroadcastSturmProtocol.java b/sources/protocols/implementations/BroadcastSturmProtocol.java
index fafc732..49e183d 100644
--- a/sources/protocols/implementations/BroadcastSturmProtocol.java
+++ b/sources/protocols/implementations/BroadcastSturmProtocol.java
@@ -7,13 +7,13 @@ package protocols.implementations;
 import java.util.ArrayList;
 
 import core.VSMessage;
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class BroadcastSturmProtocol.
  */
-public class BroadcastSturmProtocol extends VSProtocol {
+public class BroadcastSturmProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /** The sent messages. */
@@ -31,19 +31,19 @@ public class BroadcastSturmProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         VSMessage message = new VSMessage();
@@ -53,20 +53,20 @@ public class BroadcastSturmProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
         sentMessages.clear();
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         if (!sentMessages.contains(recvMessage)) {
@@ -79,7 +79,7 @@ public class BroadcastSturmProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
diff --git a/sources/protocols/implementations/DummyProtocol.java b/sources/protocols/implementations/DummyProtocol.java
index 1a409da..929ace4 100644
--- a/sources/protocols/implementations/DummyProtocol.java
+++ b/sources/protocols/implementations/DummyProtocol.java
@@ -4,14 +4,14 @@
  */
 package protocols.implementations;
 
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 import core.VSMessage;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class DummyProtocol.
  */
-public class DummyProtocol extends VSProtocol {
+public class DummyProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -22,20 +22,20 @@ public class DummyProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
         logg("onClientReset()");
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         logg("onClientStart()");
@@ -49,7 +49,7 @@ public class DummyProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
         logg("onClientRecv("+recvMessage+")");
@@ -61,21 +61,21 @@ public class DummyProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
         logg("onClientReset()");
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         logg("onServerRecv("+recvMessage+")");
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString() + "; Dummy Test";
diff --git a/sources/protocols/implementations/ExternalTimeSyncProtocol.java b/sources/protocols/implementations/ExternalTimeSyncProtocol.java
index e9e96a2..3430f98 100644
--- a/sources/protocols/implementations/ExternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/ExternalTimeSyncProtocol.java
@@ -5,13 +5,13 @@
 package protocols.implementations;
 
 import core.VSMessage;
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class ExternalTimeSyncProtocol.
  */
-public class ExternalTimeSyncProtocol extends VSProtocol {
+public class ExternalTimeSyncProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /** The request time. */
@@ -28,19 +28,19 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         requestTime = process.getTime();
@@ -53,7 +53,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
         if (!recvMessage.getBoolean("isServerResponse"))
@@ -74,13 +74,13 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         if (!recvMessage.getBoolean("isClientRequest"))
@@ -94,7 +94,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString(); //+ "; " + prefs.getString("lang.requesttime") + ": " + requestTime;
diff --git a/sources/protocols/implementations/InternalTimeSyncProtocol.java b/sources/protocols/implementations/InternalTimeSyncProtocol.java
index 0b784a1..5676d58 100644
--- a/sources/protocols/implementations/InternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/InternalTimeSyncProtocol.java
@@ -5,13 +5,13 @@
 package protocols.implementations;
 
 import core.VSMessage;
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class InternalTimeSyncProtocol.
  */
-public class InternalTimeSyncProtocol extends VSProtocol {
+public class InternalTimeSyncProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /** The waiting for response. */
@@ -23,25 +23,25 @@ public class InternalTimeSyncProtocol extends VSProtocol {
     public InternalTimeSyncProtocol() {
         setClassname(getClass().toString());
 
-        /* Those prefs are editable through the VSProtocol VSEditor GUI. t_min and t_max in milliseconds  */
+        /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. t_min and t_max in milliseconds  */
         initLong("t_min", 500, "Max. Übetragungszeit", "ms");
         initLong("t_max", 2000, "Min. Übertragungszeit", "ms");
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         waitingForResponse = true;
@@ -53,7 +53,7 @@ public class InternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
         /* Ignore all protocol messages which are not a response message, e.g. itself */
@@ -78,13 +78,13 @@ public class InternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         /* Ignore all protocol messages which are not a request message, e.g. itself */
@@ -99,7 +99,7 @@ public class InternalTimeSyncProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
diff --git a/sources/protocols/implementations/OnePhaseCommitProtocol.java b/sources/protocols/implementations/OnePhaseCommitProtocol.java
index 30c12f1..9c40493 100644
--- a/sources/protocols/implementations/OnePhaseCommitProtocol.java
+++ b/sources/protocols/implementations/OnePhaseCommitProtocol.java
@@ -6,18 +6,18 @@ package protocols.implementations;
 
 import java.util.Vector;
 
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 import core.VSMessage;
 
 /**
  * The Class OnePhaseCommitProtocol.
  */
-public class OnePhaseCommitProtocol extends VSProtocol {
+public class OnePhaseCommitProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /* Client variables, coordinator */
 
-    /* Server variables, peers */
+    /* Client variables */
     private boolean ackSent;
 
     /**
@@ -36,19 +36,19 @@ public class OnePhaseCommitProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         int numProcesses = getInteger("numProcesses");
@@ -58,27 +58,27 @@ public class OnePhaseCommitProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
 
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
         ackSent = false;
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
diff --git a/sources/protocols/implementations/PingPongProtocol.java b/sources/protocols/implementations/PingPongProtocol.java
index 543b8df..167feb6 100644
--- a/sources/protocols/implementations/PingPongProtocol.java
+++ b/sources/protocols/implementations/PingPongProtocol.java
@@ -5,13 +5,13 @@
 package protocols.implementations;
 
 import core.VSMessage;
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class PingPongProtocol.
  */
-public class PingPongProtocol extends VSProtocol {
+public class PingPongProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /** The client counter. */
@@ -28,20 +28,20 @@ public class PingPongProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
         clientCounter = 0;
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
         VSMessage message = new VSMessage();
@@ -51,7 +51,7 @@ public class PingPongProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
         if (!recvMessage.getBoolean("fromServer"))
@@ -66,14 +66,14 @@ public class PingPongProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
         serverCounter = 0;
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
         if (!recvMessage.getBoolean("fromClient"))
@@ -88,7 +88,7 @@ public class PingPongProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
diff --git a/sources/protocols/implementations/TwoPhaseCommitProtocol.java b/sources/protocols/implementations/TwoPhaseCommitProtocol.java
index 7bc079a..db0277c 100644
--- a/sources/protocols/implementations/TwoPhaseCommitProtocol.java
+++ b/sources/protocols/implementations/TwoPhaseCommitProtocol.java
@@ -4,13 +4,13 @@
  */
 package protocols.implementations;
 
-import protocols.VSProtocol;
+import protocols.VSAbstractProtocol;
 import core.VSMessage;
 
 /**
  * The Class TwoPhaseCommitProtocol
  */
-public class TwoPhaseCommitProtocol extends VSProtocol {
+public class TwoPhaseCommitProtocol extends VSAbstractProtocol {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -21,43 +21,43 @@ public class TwoPhaseCommitProtocol extends VSProtocol {
     }
 
     /* (non-Javadoc)
-     * @see events.VSEvent#onInit()
+     * @see events.VSAbstractEvent#onInit()
      */
     protected void onInit() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientReset()
+     * @see protocols.VSAbstractProtocol#onClientReset()
      */
     protected void onClientReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientStart()
+     * @see protocols.VSAbstractProtocol#onClientStart()
      */
     protected void onClientStart() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onClientRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage)
      */
     protected void onClientRecv(VSMessage recvMessage) {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerReset()
+     * @see protocols.VSAbstractProtocol#onServerReset()
      */
     protected void onServerReset() {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#onServerRecv(core.VSMessage)
+     * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage)
      */
     protected void onServerRecv(VSMessage recvMessage) {
     }
 
     /* (non-Javadoc)
-     * @see protocols.VSProtocol#toString()
+     * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
         return super.toString();
-- 
cgit v1.2.3