added initial multiple langua support.

5 files changed, 18 insertions, 16 deletions

diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java
index c46194f..eeff528 100644
--- a/sources/core/VSAbstractProcess.java
+++ b/sources/core/VSAbstractProcess.java
@@ -243,7 +243,7 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
 
         /* Make additional process settings editable through GUI */
         initLong("process.localtime", localTime,
-                 prefs.getString("lang.process.time.local"), "ms");
+                 prefs.getString("lang.en.process.time.local"), "ms");
 
         createRandomCrashTask_();
     }
@@ -603,19 +603,19 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
      */
     public synchronized String toString() {
         StringBuffer buffer = new StringBuffer();
-        buffer.append(prefs.getString("lang.process.id"));
+        buffer.append(prefs.getString("lang.en.process.id"));
         buffer.append(": ");
         buffer.append(getProcessID());
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.process.time.local"));
+        buffer.append(prefs.getString("lang.en.process.time.local"));
         buffer.append(": ");
         buffer.append(VSTools.getTimeString(getTime()));
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.time.lamport"));
+        buffer.append(prefs.getString("lang.en.time.lamport"));
         buffer.append(": ");
         buffer.append(lamportTime);
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.time.vector"));
+        buffer.append(prefs.getString("lang.en.time.vector"));
         buffer.append(": ");
         buffer.append(vectorTime);
         return buffer.toString();
@@ -695,6 +695,11 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
                                          ObjectInputStream objectInputStream)
     throws IOException, ClassNotFoundException {
         super.deserialize(serialize, objectInputStream);
+
+        /* Bugfix, being compatible with old versions */
+        super.deleteLong("process.localTime");
+
+
         updateFromPrefs_();
 
         if (VSSerialize.DEBUG)
@@ -715,7 +720,7 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
         }
 
         localTime = 0;
-        setLong("process.localTime", localTime);
+        setLong("process.localtime", localTime);
 
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
diff --git a/sources/core/VSInternalProcess.java b/sources/core/VSInternalProcess.java
index 2ccc494..01e23d0 100644
--- a/sources/core/VSInternalProcess.java
+++ b/sources/core/VSInternalProcess.java
@@ -24,15 +24,12 @@
 package core;
 
 import java.awt.*;
-//import java.io.*;
-//import java.util.*;
 
 import core.time.*;
 import events.*;
 import events.implementations.*;
 import prefs.*;
 import protocols.*;
-//import serialize.*;
 import simulator.*;
 import utils.*;
 
@@ -337,7 +334,7 @@ public class VSInternalProcess extends VSAbstractProcess {
      */
     public synchronized void sendMessage(VSMessage message) {
         StringBuffer buffer = new StringBuffer();
-        buffer.append(prefs.getString("lang.message.sent"));
+        buffer.append(prefs.getString("lang.en.message.sent"));
         buffer.append("; ");
         buffer.append(message.toStringFull());
         log(buffer.toString());
diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java
index 8703b6f..eca2001 100644
--- a/sources/core/VSMessage.java
+++ b/sources/core/VSMessage.java
@@ -177,7 +177,7 @@ public class VSMessage extends VSPrefs {
         buffer.append("ID: ");
         buffer.append(messageID);
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.protocol"));
+        buffer.append(prefs.getString("lang.en.protocol"));
         buffer.append(": ");
         buffer.append(VSRegisteredEvents.getShortnameByClassname(
                           getProtocolClassname()));
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index ccb4d98..87e34bf 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -358,7 +358,7 @@ public class VSTask implements Comparable, VSSerializable {
     public String toString() {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(prefs.getString("lang.task"));
+        buffer.append(prefs.getString("lang.en.task"));
         buffer.append(" ");
         buffer.append(getTaskTime());
         buffer.append(event.toString());
diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index 2dc724c..5d30c53 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -460,9 +460,9 @@ public class VSTaskManager implements VSSerializable {
     public synchronized String toString() {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(prefs.getString("lang.task.manager"));
+        buffer.append(prefs.getString("lang.en.task.manager"));
         buffer.append(" (");
-        buffer.append(prefs.getString("lang.tasks.fullfilled"));
+        buffer.append(prefs.getString("lang.en.tasks.fullfilled"));
         buffer.append(": ");
 
         for (VSTask task : fullfilledProgrammedTasks) {
@@ -470,7 +470,7 @@ public class VSTaskManager implements VSSerializable {
             buffer.append("; ");
         }
 
-        buffer.append(prefs.getString("lang.tasks.global"));
+        buffer.append(prefs.getString("lang.en.tasks.global"));
         buffer.append(": ");
 
         for (VSTask task : globalTasks) {
@@ -478,7 +478,7 @@ public class VSTaskManager implements VSSerializable {
             buffer.append("; ");
         }
 
-        buffer.append(prefs.getString("lang.tasks.local"));
+        buffer.append(prefs.getString("lang.en.tasks.local"));
         buffer.append(": ");
 
         ArrayList<VSInternalProcess> processes =