From a2cd723c26d9999b752ca5474f7a24de952b5fdb Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 26 May 2008 19:12:29 +0000 Subject: All abstract classes now have an Abstract in it's name --- sources/events/VSAbstractEvent.java | 129 +++++++++++++++++++++ sources/events/VSEvent.java | 129 --------------------- sources/events/VSRegisteredEvents.java | 12 +- .../events/implementations/ProcessCrashEvent.java | 8 +- .../implementations/ProcessRecoverEvent.java | 8 +- sources/events/internal/MessageReceiveEvent.java | 12 +- sources/events/internal/ProtocolEvent.java | 10 +- 7 files changed, 154 insertions(+), 154 deletions(-) create mode 100644 sources/events/VSAbstractEvent.java delete mode 100644 sources/events/VSEvent.java (limited to 'sources/events') diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java new file mode 100644 index 0000000..9562233 --- /dev/null +++ b/sources/events/VSAbstractEvent.java @@ -0,0 +1,129 @@ +/* + * VS is (c) 2008 by Paul C. Buetow + * vs@dev.buetow.org + */ +package events; + +import core.VSProcess; +import prefs.VSPrefs; + +/** + * The Class VSAbstractEvent. + */ +abstract public class VSAbstractEvent extends VSPrefs { + private static final long serialVersionUID = 1L; + + /** The prefs. */ + protected VSPrefs prefs; + + /** The process. */ + protected VSProcess process; + + /** The event shortname. */ + private String eventShortname; + + /** The event classname. */ + private String eventClassname; + + /** + * Inits the. + * + * @param process the process + */ + public void init(VSProcess process) { + this.process = process; + this.prefs = process.getPrefs(); + + onInit(); + } + + /** + * Sets the classname. + * + * @param eventClassname the new classname + */ + protected final void setClassname(String eventClassname) { + if (eventClassname.startsWith("class ")) + eventClassname = eventClassname.substring(6); + + this.eventClassname = eventClassname; + } + + /** + * Gets the classname. + * + * @return the classname + */ + public String getClassname() { + return eventClassname; + } + + /** + * Gets the name. + * + * @return the name + */ + public String getName() { + return VSRegisteredEvents.getName(eventClassname); + } + + /** + * Sets the shortname. + * + * @param eventShortname the new shortname + */ + public void setShortname(String eventShortname) { + this.eventShortname = eventShortname; + } + + /** + * Gets the shortname. + * + * @return the shortname + */ + public String getShortname() { + if (eventShortname == null) + return VSRegisteredEvents.getShortname(eventClassname); + + return eventShortname; + } + + /** + * Gets the process. + * + * @return the process + */ + public VSProcess getProcess() { + return process; + } + + /** + * Logg. + * + * @param message the message + */ + public void logg(String message) { + process.logg(/*toString() + "; " + */message); + } + + /** + * Equals. + * + * @param event the event + * + * @return true, if successful + */ + public boolean equals(VSAbstractEvent event) { + return super.getID() == event.getID(); + } + + /** + * On init. + */ + abstract protected void onInit(); + + /** + * On start. + */ + abstract public void onStart(); +} diff --git a/sources/events/VSEvent.java b/sources/events/VSEvent.java deleted file mode 100644 index 28abf8c..0000000 --- a/sources/events/VSEvent.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * VS is (c) 2008 by Paul C. Buetow - * vs@dev.buetow.org - */ -package events; - -import core.VSProcess; -import prefs.VSPrefs; - -/** - * The Class VSEvent. - */ -abstract public class VSEvent extends VSPrefs { - private static final long serialVersionUID = 1L; - - /** The prefs. */ - protected VSPrefs prefs; - - /** The process. */ - protected VSProcess process; - - /** The event shortname. */ - private String eventShortname; - - /** The event classname. */ - private String eventClassname; - - /** - * Inits the. - * - * @param process the process - */ - public void init(VSProcess process) { - this.process = process; - this.prefs = process.getPrefs(); - - onInit(); - } - - /** - * Sets the classname. - * - * @param eventClassname the new classname - */ - protected final void setClassname(String eventClassname) { - if (eventClassname.startsWith("class ")) - eventClassname = eventClassname.substring(6); - - this.eventClassname = eventClassname; - } - - /** - * Gets the classname. - * - * @return the classname - */ - public String getClassname() { - return eventClassname; - } - - /** - * Gets the name. - * - * @return the name - */ - public String getName() { - return VSRegisteredEvents.getName(eventClassname); - } - - /** - * Sets the shortname. - * - * @param eventShortname the new shortname - */ - public void setShortname(String eventShortname) { - this.eventShortname = eventShortname; - } - - /** - * Gets the shortname. - * - * @return the shortname - */ - public String getShortname() { - if (eventShortname == null) - return VSRegisteredEvents.getShortname(eventClassname); - - return eventShortname; - } - - /** - * Gets the process. - * - * @return the process - */ - public VSProcess getProcess() { - return process; - } - - /** - * Logg. - * - * @param message the message - */ - public void logg(String message) { - process.logg(/*toString() + "; " + */message); - } - - /** - * Equals. - * - * @param event the event - * - * @return true, if successful - */ - public boolean equals(VSEvent event) { - return super.getID() == event.getID(); - } - - /** - * On init. - */ - abstract protected void onInit(); - - /** - * On start. - */ - abstract public void onStart(); -} 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); -- cgit v1.2.3