INitial new Protocol Editor.

3 files changed, 64 insertions, 7 deletions

diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index 428df66..262f9b0 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -65,8 +65,8 @@ public class VSDefaultPrefs extends VSPrefs {
         initString("lang.events.protocol", "Protokollereignisse");
         initString("lang.file", "Datei");
         initString("lang.filter", "Filter");
-        initString("lang.global", "Global");
-        initString("lang.local", "Lokal");
+        initString("lang.timed.global", "Globale Ereignisse");
+        initString("lang.timed.local", "Lokale Ereignisse");
         initString("lang.logging.active", "Logging");
         initString("lang.logging.clear", "Loggs löschen");
         initString("lang.message", "Nachricht");
@@ -76,6 +76,7 @@ public class VSDefaultPrefs extends VSPrefs {
         initString("lang.open", "Öffnen");
         initString("lang.pause", "Pausieren");
         initString("lang.variables", "Variablen");
+        initString("lang.protocols", "Protokolle");
         initString("lang.variable", "Variable");
         initString("lang.value", "Wert");
         initString("lang.variables.global", "Globale Variablen");
@@ -86,7 +87,7 @@ public class VSDefaultPrefs extends VSPrefs {
         initString("lang.prefs.process", "Prozesseinstellungen");
         initString("lang.prefs.process.ext", "Erweiterte Prozesseinstellungen");
         initString("lang.prefs.process.info!", "Änderungen werden erst nach Betätigen des \"Übernehmen\" Knopfes übernommen!");
-        //initString("lang.prefs.protocol", "Protokolleinstellungen");
+        initString("lang.prefs.protocols", "Protokolleinstellungen");
         initString("lang.process", "Prozess");
         initString("lang.process.id", "PID");
         initString("lang.process.new", "Neuer Prozess");
diff --git a/sources/prefs/editors/VSProtocolEditor.java b/sources/prefs/editors/VSProtocolEditor.java
new file mode 100644
index 0000000..1700cba
--- /dev/null
+++ b/sources/prefs/editors/VSProtocolEditor.java
@@ -0,0 +1,52 @@
+package prefs.editors;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.table.*;
+import javax.swing.border.*;
+import javax.swing.filechooser.*;
+import java.util.*;
+import java.io.File;
+
+import simulator.*;
+import utils.*;
+import core.*;
+import protocols.*;
+import events.*;
+import prefs.VSPrefs;
+
+public class VSProtocolsEditor extends VSBetterEditor {
+    private VSProcess process;
+    public static boolean TAKEOVER_BUTTON;
+
+    public VSProtocolsEditor(VSPrefs prefs, VSProcess process) {
+        super(prefs, process, prefs.getString("lang.name") + " - " + prefs.getString("lang.prefs.protocols"));;
+        this.process = process;
+        disposeFrameWithParentIfExists();
+    }
+
+    protected void addToButtonPanelFront(JPanel buttonPanel) {
+        JButton takeoverButton = new JButton(
+            prefs.getString("lang.takeover"));
+        takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
+        takeoverButton.addActionListener(this);
+        buttonPanel.add(takeoverButton);
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        String actionCommand = e.getActionCommand();
+
+        if (actionCommand.equals(prefs.getString("lang.ok"))) {
+            savePrefs();
+            process.updateFromVSPrefs();
+
+        } else if (actionCommand.equals(prefs.getString("lang.takeover"))) {
+            savePrefs();
+            process.updateFromVSPrefs();
+
+        } else {
+            super.actionPerformed(e);
+        }
+    }
+}
diff --git a/sources/simulator/VSSimulation.java b/sources/simulator/VSSimulation.java
index 7a7e545..9440f02 100644
--- a/sources/simulator/VSSimulation.java
+++ b/sources/simulator/VSSimulation.java
@@ -346,6 +346,7 @@ public class VSSimulation extends JPanel {
 
                 if (processNum == simulationCanvas.getNumProcesses()) {
                     tabbedPane.setEnabledAt(1, false);
+                    tabbedPane.setEnabledAt(2, false);
                     if (tabbedPane.getSelectedIndex() == 1)
                         tabbedPane.setSelectedIndex(0);
 
@@ -355,13 +356,16 @@ public class VSSimulation extends JPanel {
 
                 if (processNum != simulationCanvas.getNumProcesses()) {
                     VSProcess process = getSelectedProcess();
-                    VSProcessEditor editor = new VSProcessEditor(prefs, process);
-                    tabbedPane.setComponentAt(1, editor.getContentPane());
+                    VSProcessEditor processEditor = new VSProcessEditor(prefs, process);
+                    tabbedPane.setComponentAt(1, processEditor.getContentPane());
+					VSProtocolEditor protocolEditor = new VSProtocolEditor(prefs, process);
+                    tabbedPane.setComponentAt(2, protocolEditor.getContentPane());
                 }
             }
         });
 
         tabbedPane.add(prefs.getString("lang.variables"), null);
+        tabbedPane.add(prefs.getString("lang.protocols"), null);
 
         editPanel.add(processesComboBox);
         editPanel.add(tabbedPane);
@@ -382,9 +386,9 @@ public class VSSimulation extends JPanel {
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
         if (localTasks)
-            panel.add(createLabelPanel(prefs.getString("lang.local")));
+            panel.add(createLabelPanel(prefs.getString("lang.timed.local")));
         else
-            panel.add(createLabelPanel(prefs.getString("lang.global")));
+            panel.add(createLabelPanel(prefs.getString("lang.timed.global")));
 
         JScrollPane scrollPane = new JScrollPane(createTaskTable(localTasks));
         panel.add(scrollPane);