Vectortimestamps work

Better representation of Lamporttimestamps
BerkelyTimeProtocol

M    trunk/ROADMAP
M    trunk/sources/prefs/VSPrefs.java
M    trunk/sources/prefs/VSDefaultPrefs.java
M    trunk/sources/simulator/VSMain.java
M    trunk/sources/simulator/VSSimulation.java
M    trunk/sources/simulator/VSSimulationPanel.java
M    trunk/sources/utils/VSFrame.java
M    trunk/sources/utils/VSClassLoader.java
M    trunk/sources/utils/VSInfoArea.java
M    trunk/sources/protocols/BroadcastSturmProtocol.java
M    trunk/sources/protocols/ExternalTimeSyncProtocol.java
M    trunk/sources/protocols/RegisteredProtocols.java
M    trunk/sources/protocols/PingPongProtocol.java
M    trunk/sources/protocols/InternalTimeSyncProtocol.java
M    trunk/sources/protocols/VSProtocol.java
M    trunk/sources/protocols/DummyProtocol.java
A    trunk/sources/protocols/BerkelyTimeProtocol.java
M    trunk/sources/core/VSLamport.java
M    trunk/sources/core/VSProcess.java
A    trunk/sources/core/VSTime.java
A    trunk/sources/core/VSVectorTime.java
M    trunk/sources/core/VSTask.java
M    trunk/sources/core/VSMessage.java
M    trunk/sources/editors/VSEditor.java
M    trunk/sources/editors/VSProtocolEditor.java
M    trunk/sources/editors/VSSimulationEditor.java
M    trunk/sources/editors/VSEditorFrame.java
M    trunk/sources/editors/VSProcessEditor.java

1 files changed, 19 insertions, 2 deletions

diff --git a/sources/simulator/VSSimulation.java b/sources/simulator/VSSimulation.java
index 2bc90d8..89ffd7c 100644
--- a/sources/simulator/VSSimulation.java
+++ b/sources/simulator/VSSimulation.java
@@ -23,6 +23,8 @@ public class VSSimulation extends VSFrame implements ActionListener {
     private VSPrefs prefs;
     private boolean hasStarted = false;
     private VSLogging logging;
+    private JCheckBox lamportActiveCheckBox;
+    private JCheckBox vectorTimeActiveCheckBox;
 
     public VSSimulation (VSPrefs prefs, Component relativeTo) {
         super(prefs.getString("name"), relativeTo);
@@ -193,17 +195,32 @@ public class VSSimulation extends VSFrame implements ActionListener {
         });
         toolsPanel.add(loggingActiveCheckBox);
 
-        JCheckBox lamportActiveCheckBox = new JCheckBox(prefs.getString("lang.time.lamport"));
+        lamportActiveCheckBox = new JCheckBox(prefs.getString("lang.time.lamport"));
         lamportActiveCheckBox.setSelected(false);
         lamportActiveCheckBox.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent ce) {
                 AbstractButton abstractButton = (AbstractButton) ce.getSource();
                 ButtonModel buttonModel = abstractButton.getModel();
                 simulationPanel.showLamport(buttonModel.isSelected());
+                if (buttonModel.isSelected())
+                    vectorTimeActiveCheckBox.setSelected(false);
             }
         });
         toolsPanel.add(lamportActiveCheckBox);
 
+        vectorTimeActiveCheckBox = new JCheckBox(prefs.getString("lang.time.vector"));
+        vectorTimeActiveCheckBox.setSelected(false);
+        vectorTimeActiveCheckBox.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent ce) {
+                AbstractButton abstractButton = (AbstractButton) ce.getSource();
+                ButtonModel buttonModel = abstractButton.getModel();
+                simulationPanel.showVectorTime(buttonModel.isSelected());
+                if (buttonModel.isSelected())
+                    lamportActiveCheckBox.setSelected(false);
+            }
+        });
+        toolsPanel.add(vectorTimeActiveCheckBox);
+
         return toolsPanel;
     }
 
@@ -252,7 +269,7 @@ public class VSSimulation extends VSFrame implements ActionListener {
             dispose();
 
         } else if (source.getText().equals(prefs.getString("lang.new"))) {
-            new VSMain(VSDefaultPrefs.initialize(), VSSimulation.this);
+            new VSMain(VSDefaultPrefs.init(), VSSimulation.this);
 
         } else if (source.getText().equals(prefs.getString("lang.about"))) {
             new VSAbout(prefs, VSSimulation.this);