From 44f91eeef89cc8e8e2039b243c3be277bca4f2ad Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 17 May 2008 15:04:10 +0000 Subject: Renamed RegisteredProtocols into VSRegisteredProtocols --- sources/core/VSMessage.java | 2 +- sources/editors/VSProcessEditor.java | 6 +- sources/protocols/RegisteredProtocols.java | 82 ---------------------------- sources/protocols/VSProtocol.java | 4 +- sources/protocols/VSRegisteredProtocols.java | 82 ++++++++++++++++++++++++++++ sources/simulator/VSMain.java | 2 +- 6 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 sources/protocols/RegisteredProtocols.java create mode 100644 sources/protocols/VSRegisteredProtocols.java diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java index c84d700..1ccad7f 100644 --- a/sources/core/VSMessage.java +++ b/sources/core/VSMessage.java @@ -19,7 +19,7 @@ public class VSMessage extends VSPrefs implements VSEvent { } public String getProtocolName() { - return RegisteredProtocols.getProtocolName(getProtocolClassname()); + return VSRegisteredProtocols.getProtocolName(getProtocolClassname()); } public String getProtocolClassname() { diff --git a/sources/editors/VSProcessEditor.java b/sources/editors/VSProcessEditor.java index 158295a..f858dec 100644 --- a/sources/editors/VSProcessEditor.java +++ b/sources/editors/VSProcessEditor.java @@ -65,7 +65,7 @@ public class VSProcessEditor extends VSEditorFrame { private JPanel createProtocolSelector() { JPanel panel = new JPanel(new GridBagLayout()); panel.setBorder(BorderFactory.createLineBorder(Color.black)); - Vector registeredProtocols = RegisteredProtocols.getProtocolNames(); + Vector registeredProtocols = VSRegisteredProtocols.getProtocolNames(); GridBagConstraints constraints = new GridBagConstraints(); constraints.fill = GridBagConstraints.HORIZONTAL; @@ -83,7 +83,7 @@ public class VSProcessEditor extends VSEditorFrame { public void actionPerformed(ActionEvent ae) { if (ae.getActionCommand().equals(prefs.getString("lang.edit"))) { String protocolName = (String) comboBox.getSelectedItem(); - String protocolClassname = RegisteredProtocols.getProtocolClassname(protocolName); + String protocolClassname = VSRegisteredProtocols.getProtocolClassname(protocolName); VSProtocol protocol = null; if (process.objectExists(protocolClassname)) { Object object = process.getObject(protocolClassname); @@ -92,7 +92,7 @@ public class VSProcessEditor extends VSEditorFrame { else return; } else { - protocol = RegisteredProtocols.getProtocolInstanceByName(protocolName, process); + protocol = VSRegisteredProtocols.getProtocolInstanceByName(protocolName, process); process.setObject(protocolClassname, protocol); } new VSProtocolEditor(prefs, frame, protocol); diff --git a/sources/protocols/RegisteredProtocols.java b/sources/protocols/RegisteredProtocols.java deleted file mode 100644 index b08bb87..0000000 --- a/sources/protocols/RegisteredProtocols.java +++ /dev/null @@ -1,82 +0,0 @@ -package protocols; - -import java.util.*; - -import prefs.*; -import core.*; -import utils.*; - -public final class RegisteredProtocols { - private static HashMap protocolClassnames; - private static HashMap protocolNames; - private static VSPrefs prefs; - - public static void init(VSPrefs prefs_) { - prefs = prefs_; - protocolNames = new HashMap(); - protocolClassnames = new HashMap(); - - registerProtocol("protocols.DummyProtocol"); - registerProtocol("protocols.PingPongProtocol"); - registerProtocol("protocols.ExternalTimeSyncProtocol"); - registerProtocol("protocols.InternalTimeSyncProtocol"); - registerProtocol("protocols.BroadcastSturmProtocol"); - registerProtocol("protocols.BerkelyTimeProtocol"); - } - - public static Vector getProtocolNames() { - Set set = protocolClassnames.keySet(); - Vector vector = new Vector(); - - for (String protocolName : set) - vector.add(protocolName); - - Collections.sort(vector); - - return vector; - } - - public static String getProtocolClassname(String protocolName) { - return protocolClassnames.get(protocolName); - } - - public static String getProtocolName(String protocolClassname) { - return protocolNames.get(protocolClassname); - } - - public static VSProtocol getProtocolInstanceByName(String protocolName, VSProcess process) { - final String protocolClassname = protocolClassnames.get(protocolName); - final Object protocolObj = new VSClassLoader().newInstance(protocolClassname); - - if (protocolObj instanceof VSProtocol) { - VSProtocol protocol = (VSProtocol) protocolObj; - protocol.init(process); - return protocol; - } - - return null; - } - - public static void registerProtocol(String protocolClassname) { - int index = protocolClassname.lastIndexOf('.'); - - if (index < 0) { - protocolNames.put(protocolClassname, protocolClassname); - protocolClassnames.put(protocolClassname, protocolClassname); - return; - } - - String protocolName = protocolClassname.substring(index + 1); - index = protocolName.lastIndexOf("Protocol"); - - if (index < 0 || index != protocolName.length() - 8) { - protocolNames.put(protocolClassname, protocolName); - protocolClassnames.put(protocolName, protocolClassname); - return; - } - - protocolName = protocolName.substring(0, index); - protocolNames.put(protocolClassname, protocolName); - protocolClassnames.put(protocolName, protocolClassname); - } -} diff --git a/sources/protocols/VSProtocol.java b/sources/protocols/VSProtocol.java index 4f34195..7154c78 100644 --- a/sources/protocols/VSProtocol.java +++ b/sources/protocols/VSProtocol.java @@ -31,7 +31,7 @@ abstract public class VSProtocol extends VSPrefs implements VSEvent { } public final String getProtocolName() { - return RegisteredProtocols.getProtocolName(protocolClassname); + return VSRegisteredProtocols.getProtocolName(protocolClassname); } public final VSProcess getProcess() { @@ -121,6 +121,6 @@ abstract public class VSProtocol extends VSPrefs implements VSEvent { type += prefs.getString("lang.client"); return prefs.getString("lang.protocol") + ": " - + RegisteredProtocols.getProtocolName(getProtocolClassname()) + " " + type;// + "; ID: " + getID(); + + VSRegisteredProtocols.getProtocolName(getProtocolClassname()) + " " + type;// + "; ID: " + getID(); } } diff --git a/sources/protocols/VSRegisteredProtocols.java b/sources/protocols/VSRegisteredProtocols.java new file mode 100644 index 0000000..5153a07 --- /dev/null +++ b/sources/protocols/VSRegisteredProtocols.java @@ -0,0 +1,82 @@ +package protocols; + +import java.util.*; + +import prefs.*; +import core.*; +import utils.*; + +public final class VSRegisteredProtocols { + private static HashMap protocolClassnames; + private static HashMap protocolNames; + private static VSPrefs prefs; + + public static void init(VSPrefs prefs_) { + prefs = prefs_; + protocolNames = new HashMap(); + protocolClassnames = new HashMap(); + + registerProtocol("protocols.DummyProtocol"); + registerProtocol("protocols.PingPongProtocol"); + registerProtocol("protocols.ExternalTimeSyncProtocol"); + registerProtocol("protocols.InternalTimeSyncProtocol"); + registerProtocol("protocols.BroadcastSturmProtocol"); + registerProtocol("protocols.BerkelyTimeProtocol"); + } + + public static Vector getProtocolNames() { + Set set = protocolClassnames.keySet(); + Vector vector = new Vector(); + + for (String protocolName : set) + vector.add(protocolName); + + Collections.sort(vector); + + return vector; + } + + public static String getProtocolClassname(String protocolName) { + return protocolClassnames.get(protocolName); + } + + public static String getProtocolName(String protocolClassname) { + return protocolNames.get(protocolClassname); + } + + public static VSProtocol getProtocolInstanceByName(String protocolName, VSProcess process) { + final String protocolClassname = protocolClassnames.get(protocolName); + final Object protocolObj = new VSClassLoader().newInstance(protocolClassname); + + if (protocolObj instanceof VSProtocol) { + VSProtocol protocol = (VSProtocol) protocolObj; + protocol.init(process); + return protocol; + } + + return null; + } + + public static void registerProtocol(String protocolClassname) { + int index = protocolClassname.lastIndexOf('.'); + + if (index < 0) { + protocolNames.put(protocolClassname, protocolClassname); + protocolClassnames.put(protocolClassname, protocolClassname); + return; + } + + String protocolName = protocolClassname.substring(index + 1); + index = protocolName.lastIndexOf("Protocol"); + + if (index < 0 || index != protocolName.length() - 8) { + protocolNames.put(protocolClassname, protocolName); + protocolClassnames.put(protocolName, protocolClassname); + return; + } + + protocolName = protocolName.substring(0, index); + protocolNames.put(protocolClassname, protocolName); + protocolClassnames.put(protocolName, protocolClassname); + } +} diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java index db64092..fe0b5d4 100644 --- a/sources/simulator/VSMain.java +++ b/sources/simulator/VSMain.java @@ -28,7 +28,7 @@ public class VSMain { } catch (Exception e) { } VSPrefs prefs = VSDefaultPrefs.init(); - RegisteredProtocols.init(prefs); + VSRegisteredProtocols.init(prefs); new VSMain(prefs); } } -- cgit v1.2.3