diff options
Diffstat (limited to 'sources')
25 files changed, 152 insertions, 153 deletions
diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java index ffb17e4..caa081f 100644 --- a/sources/core/VSProcess.java +++ b/sources/core/VSProcess.java @@ -22,7 +22,7 @@ public class VSProcess extends VSPrefs { private static final long serialVersionUID = 1L; /** The protocols to reset if the simulation is over or the reset button has been pressed. */ - private ArrayList<VSProtocol> protocolsToReset; + private ArrayList<VSAbstractProtocol> protocolsToReset; /** The crash history. represents all crashes of the process using the global simulation time. */ private ArrayList<Long> crashHistory; @@ -161,7 +161,7 @@ public class VSProcess extends VSPrefs { * @param logging the logging object */ public VSProcess(VSPrefs prefs, int processNum, VSSimulatorCanvas simulationCanvas, VSLogging logging) { - this.protocolsToReset = new ArrayList<VSProtocol>(); + this.protocolsToReset = new ArrayList<VSAbstractProtocol>(); this.processNum = processNum; this.prefs = prefs; this.simulationCanvas = simulationCanvas; @@ -305,7 +305,7 @@ public class VSProcess extends VSPrefs { globalTime = 0; clockOffset = 0; - for (VSProtocol protocol : protocolsToReset) + for (VSAbstractProtocol protocol : protocolsToReset) protocol.reset(); setCurrentColor(getColor("col.process.default")); @@ -328,7 +328,7 @@ public class VSProcess extends VSPrefs { if (crashTime >= getGlobalTime()) { - VSEvent event = new ProcessCrashEvent(); + VSAbstractEvent event = new ProcessCrashEvent(); //event.init(this); randomCrashTask = new VSTask(crashTime, this, event, VSTask.GLOBAL); taskManager.addTask(randomCrashTask); @@ -885,17 +885,17 @@ public class VSProcess extends VSPrefs { * * @return the protocol object */ - public VSProtocol getProtocolObject(String protocolClassname) { - VSProtocol protocol = null; + public VSAbstractProtocol getProtocolObject(String protocolClassname) { + VSAbstractProtocol protocol = null; if (!objectExists(protocolClassname)) { - protocol = (VSProtocol) + protocol = (VSAbstractProtocol) VSRegisteredEvents.createEventInstanceByClassname(protocolClassname, this); setObject(protocolClassname, protocol); protocolsToReset.add(protocol); } else { - protocol = (VSProtocol) getObject(protocolClassname); + protocol = (VSAbstractProtocol) getObject(protocolClassname); } return protocol; diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java index 2c6500f..dc55fcc 100644 --- a/sources/core/VSTask.java +++ b/sources/core/VSTask.java @@ -8,7 +8,7 @@ import events.*; import events.implementations.*; import events.internal.*; import prefs.VSPrefs; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; /** * The Class VSTask. An object of this class represents a task to do or done. @@ -29,7 +29,7 @@ public class VSTask implements Comparable { private long taskTime; /** The event. */ - private VSEvent event; + private VSAbstractEvent event; /** The process. */ private VSProcess process; @@ -57,7 +57,7 @@ public class VSTask implements Comparable { * @param event the event * @param isLocal the taks is local timed */ - public VSTask(long taskTime, VSProcess process, VSEvent event, boolean isLocal) { + public VSTask(long taskTime, VSProcess process, VSAbstractEvent event, boolean isLocal) { this.process = process; this.taskTime = taskTime > 0 ? taskTime : 0; this.event = event; @@ -118,9 +118,9 @@ public class VSTask implements Comparable { * * @return true, if it's a task using the protocol object. */ - public boolean isProtocol(VSProtocol protocol) { - if (event instanceof VSProtocol) - return ((VSProtocol) event).equals(protocol); + public boolean isProtocol(VSAbstractProtocol protocol) { + if (event instanceof VSAbstractProtocol) + return ((VSAbstractProtocol) event).equals(protocol); return false; } @@ -200,7 +200,7 @@ public class VSTask implements Comparable { * * @return the event */ - public VSEvent getEvent() { + public VSAbstractEvent getEvent() { return event; } diff --git a/sources/events/VSEvent.java b/sources/events/VSAbstractEvent.java index 28abf8c..9562233 100644 --- a/sources/events/VSEvent.java +++ b/sources/events/VSAbstractEvent.java @@ -8,9 +8,9 @@ import core.VSProcess; import prefs.VSPrefs; /** - * The Class VSEvent. + * The Class VSAbstractEvent. */ -abstract public class VSEvent extends VSPrefs { +abstract public class VSAbstractEvent extends VSPrefs { private static final long serialVersionUID = 1L; /** The prefs. */ @@ -113,7 +113,7 @@ abstract public class VSEvent extends VSPrefs { * * @return true, if successful */ - public boolean equals(VSEvent event) { + public boolean equals(VSAbstractEvent event) { return super.getID() == event.getID(); } diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java index ca0b224..81b68dc 100644 --- a/sources/events/VSRegisteredEvents.java +++ b/sources/events/VSRegisteredEvents.java @@ -59,8 +59,8 @@ public final class VSRegisteredEvents { VSClassLoader classLoader = new VSClassLoader(); for (String protocolClassname : protocolClassnames) { Object object = classLoader.newInstance(protocolClassname); - if (object instanceof protocols.VSProtocol) { - protocols.VSProtocol protocol = (protocols.VSProtocol) object; + if (object instanceof protocols.VSAbstractProtocol) { + protocols.VSAbstractProtocol protocol = (protocols.VSAbstractProtocol) object; if (!protocol.isEmpty()) editableProtocolsClassnames.add(protocolClassname); } @@ -191,11 +191,11 @@ public final class VSRegisteredEvents { * * @return the lang.process.removeevent */ - public static VSEvent createEventInstanceByClassname(String eventClassname, VSProcess process) { + public static VSAbstractEvent createEventInstanceByClassname(String eventClassname, VSProcess process) { final Object protocolObj = new VSClassLoader().newInstance(eventClassname); - if (protocolObj instanceof VSEvent) { - VSEvent event = (VSEvent) protocolObj; + if (protocolObj instanceof VSAbstractEvent) { + VSAbstractEvent event = (VSAbstractEvent) protocolObj; event.init(process); return event; } @@ -211,7 +211,7 @@ public final class VSRegisteredEvents { * * @return the lang.process.removeevent */ - public static VSEvent createEventInstanceByName(String eventName, VSProcess process) { + public static VSAbstractEvent createEventInstanceByName(String eventName, VSProcess process) { return createEventInstanceByClassname(eventClassnames.get(eventName), process); } diff --git a/sources/events/implementations/ProcessCrashEvent.java b/sources/events/implementations/ProcessCrashEvent.java index 2064371..873debc 100644 --- a/sources/events/implementations/ProcessCrashEvent.java +++ b/sources/events/implementations/ProcessCrashEvent.java @@ -4,22 +4,22 @@ */ package events.implementations; -import events.VSEvent; +import events.VSAbstractEvent; /** * The Class ProcessCrashEvent. */ -public class ProcessCrashEvent extends VSEvent { +public class ProcessCrashEvent extends VSAbstractEvent { /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { setClassname(getClass().toString()); } /* (non-Javadoc) - * @see events.VSEvent#onStart() + * @see events.VSAbstractEvent#onStart() */ public void onStart() { if (!process.isCrashed()) { diff --git a/sources/events/implementations/ProcessRecoverEvent.java b/sources/events/implementations/ProcessRecoverEvent.java index 35f964a..9d85f13 100644 --- a/sources/events/implementations/ProcessRecoverEvent.java +++ b/sources/events/implementations/ProcessRecoverEvent.java @@ -4,23 +4,23 @@ */ package events.implementations; -import events.VSEvent; +import events.VSAbstractEvent; /** * The Class ProcessRecoverEvent. */ -public class ProcessRecoverEvent extends VSEvent { +public class ProcessRecoverEvent extends VSAbstractEvent { private static final long serialVersionUID = 1L; /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { setClassname(getClass().toString()); } /* (non-Javadoc) - * @see events.VSEvent#onStart() + * @see events.VSAbstractEvent#onStart() */ public void onStart() { if (process.isCrashed()) { diff --git a/sources/events/internal/MessageReceiveEvent.java b/sources/events/internal/MessageReceiveEvent.java index ba7f1b7..300c4b3 100644 --- a/sources/events/internal/MessageReceiveEvent.java +++ b/sources/events/internal/MessageReceiveEvent.java @@ -5,13 +5,13 @@ package events.internal; import core.VSMessage; -import events.VSEvent; -import protocols.VSProtocol; +import events.VSAbstractEvent; +import protocols.VSAbstractProtocol; /** * The Class MessageReceiveEvent. */ -public class MessageReceiveEvent extends VSEvent { +public class MessageReceiveEvent extends VSAbstractEvent { private static final long serialVersionUID = 1L; /** The message. */ @@ -27,14 +27,14 @@ public class MessageReceiveEvent extends VSEvent { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { setClassname(getClass().toString()); } /* (non-Javadoc) - * @see events.VSEvent#onStart() + * @see events.VSAbstractEvent#onStart() */ public void onStart() { String eventName = message.getName(); @@ -57,7 +57,7 @@ public class MessageReceiveEvent extends VSEvent { logg(buffer.toString()); } else { - final VSProtocol protocol = (VSProtocol) protocolObj; + final VSAbstractProtocol protocol = (VSAbstractProtocol) protocolObj; logg(buffer.toString()); protocol.onMessageRecv(message); } diff --git a/sources/events/internal/ProtocolEvent.java b/sources/events/internal/ProtocolEvent.java index eb20dc7..e5260db 100644 --- a/sources/events/internal/ProtocolEvent.java +++ b/sources/events/internal/ProtocolEvent.java @@ -5,12 +5,12 @@ package events.internal; import events.*; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; /** * The Class ProtocolEvent. */ -public class ProtocolEvent extends VSEvent { +public class ProtocolEvent extends VSAbstractEvent { private static final long serialVersionUID = 1L; /** The protocol classname. */ @@ -23,7 +23,7 @@ public class ProtocolEvent extends VSEvent { private boolean isProtocolActivation; /* true = activate, false = deactivate */ /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { setClassname(getClass().toString()); @@ -75,10 +75,10 @@ public class ProtocolEvent extends VSEvent { } /* (non-Javadoc) - * @see events.VSEvent#onStart() + * @see events.VSAbstractEvent#onStart() */ public void onStart() { - VSProtocol protocol = process.getProtocolObject(protocolClassname); + VSAbstractProtocol protocol = process.getProtocolObject(protocolClassname); if (isClientProtocol) protocol.isClient(isProtocolActivation); diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java index 915d8e3..f8beb66 100644 --- a/sources/prefs/VSPrefs.java +++ b/sources/prefs/VSPrefs.java @@ -11,7 +11,7 @@ import java.util.*; /** * The Class VSPrefs. */ -public abstract class VSPrefs implements Serializable { +public class VSPrefs implements Serializable { /** The Constant BOOLEAN_PREFIX. */ public static final String BOOLEAN_PREFIX = "Boolean: "; diff --git a/sources/prefs/editors/VSBetterEditor.java b/sources/prefs/editors/VSAbstractBetterEditor.java index ba15672..1f448f7 100644 --- a/sources/prefs/editors/VSBetterEditor.java +++ b/sources/prefs/editors/VSAbstractBetterEditor.java @@ -13,9 +13,9 @@ import utils.*; // TODO: Auto-generated Javadoc /** - * The Class VSBetterEditor. + * The Class VSAbstractBetterEditor. */ -public abstract class VSBetterEditor extends VSEditor { +public abstract class VSAbstractBetterEditor extends VSAbstractEditor { private static final long serialVersionUID = 1L; /** The content pane. */ @@ -34,7 +34,7 @@ public abstract class VSBetterEditor extends VSEditor { * @param prefsToEdit the prefs to edit * @param title the title */ - public VSBetterEditor(VSPrefs prefs, VSPrefs prefsToEdit, String title) { + public VSAbstractBetterEditor(VSPrefs prefs, VSPrefs prefsToEdit, String title) { super(prefs, prefsToEdit); this.title = title; this.contentPane = createContentPane(); @@ -81,22 +81,22 @@ public abstract class VSBetterEditor extends VSEditor { } /* (non-Javadoc) - * @see prefs.editors.VSEditor#addToButtonPanelFront(javax.swing.JPanel) + * @see prefs.editors.VSAbstractEditor#addToButtonPanelFront(javax.swing.JPanel) */ protected void addToButtonPanelFront(JPanel buttonPanel) { } /* (non-Javadoc) - * @see prefs.editors.VSEditor#addToButtonPanelLast(javax.swing.JPanel) + * @see prefs.editors.VSAbstractEditor#addToButtonPanelLast(javax.swing.JPanel) */ protected void addToButtonPanelLast(JPanel buttonPanel) { } /* (non-Javadoc) - * @see prefs.editors.VSEditor#addToEditTableLast() + * @see prefs.editors.VSAbstractEditor#addToEditTableLast() */ protected void addToEditTableLast() { } /* (non-Javadoc) - * @see prefs.editors.VSEditor#actionPerformed(java.awt.event.ActionEvent) + * @see prefs.editors.VSAbstractEditor#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { //String actionCommand = e.getActionCommand(); diff --git a/sources/prefs/editors/VSEditor.java b/sources/prefs/editors/VSAbstractEditor.java index c98434e..9ae98be 100644 --- a/sources/prefs/editors/VSEditor.java +++ b/sources/prefs/editors/VSAbstractEditor.java @@ -14,9 +14,9 @@ import prefs.VSPrefs; // TODO: Auto-generated Javadoc /** - * The Class VSEditor. + * The Class VSAbstractEditor. */ -public abstract class VSEditor implements ActionListener { +public abstract class VSAbstractEditor implements ActionListener { private static final long serialVersionUID = 1L; /** The boolean keys. */ @@ -103,7 +103,7 @@ public abstract class VSEditor implements ActionListener { * @param prefs the prefs * @param prefsToEdit the prefs to edit */ - public VSEditor(VSPrefs prefs, VSPrefs prefsToEdit) { + public VSAbstractEditor(VSPrefs prefs, VSPrefs prefsToEdit) { init(prefs, prefsToEdit); } diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java index 268afd3..de3f8fa 100644 --- a/sources/prefs/editors/VSEditorFrame.java +++ b/sources/prefs/editors/VSEditorFrame.java @@ -19,7 +19,7 @@ public class VSEditorFrame extends VSFrame implements ActionListener { private static final long serialVersionUID = 1L; /** The editor. */ - private VSBetterEditor editor; + private VSAbstractBetterEditor editor; /** The prefs. */ private VSPrefs prefs; @@ -31,7 +31,7 @@ public class VSEditorFrame extends VSFrame implements ActionListener { * @param relativeTo the relative to * @param editor the editor */ - public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSBetterEditor editor) { + public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSAbstractBetterEditor editor) { super(editor.getTitle(), relativeTo); this.prefs = prefs; this.editor = editor; diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java index 664cafa..8666fbe 100644 --- a/sources/prefs/editors/VSProcessEditor.java +++ b/sources/prefs/editors/VSProcessEditor.java @@ -17,7 +17,7 @@ import prefs.VSPrefs; /** * The Class VSProcessEditor. */ -public class VSProcessEditor extends VSBetterEditor { +public class VSProcessEditor extends VSAbstractBetterEditor { private static final long serialVersionUID = 1L; /** The process. */ @@ -40,7 +40,7 @@ public class VSProcessEditor extends VSBetterEditor { } /* (non-Javadoc) - * @see prefs.editors.VSBetterEditor#addToButtonPanelFront(javax.swing.JPanel) + * @see prefs.editors.VSAbstractBetterEditor#addToButtonPanelFront(javax.swing.JPanel) */ protected void addToButtonPanelFront(JPanel buttonPanel) { JButton takeoverButton = new JButton( @@ -60,13 +60,13 @@ public class VSProcessEditor extends VSBetterEditor { String protocolString = " " + prefs.getString("lang.protocol"); for (String protocolClassname : editableProtocolsClassnames) { String protocolShortname = VSRegisteredEvents.getShortname(protocolClassname); - VSProtocol protocol = process.getProtocolObject(protocolClassname); + VSAbstractProtocol protocol = process.getProtocolObject(protocolClassname); addToEditor(protocolShortname + protocolString, protocolShortname, protocol); } } /* (non-Javadoc) - * @see prefs.editors.VSBetterEditor#actionPerformed(java.awt.event.ActionEvent) + * @see prefs.editors.VSAbstractBetterEditor#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java index 615a8ff..326ca95 100644 --- a/sources/prefs/editors/VSSimulatorEditor.java +++ b/sources/prefs/editors/VSSimulatorEditor.java @@ -14,7 +14,7 @@ import prefs.*; /** * The Class VSSimulatorEditor. */ -public class VSSimulatorEditor extends VSBetterEditor { +public class VSSimulatorEditor extends VSAbstractBetterEditor { private static final long serialVersionUID = 1L; /** The simulator frame. */ @@ -57,7 +57,7 @@ public class VSSimulatorEditor extends VSBetterEditor { } /* (non-Javadoc) - * @see prefs.editors.VSBetterEditor#addToButtonPanelFront(javax.swing.JPanel) + * @see prefs.editors.VSAbstractBetterEditor#addToButtonPanelFront(javax.swing.JPanel) */ protected void addToButtonPanelFront(JPanel buttonPanel) { if (TAKEOVER_BUTTON) { @@ -71,7 +71,7 @@ public class VSSimulatorEditor extends VSBetterEditor { } /* (non-Javadoc) - * @see prefs.editors.VSBetterEditor#actionPerformed(java.awt.event.ActionEvent) + * @see prefs.editors.VSAbstractBetterEditor#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); diff --git a/sources/protocols/VSProtocol.java b/sources/protocols/VSAbstractProtocol.java index 348f194..b726a2e 100644 --- a/sources/protocols/VSProtocol.java +++ b/sources/protocols/VSAbstractProtocol.java @@ -7,26 +7,25 @@ package protocols; import events.*; import core.*; -// TODO: Auto-generated Javadoc /** - * The Class VSProtocol. + * The Class VSAbstractProtocol. */ -abstract public class VSProtocol extends VSEvent { +abstract public class VSAbstractProtocol extends VSAbstractEvent { private static final long serialVersionUID = 1L; - /** The is server. */ + /** The protocol object is a server. */ private boolean isServer; - /** The is client. */ + /** The protocol object is a client. */ private boolean isClient; - /** The current context is server. */ + /** The current protocol object's context is a server. */ private boolean currentContextIsServer; /** - * Send message. + * Send a message. * - * @param message the message + * @param message the message to send */ protected void sendMessage(VSMessage message) { if (process == null) @@ -39,9 +38,9 @@ abstract public class VSProtocol extends VSEvent { } /** - * Checks if is incorrect protocol. + * Checks if it's the incorrect protocol * - * @param message the message + * @param message the message to check against * * @return true, if is incorrect protocol */ @@ -50,7 +49,7 @@ abstract public class VSProtocol extends VSEvent { } /* (non-Javadoc) - * @see events.VSEvent#onStart() + * @see events.VSAbstractEvent#onStart() */ public final void onStart() { if (isClient) { diff --git a/sources/protocols/implementations/BerkelyTimeProtocol.java b/sources/protocols/implementations/BerkelyTimeProtocol.java index ded3d1b..9a52c4c 100644 --- a/sources/protocols/implementations/BerkelyTimeProtocol.java +++ b/sources/protocols/implementations/BerkelyTimeProtocol.java @@ -4,7 +4,7 @@ */ package protocols.implementations; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; import core.VSMessage; import java.util.ArrayList; @@ -14,7 +14,7 @@ import java.util.Vector; /** * The Class BerkelyTimeProtocol. */ -public class BerkelyTimeProtocol extends VSProtocol { +public class BerkelyTimeProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /* Berkely Server variables */ @@ -40,7 +40,7 @@ public class BerkelyTimeProtocol extends VSProtocol { public BerkelyTimeProtocol() { setClassname(getClass().toString()); - /* Those prefs are editable through the VSProtocol VSEditor GUI. */ + /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. */ Vector<Integer> vec = new Vector<Integer>(); vec.add(2); vec.add(3); @@ -48,13 +48,13 @@ public class BerkelyTimeProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { processTimes.clear(); @@ -65,7 +65,7 @@ public class BerkelyTimeProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { peers.addAll(getVector("processPIDs")); @@ -76,7 +76,7 @@ public class BerkelyTimeProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a response message, e.g. itself */ @@ -145,13 +145,13 @@ public class BerkelyTimeProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { if (recvMessage.getBoolean("isRequest")) { @@ -176,7 +176,7 @@ public class BerkelyTimeProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/protocols/implementations/BroadcastSturmProtocol.java b/sources/protocols/implementations/BroadcastSturmProtocol.java index fafc732..49e183d 100644 --- a/sources/protocols/implementations/BroadcastSturmProtocol.java +++ b/sources/protocols/implementations/BroadcastSturmProtocol.java @@ -7,13 +7,13 @@ package protocols.implementations; import java.util.ArrayList; import core.VSMessage; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; // TODO: Auto-generated Javadoc /** * The Class BroadcastSturmProtocol. */ -public class BroadcastSturmProtocol extends VSProtocol { +public class BroadcastSturmProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** The sent messages. */ @@ -31,19 +31,19 @@ public class BroadcastSturmProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { VSMessage message = new VSMessage(); @@ -53,20 +53,20 @@ public class BroadcastSturmProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { sentMessages.clear(); } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { if (!sentMessages.contains(recvMessage)) { @@ -79,7 +79,7 @@ public class BroadcastSturmProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/protocols/implementations/DummyProtocol.java b/sources/protocols/implementations/DummyProtocol.java index 1a409da..929ace4 100644 --- a/sources/protocols/implementations/DummyProtocol.java +++ b/sources/protocols/implementations/DummyProtocol.java @@ -4,14 +4,14 @@ */ package protocols.implementations; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; import core.VSMessage; // TODO: Auto-generated Javadoc /** * The Class DummyProtocol. */ -public class DummyProtocol extends VSProtocol { +public class DummyProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** @@ -22,20 +22,20 @@ public class DummyProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { logg("onClientReset()"); } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { logg("onClientStart()"); @@ -49,7 +49,7 @@ public class DummyProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { logg("onClientRecv("+recvMessage+")"); @@ -61,21 +61,21 @@ public class DummyProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { logg("onClientReset()"); } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { logg("onServerRecv("+recvMessage+")"); } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString() + "; Dummy Test"; diff --git a/sources/protocols/implementations/ExternalTimeSyncProtocol.java b/sources/protocols/implementations/ExternalTimeSyncProtocol.java index e9e96a2..3430f98 100644 --- a/sources/protocols/implementations/ExternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/ExternalTimeSyncProtocol.java @@ -5,13 +5,13 @@ package protocols.implementations; import core.VSMessage; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; // TODO: Auto-generated Javadoc /** * The Class ExternalTimeSyncProtocol. */ -public class ExternalTimeSyncProtocol extends VSProtocol { +public class ExternalTimeSyncProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** The request time. */ @@ -28,19 +28,19 @@ public class ExternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { requestTime = process.getTime(); @@ -53,7 +53,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("isServerResponse")) @@ -74,13 +74,13 @@ public class ExternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("isClientRequest")) @@ -94,7 +94,7 @@ public class ExternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); //+ "; " + prefs.getString("lang.requesttime") + ": " + requestTime; diff --git a/sources/protocols/implementations/InternalTimeSyncProtocol.java b/sources/protocols/implementations/InternalTimeSyncProtocol.java index 0b784a1..5676d58 100644 --- a/sources/protocols/implementations/InternalTimeSyncProtocol.java +++ b/sources/protocols/implementations/InternalTimeSyncProtocol.java @@ -5,13 +5,13 @@ package protocols.implementations; import core.VSMessage; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; // TODO: Auto-generated Javadoc /** * The Class InternalTimeSyncProtocol. */ -public class InternalTimeSyncProtocol extends VSProtocol { +public class InternalTimeSyncProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** The waiting for response. */ @@ -23,25 +23,25 @@ public class InternalTimeSyncProtocol extends VSProtocol { public InternalTimeSyncProtocol() { setClassname(getClass().toString()); - /* Those prefs are editable through the VSProtocol VSEditor GUI. t_min and t_max in milliseconds */ + /* Those prefs are editable through the VSAbstractProtocol VSAbstractEditor GUI. t_min and t_max in milliseconds */ initLong("t_min", 500, "Max. Übetragungszeit", "ms"); initLong("t_max", 2000, "Min. Übertragungszeit", "ms"); } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { waitingForResponse = true; @@ -53,7 +53,7 @@ public class InternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a response message, e.g. itself */ @@ -78,13 +78,13 @@ public class InternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { /* Ignore all protocol messages which are not a request message, e.g. itself */ @@ -99,7 +99,7 @@ public class InternalTimeSyncProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/protocols/implementations/OnePhaseCommitProtocol.java b/sources/protocols/implementations/OnePhaseCommitProtocol.java index 30c12f1..9c40493 100644 --- a/sources/protocols/implementations/OnePhaseCommitProtocol.java +++ b/sources/protocols/implementations/OnePhaseCommitProtocol.java @@ -6,18 +6,18 @@ package protocols.implementations; import java.util.Vector; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; import core.VSMessage; /** * The Class OnePhaseCommitProtocol. */ -public class OnePhaseCommitProtocol extends VSProtocol { +public class OnePhaseCommitProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /* Client variables, coordinator */ - /* Server variables, peers */ + /* Client variables */ private boolean ackSent; /** @@ -36,19 +36,19 @@ public class OnePhaseCommitProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { int numProcesses = getInteger("numProcesses"); @@ -58,27 +58,27 @@ public class OnePhaseCommitProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { ackSent = false; } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/protocols/implementations/PingPongProtocol.java b/sources/protocols/implementations/PingPongProtocol.java index 543b8df..167feb6 100644 --- a/sources/protocols/implementations/PingPongProtocol.java +++ b/sources/protocols/implementations/PingPongProtocol.java @@ -5,13 +5,13 @@ package protocols.implementations; import core.VSMessage; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; // TODO: Auto-generated Javadoc /** * The Class PingPongProtocol. */ -public class PingPongProtocol extends VSProtocol { +public class PingPongProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** The client counter. */ @@ -28,20 +28,20 @@ public class PingPongProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { clientCounter = 0; } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { VSMessage message = new VSMessage(); @@ -51,7 +51,7 @@ public class PingPongProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("fromServer")) @@ -66,14 +66,14 @@ public class PingPongProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { serverCounter = 0; } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { if (!recvMessage.getBoolean("fromClient")) @@ -88,7 +88,7 @@ public class PingPongProtocol extends VSProtocol { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/protocols/implementations/TwoPhaseCommitProtocol.java b/sources/protocols/implementations/TwoPhaseCommitProtocol.java index 7bc079a..db0277c 100644 --- a/sources/protocols/implementations/TwoPhaseCommitProtocol.java +++ b/sources/protocols/implementations/TwoPhaseCommitProtocol.java @@ -4,13 +4,13 @@ */ package protocols.implementations; -import protocols.VSProtocol; +import protocols.VSAbstractProtocol; import core.VSMessage; /** * The Class TwoPhaseCommitProtocol */ -public class TwoPhaseCommitProtocol extends VSProtocol { +public class TwoPhaseCommitProtocol extends VSAbstractProtocol { private static final long serialVersionUID = 1L; /** @@ -21,43 +21,43 @@ public class TwoPhaseCommitProtocol extends VSProtocol { } /* (non-Javadoc) - * @see events.VSEvent#onInit() + * @see events.VSAbstractEvent#onInit() */ protected void onInit() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientReset() + * @see protocols.VSAbstractProtocol#onClientReset() */ protected void onClientReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientStart() + * @see protocols.VSAbstractProtocol#onClientStart() */ protected void onClientStart() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onClientRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onClientRecv(core.VSMessage) */ protected void onClientRecv(VSMessage recvMessage) { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerReset() + * @see protocols.VSAbstractProtocol#onServerReset() */ protected void onServerReset() { } /* (non-Javadoc) - * @see protocols.VSProtocol#onServerRecv(core.VSMessage) + * @see protocols.VSAbstractProtocol#onServerRecv(core.VSMessage) */ protected void onServerRecv(VSMessage recvMessage) { } /* (non-Javadoc) - * @see protocols.VSProtocol#toString() + * @see protocols.VSAbstractProtocol#toString() */ public String toString() { return super.toString(); diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index 2bb750a..1c120ed 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -568,7 +568,7 @@ public class VSSimulator extends JPanel { * @return the lang.process.removetask */ public VSTask createTask(VSProcess process, long time, boolean localTimedTask) { - VSEvent event = null; + VSAbstractEvent event = null; if (isClientRequest) { event = process.getProtocolObject(eventClassname); diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java index 25ad889..f4e2044 100644 --- a/sources/simulator/VSSimulatorCanvas.java +++ b/sources/simulator/VSSimulatorCanvas.java @@ -1033,7 +1033,7 @@ public class VSSimulatorCanvas extends Canvas implements Runnable, MouseMotionLi */ public void sendMessage(VSMessage message) { VSTask task = null; - VSEvent messageReceiveEvent = null; + VSAbstractEvent messageReceiveEvent = null; VSProcess sendingProcess = message.getSendingProcess(); long deliverTime, outageTime, durationTime; boolean recvOwn = prefs.getBoolean("sim.message.own.recv"); @@ -1085,11 +1085,11 @@ public class VSSimulatorCanvas extends Canvas implements Runnable, MouseMotionLi editProcess(process); } else if (actionCommand.equals(prefs.getString("lang.process.crash"))) { - VSEvent event = new ProcessCrashEvent(); + VSAbstractEvent event = new ProcessCrashEvent(); taskManager.addTask(new VSTask(process.getGlobalTime(), process, event, VSTask.GLOBAL)); } else if (actionCommand.equals(prefs.getString("lang.process.recover"))) { - VSEvent event = new ProcessRecoverEvent(); + VSAbstractEvent event = new ProcessRecoverEvent(); taskManager.addTask(new VSTask(process.getGlobalTime(), process, event, VSTask.GLOBAL)); } else if (actionCommand.equals(prefs.getString("lang.process.remove"))) { |