The TaskManager works partly.

6 files changed, 19 insertions, 19 deletions

diff --git a/sources/protocols/implementations/BerkelyTimeProtocol.java b/sources/protocols/implementations/BerkelyTimeProtocol.java
index 0063de1..c64e175 100644
--- a/sources/protocols/implementations/BerkelyTimeProtocol.java
+++ b/sources/protocols/implementations/BerkelyTimeProtocol.java
@@ -21,7 +21,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
     /* Berkely Client vairables */
 
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
 
         /* Those prefs are editable through the VSProtocol VSEditor GUI. t_min and t_max in milliseconds  */
         setInteger("numProcesses", getNumProcesses()-1);
@@ -35,7 +35,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
 
     protected void onClientStart() {
         requestTime = process.getTime();
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("isRequest", true);
         sendMessage(message);
     }
@@ -88,7 +88,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
         for (Integer processID : processTimes.keySet()) {
             long realProcessTime = realTimesRTT.get(processID).longValue();
             long diff = avgTime - realProcessTime;
-            VSMessage message = new VSMessage(getProtocolClassname());
+            VSMessage message = new VSMessage(getClassname());
             message.setBoolean("isJustify", true);
             message.setLong("timeDiff", diff);
             message.setInteger("receiverProcessID", processID);
@@ -101,7 +101,7 @@ public class BerkelyTimeProtocol extends VSProtocol {
 
     protected void onServerRecv(VSMessage recvMessage) {
         if (recvMessage.getBoolean("isRequest")) {
-            VSMessage message = new VSMessage(getProtocolClassname());
+            VSMessage message = new VSMessage(getClassname());
             message.setInteger("processID", process.getProcessID());
             message.setLong("time", process.getTime());
             message.setBoolean("isResponse", true);
diff --git a/sources/protocols/implementations/BroadcastSturmProtocol.java b/sources/protocols/implementations/BroadcastSturmProtocol.java
index c68b548..7ef2c31 100644
--- a/sources/protocols/implementations/BroadcastSturmProtocol.java
+++ b/sources/protocols/implementations/BroadcastSturmProtocol.java
@@ -11,7 +11,7 @@ public class BroadcastSturmProtocol extends VSProtocol {
     private static int broadcastCount;
 
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
         sentMessages = new ArrayList<VSMessage>();
     }
 
@@ -19,7 +19,7 @@ public class BroadcastSturmProtocol extends VSProtocol {
     }
 
     protected void onClientStart() {
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setInteger("Broadcast", broadcastCount++);
         sentMessages.add(message);
         sendMessage(message);
@@ -34,7 +34,7 @@ public class BroadcastSturmProtocol extends VSProtocol {
 
     protected void onServerRecv(VSMessage recvMessage) {
         if (!sentMessages.contains(recvMessage)) {
-            VSMessage message = new VSMessage(getProtocolClassname());
+            VSMessage message = new VSMessage(getClassname());
             message.setInteger("Broadcast", recvMessage.getInteger("Broadcast"));
 
             sentMessages.add(message);
diff --git a/sources/protocols/implementations/DummyProtocol.java b/sources/protocols/implementations/DummyProtocol.java
index e79f62d..4e5d2cf 100644
--- a/sources/protocols/implementations/DummyProtocol.java
+++ b/sources/protocols/implementations/DummyProtocol.java
@@ -5,7 +5,7 @@ import core.VSMessage;
 
 public class DummyProtocol extends VSProtocol {
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
     }
 
     protected void onClientReset() {
@@ -15,7 +15,7 @@ public class DummyProtocol extends VSProtocol {
     protected void onClientStart() {
         logg("onClientStart()");
 
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setString("Greeting", "Hello World!");
         message.setInteger("A number", 1);
         message.setBoolean("A boolean", true);
diff --git a/sources/protocols/implementations/ExternalTimeSyncProtocol.java b/sources/protocols/implementations/ExternalTimeSyncProtocol.java
index 3f40eca..49c4b51 100644
--- a/sources/protocols/implementations/ExternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/ExternalTimeSyncProtocol.java
@@ -9,7 +9,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
     private boolean waitingForResponse;
 
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
     }
 
     protected void onClientReset() {
@@ -20,7 +20,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
         waitingForResponse = true;
 
         /* Multicast message to all processes */
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("isClientRequest", true);
         sendMessage(message);
     }
@@ -51,7 +51,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol {
             return;
 
         /* Multicast message to all processes */
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setLong("time", process.getTime());
         message.setBoolean("isServerResponse", true);
         sendMessage(message);
diff --git a/sources/protocols/implementations/InternalTimeSyncProtocol.java b/sources/protocols/implementations/InternalTimeSyncProtocol.java
index ccef2d3..cbe9fa8 100644
--- a/sources/protocols/implementations/InternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/InternalTimeSyncProtocol.java
@@ -8,7 +8,7 @@ public class InternalTimeSyncProtocol extends VSProtocol {
     private boolean waitingForResponse;
 
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
 
         /* Those prefs are editable through the VSProtocol VSEditor GUI. t_min and t_max in milliseconds  */
         setLong("t_min", 1000);
@@ -22,7 +22,7 @@ public class InternalTimeSyncProtocol extends VSProtocol {
         waitingForResponse = true;
 
         /* Multicast message to all processes */
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("isClientRequest", true);
         sendMessage(message);
     }
@@ -58,7 +58,7 @@ public class InternalTimeSyncProtocol extends VSProtocol {
             return;
 
         /* Multicast message to all processes */
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setLong("time", process.getTime());
         message.setBoolean("isServerResponse", true);
         sendMessage(message);
diff --git a/sources/protocols/implementations/PingPongProtocol.java b/sources/protocols/implementations/PingPongProtocol.java
index aa2ce16..47a222d 100644
--- a/sources/protocols/implementations/PingPongProtocol.java
+++ b/sources/protocols/implementations/PingPongProtocol.java
@@ -9,7 +9,7 @@ public class PingPongProtocol extends VSProtocol {
     private int serverCounter;
 
     protected void onInit() {
-        setProtocolClassname(getClass().toString());
+        setClassname(getClass().toString());
     }
 
     protected void onClientReset() {
@@ -17,7 +17,7 @@ public class PingPongProtocol extends VSProtocol {
     }
 
     protected void onClientStart() {
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("fromClient", true);
         message.setInteger("counter", ++clientCounter);
         sendMessage(message);
@@ -29,7 +29,7 @@ public class PingPongProtocol extends VSProtocol {
 
         logg("message: " + recvMessage.getInteger("counter"));
 
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("fromClient", true);
         message.setInteger("counter", ++clientCounter);
         sendMessage(message);
@@ -45,7 +45,7 @@ public class PingPongProtocol extends VSProtocol {
 
         logg("message: " + recvMessage.getInteger("counter"));
 
-        VSMessage message = new VSMessage(getProtocolClassname());
+        VSMessage message = new VSMessage(getClassname());
         message.setBoolean("fromServer", true);
         message.setInteger("counter", ++serverCounter);
         sendMessage(message);