while deserialization the VSDefaultPrefs will set non-set values.

4 files changed, 24 insertions, 46 deletions

diff --git a/ROADMAP b/ROADMAP
index 9e465c6..0f24601 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -1,4 +1,5 @@
 Must do:
+	look in the VSDefaultPrefs if a value is not available (e.g. lang.copy)
 	JComboBox if PID changed @ Table Editor -> remove if onMouseOver
 	able to open a saved simulator @ first window
 	Warn if a file does not exists while trying to open!
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index e746731..b644333 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -43,16 +43,23 @@ public class VSDefaultPrefs extends VSPrefs {
      * @return the lang.process.removeprefs
      */
     public static VSPrefs init() {
-        VSPrefs prefs = new VSDefaultPrefs();
+        VSDefaultPrefs prefs = new VSDefaultPrefs();
         prefs.fillWithDefaults();
         return prefs;
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillWithDefaults()
+    /**
+     * Fill everything with ts defaults.
      */
     public void fillWithDefaults() {
         super.clear();
+		addWithDefaults();
+    }
+
+    /**
+     * Adds default values if not existent.
+     */
+    public void addWithDefaults() {
         fillDefaultBooleans();
         fillDefaultColors();
         fillDefaultFloats();
@@ -61,8 +68,8 @@ public class VSDefaultPrefs extends VSPrefs {
         fillDefaultStrings();
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillDefaultStrings()
+    /**
+     * Fill with default strings.
      */
     public void fillDefaultStrings() {
         initString("lang.about", "About");
@@ -174,8 +181,8 @@ public class VSDefaultPrefs extends VSPrefs {
         initString("lang.window.new", "Neues Fenster");
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillDefaultIntegers()
+    /**
+     * Fill with default integers.
      */
     public void fillDefaultIntegers() {
         /* Simulator prefs */
@@ -216,8 +223,8 @@ public class VSDefaultPrefs extends VSPrefs {
         initInteger("div.window.ysize", 768, "Hauptfenster Y-Achse", 600, 2400, "px");
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillDefaultFloats()
+    /**
+     * Fill with default floats.
      */
     public void fillDefaultFloats() {
         /* Simulator prefs */
@@ -234,8 +241,8 @@ public class VSDefaultPrefs extends VSPrefs {
         initLong("message.sendingtime.max", 2000, "Maximale Übertragungszeit", "ms");
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillDefaultColors()
+    /**
+     * Fill with default colors.
      */
     public void fillDefaultColors() {
         /* Internal prefs */
@@ -253,15 +260,14 @@ public class VSDefaultPrefs extends VSPrefs {
         initColor("col.message.lost", new Color(0xFF, 0x00, 0x00));
     }
 
-    /* (non-Javadoc)
-     * @see prefs.VSPrefs#fillDefaultBooleans()
+    /**
+     * Fill with default booleans.
      */
     public void fillDefaultBooleans() {
-        //initBoolean("message.broadcast", false, "Nachrichten sind immer Broadcasts");
         initBoolean("sim.mode.expert", false, "Expertenmodus aktivieren");
         initBoolean("sim.message.own.recv", false, "Prozesse empfangen eigene Nachrichten");
         initBoolean("sim.message.prob.mean", true, "Mittelwerte der Nachrichtausfallw'k. bilden");
-        initBoolean("sim.messages.relevant", true, "Nur alle relevanten Nachrichten ausliefern");
+        initBoolean("sim.messages.relevant", true, "Nur relevante Nachrichten anzeigen");
         initBoolean("sim.periodic", false, "Simulation periodisch wiederholen");
     }
 }
diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java
index 70f378f..b6b8f42 100644
--- a/sources/prefs/VSPrefs.java
+++ b/sources/prefs/VSPrefs.java
@@ -910,36 +910,6 @@ public class VSPrefs implements VSSerializable {
         stringPrefs.put(key, val);
     }
 
-    /**
-     * Fill default strings.
-     */
-    public void fillDefaultStrings() {}
-
-    /**
-     * Fill default integers.
-     */
-    public void fillDefaultIntegers() {}
-
-    /**
-     * Fill default floats.
-     */
-    public void fillDefaultFloats() {}
-
-    /**
-     * Fill default colors.
-     */
-    public void fillDefaultColors() {}
-
-    /**
-     * Fill default booleans.
-     */
-    public void fillDefaultBooleans() {}
-
-    /**
-     * Fill with defaults.
-     */
-    public void fillWithDefaults() {}
-
     /* (non-Javadoc)
      * @see serialize.VSSerializable#serialize(serialize.VSSerialize,
      *	java.io.ObjectOutputStream)
diff --git a/sources/serialize/VSSerialize.java b/sources/serialize/VSSerialize.java
index d70c582..8924beb 100644
--- a/sources/serialize/VSSerialize.java
+++ b/sources/serialize/VSSerialize.java
@@ -227,8 +227,9 @@ public final class VSSerialize {
             ObjectInputStream objectInputStream =
                 new ObjectInputStream(fileInputStream);
 
-            VSPrefs prefs = new VSPrefs();
+            VSDefaultPrefs prefs = new VSDefaultPrefs();
             prefs.deserialize(this, objectInputStream);
+			prefs.addWithDefaults();
             this.setObject("prefs", prefs);
 
             simulator = new VSSimulator(prefs, simulatorFrame);