A VSMessage is not a VSEvent any more. Instead a MessageReceiveEvent has been introduced.

3 files changed, 8 insertions, 5 deletions

diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java
index 2f4c188..4398226 100644
--- a/sources/simulator/VSMain.java
+++ b/sources/simulator/VSMain.java
@@ -27,7 +27,7 @@ public class VSMain {
                 UIManager.getCrossPlatformLookAndFeelClassName());
         } catch (Exception e) { }
 
-			javax.swing.JPopupMenu.setDefaultLightWeightPopupEnabled(false);
+        javax.swing.JPopupMenu.setDefaultLightWeightPopupEnabled(false);
         VSPrefs prefs = VSDefaultPrefs.init();
         VSRegisteredEvents.init(prefs);
         new VSMain(prefs);
diff --git a/sources/simulator/VSSimulation.java b/sources/simulator/VSSimulation.java
index 3252e58..8b4515b 100644
--- a/sources/simulator/VSSimulation.java
+++ b/sources/simulator/VSSimulation.java
@@ -70,7 +70,7 @@ public class VSSimulation extends VSFrame implements ActionListener {
             globalTextFields.add("0000");
         }
 
-		processesComboBox.setSelectedIndex(numProcesses);
+        processesComboBox.setSelectedIndex(numProcesses);
     }
 
     private JMenuBar createJMenuBar() {
diff --git a/sources/simulator/VSSimulationPanel.java b/sources/simulator/VSSimulationPanel.java
index 9599ea2..fb7d6a1 100644
--- a/sources/simulator/VSSimulationPanel.java
+++ b/sources/simulator/VSSimulationPanel.java
@@ -665,6 +665,7 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
 
     public void sendMessage(VSMessage message) {
         VSTask task = null;
+        VSEvent messageReceiveEvent = null;
         VSProcess sendingProcess = message.getSendingProcess();
         long deliverTime, outageTime, durationTime;
         boolean recvOwn = prefs.getBoolean("sim.message.own.recv");
@@ -673,7 +674,8 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
             if (receiverProcess.equals(sendingProcess)) {
                 if (recvOwn) {
                     deliverTime = sendingProcess.getGlobalTime();
-                    task = new VSTask(deliverTime, receiverProcess, message, VSTask.GLOBAL);
+                    messageReceiveEvent = new MessageReceiveEvent(message);
+                    task = new VSTask(deliverTime, receiverProcess, messageReceiveEvent, VSTask.GLOBAL);
                     taskManager.addTask(task);
                 }
 
@@ -684,7 +686,8 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
 
                 /* Only add a 'receiving message' task if the message will not get lost! */
                 if (outageTime == -1) {
-                    task = new VSTask(deliverTime, receiverProcess, message, VSTask.GLOBAL);
+                    messageReceiveEvent = new MessageReceiveEvent(message);
+                    task = new VSTask(deliverTime, receiverProcess, messageReceiveEvent, VSTask.GLOBAL);
                     taskManager.addTask(task);
                 }
 
@@ -724,7 +727,7 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
                 }
             };
 
-		
+
             JPopupMenu popup = new JPopupMenu();
             JMenuItem item = new JMenuItem(prefs.getString("lang.edit"));
             item.addActionListener(actionListener);