summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sources/core/VSProcess.java2
-rw-r--r--sources/core/VSTask.java18
-rw-r--r--sources/core/VSTaskManager.java4
-rw-r--r--sources/events/VSRegisteredEvents.java4
-rw-r--r--sources/events/implementations/VSProcessCrashEvent.java (renamed from sources/events/implementations/ProcessCrashEvent.java)4
-rw-r--r--sources/events/implementations/VSProcessRecoverEvent.java (renamed from sources/events/implementations/ProcessRecoverEvent.java)4
-rw-r--r--sources/events/internal/VSMessageReceiveEvent.java (renamed from sources/events/internal/MessageReceiveEvent.java)6
-rw-r--r--sources/events/internal/VSProtocolEvent.java (renamed from sources/events/internal/ProtocolEvent.java)4
-rw-r--r--sources/events/internal/VSProtocolScheduleEvent.java (renamed from sources/events/internal/ProtocolScheduleEvent.java)8
-rw-r--r--sources/protocols/VSAbstractProtocol.java2
-rw-r--r--sources/simulator/VSSimulator.java6
-rw-r--r--sources/simulator/VSSimulatorCanvas.java8
12 files changed, 35 insertions, 35 deletions
diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java
index c7663d7..7071ae2 100644
--- a/sources/core/VSProcess.java
+++ b/sources/core/VSProcess.java
@@ -350,7 +350,7 @@ public class VSProcess extends VSPrefs {
taskManager.removeTask(randomCrashTask);
if (crashTime >= getGlobalTime()) {
- VSAbstractEvent event = new ProcessCrashEvent();
+ VSAbstractEvent event = new VSProcessCrashEvent();
randomCrashTask = new VSTask(crashTime, this, event,
VSTask.GLOBAL);
taskManager.addTask(randomCrashTask);
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index e281399..0bc0d3f 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -109,8 +109,8 @@ public class VSTask implements Comparable {
*
* @return true, if it is a message receive event
*/
- public boolean isMessageReceiveEvent() {
- return event instanceof MessageReceiveEvent;
+ public boolean isVSMessageReceiveEvent() {
+ return event instanceof VSMessageReceiveEvent;
}
/**
@@ -118,8 +118,8 @@ public class VSTask implements Comparable {
*
* @return true, if it is a process recover event
*/
- public boolean isProcessRecoverEvent() {
- return event instanceof ProcessRecoverEvent;
+ public boolean isVSProcessRecoverEvent() {
+ return event instanceof VSProcessRecoverEvent;
}
/**
@@ -252,8 +252,8 @@ public class VSTask implements Comparable {
return 1;
/* If it's a ProtocolRecover, it should get handled very first */
- boolean a = event instanceof ProcessRecoverEvent;
- boolean b = task.getEvent() instanceof ProcessRecoverEvent;
+ boolean a = event instanceof VSProcessRecoverEvent;
+ boolean b = task.getEvent() instanceof VSProcessRecoverEvent;
if (a && b)
return 0;
@@ -264,9 +264,9 @@ public class VSTask implements Comparable {
if (b)
return 1;
- /* If it's a ProtocolEvent, it should get handled first */
- a = event instanceof ProtocolEvent;
- b = task.getEvent() instanceof ProtocolEvent;
+ /* If it's a VSProtocolEvent, it should get handled first */
+ a = event instanceof VSProtocolEvent;
+ b = task.getEvent() instanceof VSProtocolEvent;
if (a && b)
return 0;
diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index 2dc64da..189665a 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -88,7 +88,7 @@ public class VSTaskManager {
globalTasks.poll();
redo = true;
- if (process.isCrashed() && !task.isProcessRecoverEvent()) {
+ if (process.isCrashed() && !task.isVSProcessRecoverEvent()) {
if (task.isProgrammed())
fullfilledProgrammedTasks.add(task);
continue;
@@ -143,7 +143,7 @@ public class VSTaskManager {
tasks.poll();
redo = true;
- if (process.isCrashed() && !task.isProcessRecoverEvent()) {
+ if (process.isCrashed() && !task.isVSProcessRecoverEvent()) {
if (task.isProgrammed())
fullfilledProgrammedTasks.add(task);
continue;
diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java
index 05857be..c9fc79a 100644
--- a/sources/events/VSRegisteredEvents.java
+++ b/sources/events/VSRegisteredEvents.java
@@ -56,8 +56,8 @@ public final class VSRegisteredEvents {
public static void init(VSPrefs prefs_) {
prefs = prefs_;
- registerEvent("events.implementations.ProcessCrashEvent", "Prozessabsturz", null);
- registerEvent("events.implementations.ProcessRecoverEvent", "Prozesswiederbelebung", null);
+ registerEvent("events.implementations.VSProcessCrashEvent", "Prozessabsturz", null);
+ registerEvent("events.implementations.VSProcessRecoverEvent", "Prozesswiederbelebung", null);
registerEvent("protocols.implementations.BerkelyTimeProtocol", "Berkeley Algorithmus zur internen Sync.", "Berkeley");
registerEvent("protocols.implementations.BroadcastSturmProtocol", "Broadcaststurm", null);
registerEvent("protocols.implementations.DummyProtocol", "Beispiel/Dummy", null);
diff --git a/sources/events/implementations/ProcessCrashEvent.java b/sources/events/implementations/VSProcessCrashEvent.java
index d0db00e..637a2b1 100644
--- a/sources/events/implementations/ProcessCrashEvent.java
+++ b/sources/events/implementations/VSProcessCrashEvent.java
@@ -7,9 +7,9 @@ package events.implementations;
import events.VSAbstractEvent;
/**
- * The Class ProcessCrashEvent.
+ * The Class VSProcessCrashEvent.
*/
-public class ProcessCrashEvent extends VSAbstractEvent {
+public class VSProcessCrashEvent extends VSAbstractEvent {
/* (non-Javadoc)
* @see events.VSAbstractEvent#onInit()
diff --git a/sources/events/implementations/ProcessRecoverEvent.java b/sources/events/implementations/VSProcessRecoverEvent.java
index 6ba4276..25bab7a 100644
--- a/sources/events/implementations/ProcessRecoverEvent.java
+++ b/sources/events/implementations/VSProcessRecoverEvent.java
@@ -7,9 +7,9 @@ package events.implementations;
import events.VSAbstractEvent;
/**
- * The Class ProcessRecoverEvent.
+ * The Class VSProcessRecoverEvent.
*/
-public class ProcessRecoverEvent extends VSAbstractEvent {
+public class VSProcessRecoverEvent extends VSAbstractEvent {
private static final long serialVersionUID = 1L;
/* (non-Javadoc)
diff --git a/sources/events/internal/MessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java
index 60538df..ff97010 100644
--- a/sources/events/internal/MessageReceiveEvent.java
+++ b/sources/events/internal/VSMessageReceiveEvent.java
@@ -9,9 +9,9 @@ import events.VSAbstractEvent;
import protocols.VSAbstractProtocol;
/**
- * The Class MessageReceiveEvent.
+ * The Class VSMessageReceiveEvent.
*/
-public class MessageReceiveEvent extends VSAbstractEvent {
+public class VSMessageReceiveEvent extends VSAbstractEvent {
private static final long serialVersionUID = 1L;
/** The message. */
@@ -22,7 +22,7 @@ public class MessageReceiveEvent extends VSAbstractEvent {
*
* @param message the message
*/
- public MessageReceiveEvent(VSMessage message) {
+ public VSMessageReceiveEvent(VSMessage message) {
this.message = message;
}
diff --git a/sources/events/internal/ProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index 4b9adc3..d5051f3 100644
--- a/sources/events/internal/ProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -8,9 +8,9 @@ import events.*;
import protocols.VSAbstractProtocol;
/**
- * The Class ProtocolEvent.
+ * The Class VSProtocolEvent.
*/
-public class ProtocolEvent extends VSAbstractEvent {
+public class VSProtocolEvent extends VSAbstractEvent {
private static final long serialVersionUID = 1L;
/** The protocol classname. */
diff --git a/sources/events/internal/ProtocolScheduleEvent.java b/sources/events/internal/VSProtocolScheduleEvent.java
index bbb776c..9b6e664 100644
--- a/sources/events/internal/ProtocolScheduleEvent.java
+++ b/sources/events/internal/VSProtocolScheduleEvent.java
@@ -8,9 +8,9 @@ import events.*;
import protocols.VSAbstractProtocol;
/**
- * The Class ProtocolScheduleEvent.
+ * The Class VSProtocolScheduleEvent.
*/
-public class ProtocolScheduleEvent extends VSAbstractEvent {
+public class VSProtocolScheduleEvent extends VSAbstractEvent {
private static final long serialVersionUID = 1L;
/** The event is a server protocol schedule. */
@@ -20,12 +20,12 @@ public class ProtocolScheduleEvent extends VSAbstractEvent {
private VSAbstractProtocol protocol;
/**
- * Create a ProtocolScheduleEvent object
+ * Create a VSProtocolScheduleEvent object
*
* @param protocol the protocol
* @param isServerSchedule the event is a client protocol schedule if false, else server schedule
*/
- public ProtocolScheduleEvent(VSAbstractProtocol protocol, boolean isServerSchedule) {
+ public VSProtocolScheduleEvent(VSAbstractProtocol protocol, boolean isServerSchedule) {
this.protocol = protocol;
this.isServerSchedule = isServerSchedule;
}
diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java
index 461fe01..1cb5281 100644
--- a/sources/protocols/VSAbstractProtocol.java
+++ b/sources/protocols/VSAbstractProtocol.java
@@ -218,7 +218,7 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
* @param time The process' local time to run the schedule at.
*/
public final void scheduleAt(long time) {
- VSAbstractEvent scheduleEvent = new ProtocolScheduleEvent(this, currentContextIsServer);
+ VSAbstractEvent scheduleEvent = new VSProtocolScheduleEvent(this, currentContextIsServer);
VSTask scheduleTask = new VSTask(time, process, scheduleEvent, VSTask.LOCAL);
if (currentContextIsServer)
serverSchedules.add(scheduleTask);
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index c9066ad..26f6731 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -475,7 +475,7 @@ public class VSSimulator extends JPanel {
/** The shortname. */
private String shortname;
- /* Those 3 values are for ProtocolEvent events */
+ /* Those 3 values are for VSProtocolEvent events */
/** The is protocol activation. */
private boolean isProtocolActivation;
@@ -582,7 +582,7 @@ public class VSSimulator extends JPanel {
event.setShortname(shortname);
if (isProtocolActivation || isProtocolDeactivation) {
- ProtocolEvent protocolEvent = (ProtocolEvent) event;
+ VSProtocolEvent protocolEvent = (VSProtocolEvent) event;
protocolEvent.setProtocolClassname(protocolClassname);
protocolEvent.isProtocolActivation(isProtocolActivation);
protocolEvent.isClientProtocol(isClientProtocol);
@@ -959,7 +959,7 @@ public class VSSimulator extends JPanel {
String serverRequest = prefs.getString("lang.serverrequest.start");
String protocol = prefs.getString("lang.protocol");
- String protocolEventClassname = "events.internal.ProtocolEvent";
+ String protocolEventClassname = "events.internal.VSProtocolEvent";
eventClassnames = VSRegisteredEvents.getProtocolClassnames();
for (String eventClassname : eventClassnames) {
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java
index 0c71f82..f1df68a 100644
--- a/sources/simulator/VSSimulatorCanvas.java
+++ b/sources/simulator/VSSimulatorCanvas.java
@@ -1043,7 +1043,7 @@ public class VSSimulatorCanvas extends Canvas implements Runnable, MouseMotionLi
if (receiverProcess.equals(sendingProcess)) {
if (recvOwn) {
deliverTime = sendingProcess.getGlobalTime();
- messageReceiveEvent = new MessageReceiveEvent(message);
+ messageReceiveEvent = new VSMessageReceiveEvent(message);
task = new VSTask(deliverTime, receiverProcess, messageReceiveEvent, VSTask.GLOBAL);
taskManager.addTask(task);
}
@@ -1061,7 +1061,7 @@ public class VSSimulatorCanvas extends Canvas implements Runnable, MouseMotionLi
/* Only add a 'receiving message' task if the message will not get lost! */
if (outageTime == -1) {
- messageReceiveEvent = new MessageReceiveEvent(message);
+ messageReceiveEvent = new VSMessageReceiveEvent(message);
task = new VSTask(deliverTime, receiverProcess, messageReceiveEvent, VSTask.GLOBAL);
taskManager.addTask(task);
}
@@ -1091,11 +1091,11 @@ public class VSSimulatorCanvas extends Canvas implements Runnable, MouseMotionLi
editProcess(process);
} else if (actionCommand.equals(prefs.getString("lang.process.crash"))) {
- VSAbstractEvent event = new ProcessCrashEvent();
+ VSAbstractEvent event = new VSProcessCrashEvent();
taskManager.addTask(new VSTask(process.getGlobalTime(), process, event, VSTask.GLOBAL));
} else if (actionCommand.equals(prefs.getString("lang.process.recover"))) {
- VSAbstractEvent event = new ProcessRecoverEvent();
+ VSAbstractEvent event = new VSProcessRecoverEvent();
taskManager.addTask(new VSTask(process.getGlobalTime(), process, event, VSTask.GLOBAL));
} else if (actionCommand.equals(prefs.getString("lang.process.remove"))) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-08 02:36:19 +0000