Loggin texts cleaned.

2 files changed, 12 insertions, 6 deletions

diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java
index ab6bca8..95bcc7a 100644
--- a/sources/core/VSMessage.java
+++ b/sources/core/VSMessage.java
@@ -12,6 +12,7 @@ public class VSMessage extends VSPrefs {
     private static long messageCounter;
     private long lamportTime;
     private VSVectorTime vectorTime;
+    private VSPrefs prefs;
 
     public VSMessage(String protocolClassname) {
         this.protocolClassname = protocolClassname;
@@ -20,6 +21,7 @@ public class VSMessage extends VSPrefs {
 
     public void init(VSProcess process) {
         this.sendingProcess = process;
+        this.prefs = process.getPrefs();
         lamportTime = sendingProcess.getLamportTime();
         vectorTime = sendingProcess.getVectorTime().getCopy();
     }
@@ -49,7 +51,16 @@ public class VSMessage extends VSPrefs {
     }
 
     public String toString() {
-        return "ID: " + messageID;
+        StringBuffer buffer = new StringBuffer();
+
+        buffer.append("ID: ");
+        buffer.append(messageID);
+        buffer.append("; ");
+        buffer.append(prefs.getString("lang.protocol"));
+        buffer.append(": ");
+        buffer.append(VSRegisteredEvents.getShortname(getProtocolClassname()));
+
+        return buffer.toString();
     }
 
     public String toStringFull() {
diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java
index aa754a2..dbb37ba 100644
--- a/sources/core/VSProcess.java
+++ b/sources/core/VSProcess.java
@@ -466,11 +466,6 @@ public final class VSProcess extends VSPrefs {
         StringBuffer buffer = new StringBuffer();
         buffer.append(prefs.getString("lang.message.sent"));
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.protocol"));
-        buffer.append(": " + message.getName());
-        buffer.append("; ");
-        buffer.append(prefs.getString("lang.message"));
-        buffer.append(" ");
         buffer.append(message.toStringFull());
         logg(buffer.toString());
         simulationPanel.sendMessage(message);