From ca09c67e85acb0ab6c85c87f0dd0c05b35262b12 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 28 May 2008 22:11:57 +0000 Subject: alle event classnames now have a VS prefix. --- sources/core/VSProcess.java | 2 +- sources/core/VSTask.java | 18 +++++++++--------- sources/core/VSTaskManager.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sources/core') 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; -- cgit v1.2.3