A new package events.internal has been introduced. It only contains events which are for internal usage. the events which are in the events.implementations menu are the events which are editable in the task manager.

3 files changed, 36 insertions, 34 deletions

diff --git a/sources/simulator/VSSimulation.java b/sources/simulator/VSSimulation.java
index 558eeaf..1866813 100644
--- a/sources/simulator/VSSimulation.java
+++ b/sources/simulator/VSSimulation.java
@@ -11,6 +11,7 @@ import javax.swing.table.*;
 import core.*;
 import events.*;
 import events.implementations.*;
+import events.internal.*;
 import prefs.*;
 import protocols.*;
 import utils.*;
@@ -37,7 +38,7 @@ public class VSSimulation extends JPanel {
     private Thread thread;
     private VSLogging logging;
     private VSPrefs prefs;
-    private VSSimulationPanel simulationPanel;
+    private VSSimulationCanvas simulationCanvas;
     private boolean hasStarted = false;
     private VSTaskManagerTableModel taskManagerLocalModel;
     private VSTaskManagerTableModel taskManagerGlobalModel;
@@ -102,7 +103,7 @@ public class VSSimulation extends JPanel {
         logging.logg(prefs.getString("lang.simulation.new"));
         fillContentPane();
 
-        int numProcesses = simulationPanel.getNumProcesses();
+        int numProcesses = simulationCanvas.getNumProcesses();
 
         for (int i = 0; i <= numProcesses; ++i) {
             localTextFields.add("0000");
@@ -113,7 +114,7 @@ public class VSSimulation extends JPanel {
         localPIDComboBox.setSelectedIndex(0);
         globalPIDComboBox.setSelectedIndex(0);
 
-        thread = new Thread(simulationPanel);
+        thread = new Thread(simulationCanvas);
         thread.start();
     }
 
@@ -129,18 +130,18 @@ public class VSSimulation extends JPanel {
             prefs.getInteger("window.ysize")
             - prefs.getInteger("window.loggsize"));
 
-        simulationPanel = new VSSimulationPanel(prefs, this, logging);
-        taskManager = simulationPanel.getTaskManager();
-        logging.setSimulationPanel(simulationPanel);
-        simulationPanel.setBackground(prefs.getColor("paintarea.background"));
+        simulationCanvas = new VSSimulationCanvas(prefs, this, logging);
+        taskManager = simulationCanvas.getTaskManager();
+        logging.setSimulationCanvas(simulationCanvas);
+        simulationCanvas.setBackground(prefs.getColor("paintarea.background"));
 
         JPanel canvasPanel = new JPanel();
         canvasPanel.setLayout(new GridLayout(1, 1, 3, 3));
-        canvasPanel.add(simulationPanel);
+        canvasPanel.add(simulationCanvas);
         canvasPanel.setMinimumSize(new Dimension(0, 0));
         canvasPanel.setMaximumSize(new Dimension(0, 0));
 
-        //JScrollPane paintScrollPane = new JScrollPane(simulationPanel);
+        //JScrollPane paintScrollPane = new JScrollPane(simulationCanvas);
         JScrollPane textScrollPane = new JScrollPane(loggingArea);
         JPanel toolsPanel = createToolsPanel();
 
@@ -175,7 +176,7 @@ public class VSSimulation extends JPanel {
             public void stateChanged(ChangeEvent ce) {
                 AbstractButton abstractButton = (AbstractButton) ce.getSource();
                 ButtonModel buttonModel = abstractButton.getModel();
-                simulationPanel.showLamport(buttonModel.isSelected());
+                simulationCanvas.showLamport(buttonModel.isSelected());
                 if (buttonModel.isSelected())
                     vectorTimeActiveCheckBox.setSelected(false);
             }
@@ -188,7 +189,7 @@ public class VSSimulation extends JPanel {
             public void stateChanged(ChangeEvent ce) {
                 AbstractButton abstractButton = (AbstractButton) ce.getSource();
                 ButtonModel buttonModel = abstractButton.getModel();
-                simulationPanel.showVectorTime(buttonModel.isSelected());
+                simulationCanvas.showVectorTime(buttonModel.isSelected());
                 if (buttonModel.isSelected())
                     lamportActiveCheckBox.setSelected(false);
             }
@@ -201,7 +202,7 @@ public class VSSimulation extends JPanel {
             public void stateChanged(ChangeEvent ce) {
                 AbstractButton abstractButton = (AbstractButton) ce.getSource();
                 ButtonModel buttonModel = abstractButton.getModel();
-                simulationPanel.isAntiAliased(buttonModel.isSelected());
+                simulationCanvas.isAntiAliased(buttonModel.isSelected());
             }
         });
         toolsPanel.add(antiAliasing);
@@ -269,11 +270,11 @@ public class VSSimulation extends JPanel {
         globalPIDComboBox = new JComboBox();
 
         lastSelectedProcessNum = 0;
-        int numProcesses = simulationPanel.getNumProcesses();
+        int numProcesses = simulationCanvas.getNumProcesses();
         String processString = prefs.getString("lang.process");
 
         for (int i = 0; i < numProcesses; ++i) {
-            int pid = simulationPanel.getProcess(i).getProcessID();
+            int pid = simulationCanvas.getProcess(i).getProcessID();
             processesComboBox.addItem(processString + " " + pid);
             localPIDComboBox.addItem("PID: " + pid);
             globalPIDComboBox.addItem("PID: " + pid);
@@ -701,7 +702,7 @@ public class VSSimulation extends JPanel {
         String deactivate = prefs.getString("lang.deactivate");
         String client = prefs.getString("lang.client");
         String server = prefs.getString("lang.server");
-        String protocolEventClassname = "events.implementations.ProtocolEvent";
+        String protocolEventClassname = "events.internal.ProtocolEvent";
 
         for (String eventClassname : eventClassnames) {
             String eventShortname_ = VSRegisteredEvents.getShortname(eventClassname);
@@ -772,12 +773,12 @@ public class VSSimulation extends JPanel {
         } catch (NumberFormatException e) {
         }
 
-        return simulationPanel.getNumProcesses();
+        return simulationCanvas.getNumProcesses();
     }
 
     private VSProcess getSelectedProcess() {
         int processNum = getSelectedProcessNum();
-        return simulationPanel.getProcess(processNum);
+        return simulationCanvas.getProcess(processNum);
     }
 
     private ArrayList<VSProcess> getConcernedProcesses(boolean localTasks) {
@@ -785,11 +786,11 @@ public class VSSimulation extends JPanel {
                          ? localPIDComboBox.getSelectedIndex()
                          : globalPIDComboBox.getSelectedIndex();
 
-        if (processNum == simulationPanel.getNumProcesses())
-            return simulationPanel.getProcessesArray();
+        if (processNum == simulationCanvas.getNumProcesses())
+            return simulationCanvas.getProcessesArray();
 
         ArrayList<VSProcess> arr = new ArrayList<VSProcess>();
-        arr.add(simulationPanel.getProcess(processNum));
+        arr.add(simulationCanvas.getProcess(processNum));
 
         return arr;
     }
@@ -817,8 +818,8 @@ public class VSSimulation extends JPanel {
         return menuItemStates;
     }
 
-    public VSSimulationPanel getSimulationPanel() {
-        return simulationPanel;
+    public VSSimulationCanvas getSimulationCanvas() {
+        return simulationCanvas;
     }
 
     public VSFrame getSimulatorFrame() {
diff --git a/sources/simulator/VSSimulationPanel.java b/sources/simulator/VSSimulationCanvas.java
index d501f22..37f5f51 100644
--- a/sources/simulator/VSSimulationPanel.java
+++ b/sources/simulator/VSSimulationCanvas.java
@@ -11,11 +11,12 @@ import core.*;
 import core.time.*;
 import events.*;
 import events.implementations.*;
+import events.internal.*;
 import prefs.*;
 import prefs.editors.*;
 import utils.*;
 
-public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionListener, MouseListener, HierarchyBoundsListener  {
+public class VSSimulationCanvas extends Canvas implements Runnable, MouseMotionListener, MouseListener, HierarchyBoundsListener  {
     private VSProcess highlightedProcess;
     private VSSimulation simulation;
     private VSPrefs prefs;
@@ -152,7 +153,7 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
         }
     }
 
-    public VSSimulationPanel(VSPrefs prefs, VSSimulation simulation, VSLogging logging) {
+    public VSSimulationCanvas(VSPrefs prefs, VSSimulation simulation, VSLogging logging) {
         this.prefs = prefs;
         this.simulation = simulation;
         this.logging = logging;
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index 41fd196..e27f896 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -145,7 +145,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             public void stateChanged(ChangeEvent ce) {
                 JTabbedPane pane = (JTabbedPane) ce.getSource();
                 currentSimulation = (VSSimulation) pane.getSelectedComponent();
-                currentSimulation.getSimulationPanel().paint();
+                currentSimulation.getSimulationCanvas().paint();
                 updateEditMenu();
                 updateSimulationMenu();
             }
@@ -162,7 +162,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             return;
 
         final String processString = prefs.getString("lang.process");
-        final int numProcesses = currentSimulation.getSimulationPanel().getNumProcesses();
+        final int numProcesses = currentSimulation.getSimulationCanvas().getNumProcesses();
 
         for (int i = 0; i < numProcesses; ++i) {
             JMenuItem processItem = new JMenuItem(processString + " " + (i+1));
@@ -171,7 +171,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             final int finalProcessNum = i;
             processItem.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent ae) {
-                    currentSimulation.getSimulationPanel().editProcess(finalProcessNum);
+                    currentSimulation.getSimulationCanvas().editProcess(finalProcessNum);
                 }
             });
             menuEdit.add(processItem);
@@ -189,7 +189,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
 
     public void dispose() {
         for (VSSimulation simulation : simulations)
-            simulation.getSimulationPanel().stopThread();
+            simulation.getSimulationCanvas().stopThread();
         super.dispose();
     }
 
@@ -223,7 +223,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             menuItemState.setPause(true);
             menuItemState.setReset(false);
             menuItemState.setReplay(true);
-            currentSimulation.getSimulationPanel().play();
+            currentSimulation.getSimulationCanvas().play();
             updateSimulationMenu();
 
         } else if (source.getText().equals(prefs.getString("lang.pause"))) {
@@ -232,7 +232,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             menuItemState.setPause(false);
             menuItemState.setReset(true);
             menuItemState.setReplay(true);
-            currentSimulation.getSimulationPanel().pause();
+            currentSimulation.getSimulationCanvas().pause();
             updateSimulationMenu();
 
         } else if (source.getText().equals(prefs.getString("lang.reset"))) {
@@ -241,7 +241,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             menuItemState.setPause(false);
             menuItemState.setReset(false);
             menuItemState.setReplay(false);
-            currentSimulation.getSimulationPanel().reset();
+            currentSimulation.getSimulationCanvas().reset();
             updateSimulationMenu();
 
         } else if (source.getText().equals(prefs.getString("lang.replay"))) {
@@ -250,8 +250,8 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
             menuItemState.setPause(true);
             menuItemState.setReset(false);
             menuItemState.setReplay(true);
-            currentSimulation.getSimulationPanel().reset();
-            currentSimulation.getSimulationPanel().play();
+            currentSimulation.getSimulationCanvas().reset();
+            currentSimulation.getSimulationCanvas().play();
             updateSimulationMenu();
         }
     }
@@ -271,6 +271,6 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
         VSSimulation simulationToRemove = currentSimulation;
         simulations.remove(simulationToRemove);
         tabbedPane.remove(simulationToRemove);
-        simulationToRemove.getSimulationPanel().stopThread();
+        simulationToRemove.getSimulationCanvas().stopThread();
     }
 }