Pull down menu now sorted by protocol's shortnames

8 files changed, 73 insertions, 71 deletions

diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java
index 25e22c4..852e5f3 100644
--- a/sources/core/VSMessage.java
+++ b/sources/core/VSMessage.java
@@ -62,7 +62,7 @@ public class VSMessage extends VSPrefs {
      * @return The protocol name of the message.
      */
     public String getName() {
-        return VSRegisteredEvents.getName(getProtocolClassname());
+        return VSRegisteredEvents.getNameByClassname(getProtocolClassname());
     }
 
     /**
@@ -123,7 +123,7 @@ public class VSMessage extends VSPrefs {
         buffer.append("; ");
         buffer.append(prefs.getString("lang.protocol"));
         buffer.append(": ");
-        buffer.append(VSRegisteredEvents.getShortname(getProtocolClassname()));
+        buffer.append(VSRegisteredEvents.getShortnameByClassname(getProtocolClassname()));
 
         return buffer.toString();
     }
diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java
index 27be457..22fb81c 100644
--- a/sources/events/VSAbstractEvent.java
+++ b/sources/events/VSAbstractEvent.java
@@ -72,7 +72,7 @@ abstract public class VSAbstractEvent extends VSPrefs {
      * @return the name
      */
     public String getName() {
-        return VSRegisteredEvents.getName(eventClassname);
+        return VSRegisteredEvents.getNameByClassname(eventClassname);
     }
 
     /**
@@ -91,7 +91,7 @@ abstract public class VSAbstractEvent extends VSPrefs {
      */
     public String getShortname() {
         if (eventShortname == null)
-            return VSRegisteredEvents.getShortname(eventClassname);
+            return VSRegisteredEvents.getShortnameByClassname(eventClassname);
 
         return eventShortname;
     }
diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java
index 997cc19..52cb042 100644
--- a/sources/events/VSRegisteredEvents.java
+++ b/sources/events/VSRegisteredEvents.java
@@ -16,16 +16,20 @@ import utils.*;
 public final class VSRegisteredEvents {
     private static final long serialVersionUID = 1L;
 
-    /** The event classnames. */
-    private static HashMap<String,String> eventClassnames =
+    /** The event classnames by eventnames. */
+    private static HashMap<String,String> eventClassnamesByNames =
         new HashMap<String,String>();
 
-    /** The event shortnames. */
-    private static HashMap<String,String> eventShortnames =
+    /** The event shortnames by classnames. */
+    private static HashMap<String,String> eventShortnamesByClassnames =
         new HashMap<String,String>();
 
-    /** The event names. */
-    private static HashMap<String,String> eventNames =
+    /** The event names by classnames. */
+    private static HashMap<String,String> eventNamesByClassnames =
+        new HashMap<String,String>();
+
+    /** The event classnames by shortnames. */
+    private static HashMap<String,String> eventClassnamesByShortnames =
         new HashMap<String,String>();
 
     /** The editable protocols classnames. */
@@ -128,11 +132,11 @@ public final class VSRegisteredEvents {
      * @return the protocol names
      */
     public static Vector<String> getProtocolNames() {
-        Set<String> set =  eventClassnames.keySet();
+        Set<String> set =  eventClassnamesByNames.keySet();
         Vector<String> vector = new Vector<String>();
 
         for (String eventName : set)
-            if (getClassname(eventName).startsWith("protocols.implementations"))
+            if (getClassnameByEventname(eventName).startsWith("protocols.implementations"))
                 vector.add(eventName);
 
         Collections.sort(vector);
@@ -146,14 +150,16 @@ public final class VSRegisteredEvents {
      * @return the protocol classnames
      */
     public static Vector<String> getProtocolClassnames() {
-        Set<String> set =  eventNames.keySet();
+        ArrayList<String> shortnames = new ArrayList<String>();
+        shortnames.addAll(eventClassnamesByShortnames.keySet());
+        Collections.sort(shortnames);
         Vector<String> vector = new Vector<String>();
 
-        for (String eventClassname : set)
+        for (String eventShortname : shortnames) {
+            String eventClassname = getClassnameByShortname(eventShortname);
             if (eventClassname.startsWith("protocols.implementations"))
                 vector.add(eventClassname);
-
-        Collections.sort(vector);
+        }
 
         return vector;
     }
@@ -164,11 +170,11 @@ public final class VSRegisteredEvents {
      * @return the non protocol names
      */
     public static Vector<String> getNonProtocolNames() {
-        Set<String> set =  eventClassnames.keySet();
+        Set<String> set =  eventClassnamesByNames.keySet();
         Vector<String> vector = new Vector<String>();
 
         for (String eventName : set)
-            if (getClassname(eventName).startsWith("events.implementations"))
+            if (getClassnameByEventname(eventName).startsWith("events.implementations"))
                 vector.add(eventName);
 
         Collections.sort(vector);
@@ -182,7 +188,7 @@ public final class VSRegisteredEvents {
      * @return the non protocol classnames
      */
     public static Vector<String> getNonProtocolClassnames() {
-        Set<String> set =  eventNames.keySet();
+        Set<String> set =  eventNamesByClassnames.keySet();
         Vector<String> vector = new Vector<String>();
 
         for (String eventClassname : set)
@@ -201,8 +207,8 @@ public final class VSRegisteredEvents {
      *
      * @return the classname
      */
-    public static String getClassname(String eventName) {
-        return eventClassnames.get(eventName);
+    public static String getClassnameByEventname(String eventName) {
+        return eventClassnamesByNames.get(eventName);
     }
 
     /**
@@ -212,8 +218,8 @@ public final class VSRegisteredEvents {
      *
      * @return the name
      */
-    public static String getName(String eventClassname) {
-        return eventNames.get(eventClassname);
+    public static String getNameByClassname(String eventClassname) {
+        return eventNamesByClassnames.get(eventClassname);
     }
 
     /**
@@ -223,8 +229,19 @@ public final class VSRegisteredEvents {
      *
      * @return the shortname
      */
-    public static String getShortname(String eventClassname) {
-        return eventShortnames.get(eventClassname);
+    public static String getShortnameByClassname(String eventClassname) {
+        return eventShortnamesByClassnames.get(eventClassname);
+    }
+
+    /**
+     * Gets the classname.
+     *
+     * @param eventShortname the event shortname
+     *
+     * @return the shortname
+     */
+    public static String getClassnameByShortname(String eventShortname) {
+        return eventClassnamesByShortnames.get(eventShortname);
     }
 
     /**
@@ -256,7 +273,7 @@ public final class VSRegisteredEvents {
      * @return the lang.process.removeevent
      */
     public static VSAbstractEvent createEventInstanceByName(String eventName, VSProcess process) {
-        return createEventInstanceByClassname(eventClassnames.get(eventName), process);
+        return createEventInstanceByClassname(eventClassnamesByNames.get(eventName), process);
     }
 
     /**
@@ -270,8 +287,9 @@ public final class VSRegisteredEvents {
         if (eventShortname == null)
             eventShortname = eventName;
 
-        eventNames.put(eventClassname, eventName);
-        eventShortnames.put(eventClassname, eventShortname);
-        eventClassnames.put(eventName, eventClassname);
+        eventNamesByClassnames.put(eventClassname, eventName);
+        eventShortnamesByClassnames.put(eventClassname, eventShortname);
+        eventClassnamesByNames.put(eventName, eventClassname);
+        eventClassnamesByShortnames.put(eventShortname, eventClassname);
     }
 }
diff --git a/sources/events/internal/ProtocolEvent.java b/sources/events/internal/ProtocolEvent.java
index 108bfb8..4b9adc3 100644
--- a/sources/events/internal/ProtocolEvent.java
+++ b/sources/events/internal/ProtocolEvent.java
@@ -87,7 +87,7 @@ public class ProtocolEvent extends VSAbstractEvent {
             protocol.isServer(isProtocolActivation);
 
         StringBuffer buffer = new StringBuffer();
-        buffer.append(VSRegisteredEvents.getShortname(protocolClassname));
+        buffer.append(VSRegisteredEvents.getShortnameByClassname(protocolClassname));
         buffer.append(" ");
         buffer.append(isClientProtocol
                       ? prefs.getString("lang.client") : prefs.getString("lang.server"));
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index 0de1680..c5951ff 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -110,7 +110,7 @@ public class VSDefaultPrefs extends VSPrefs {
         initString("lang.recovered", "Wiederbelebt");
         initString("lang.remove", "Entfernen");
         initString("lang.replay", "Wiederholen");
-        initString("lang.requests", "Anfragen");
+        //initString("lang.requests", "Anfragen");
         initString("lang.reset", "Reset");
         initString("lang.save", "Speichern");
         initString("lang.saveas", "Speichern unter");
diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java
index 1b6351c..934fa2e 100644
--- a/sources/prefs/editors/VSAbstractEditor.java
+++ b/sources/prefs/editors/VSAbstractEditor.java
@@ -667,14 +667,6 @@ public abstract class VSAbstractEditor implements ActionListener {
         fullKeys.addAll(filterOut(prefsToAdd.getBooleanKeySet(), addOnlyThisVariables, VSPrefs.BOOLEAN_PREFIX));
         fullKeys.addAll(filterOut(prefsToAdd.getStringKeySet(), addOnlyThisVariables, VSPrefs.STRING_PREFIX));
 
-        /*
-            for (String key : integerKeys) fullKeys.add(VSPrefs.INTEGER_PREFIX + key);
-            for (String key : vectorKeys) fullKeys.add(VSPrefs.VECTOR_PREFIX + key);
-            for (String key : floatKeys) fullKeys.add(VSPrefs.FLOAT_PREFIX + key);
-            for (String key : longKeys) fullKeys.add(VSPrefs.LONG_PREFIX + key);
-            for (String key : booleanKeys) fullKeys.add(VSPrefs.BOOLEAN_PREFIX + key);
-            for (String key : stringKeys) fullKeys.add(VSPrefs.STRING_PREFIX + key);
-        */
         Collections.sort(fullKeys);
 
         for (String fullKey : fullKeys) {
diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java
index 1992d6c..bb09b0d 100644
--- a/sources/prefs/editors/VSProcessEditor.java
+++ b/sources/prefs/editors/VSProcessEditor.java
@@ -61,7 +61,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
         String serverString = " " + prefs.getString("lang.server");
 
         for (String protocolClassname : editableProtocolsClassnames) {
-            String protocolShortname = VSRegisteredEvents.getShortname(protocolClassname);
+            String protocolShortname = VSRegisteredEvents.getShortnameByClassname(protocolClassname);
             VSAbstractProtocol protocol = process.getProtocolObject(protocolClassname);
             protocol.onClientInit();
             protocol.onServerInit();
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 1c120ed..056c70a 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -934,60 +934,52 @@ public class VSSimulator extends JPanel {
 
         addPanel.add(takeoverButton);
 
-        boolean flag = createTasks == null;
-        if (flag) createTasks = new ArrayList<VSCreateTask>();
+        boolean createTaskFlag = createTasks == null;
+        if (createTaskFlag) createTasks = new ArrayList<VSCreateTask>();
 
         Vector<String> eventClassnames = VSRegisteredEvents.getNonProtocolClassnames();
 
         comboBox.setMaximumRowCount(15);
         comboBox.addItem("-- " + prefs.getString("lang.events.process") + " --");
-        if (flag)
+        if (createTaskFlag)
             createTasks.add(null);
 
         for (String eventClassname : eventClassnames) {
-            String eventShortname = VSRegisteredEvents.getShortname(eventClassname);
+            String eventShortname = VSRegisteredEvents.getShortnameByClassname(eventClassname);
             comboBox.addItem(eventShortname);
-            if (flag)
+            if (createTaskFlag)
                 createTasks.add(new VSCreateTask(eventClassname));
         }
 
-        comboBox.addItem("-- " + prefs.getString("lang.requests") + " --");
-        if (flag)
+
+        comboBox.addItem("-- " + prefs.getString("lang.events.protocol") + " --");
+        if (createTaskFlag)
             createTasks.add(null);
+
+        String activate = prefs.getString("lang.activate");
+        String client = prefs.getString("lang.client");
         String clientrequest = prefs.getString("lang.clientrequest.start");
+        String deactivate = prefs.getString("lang.deactivate");
+        String protocolEventClassname = "events.internal.ProtocolEvent";
+        String server = prefs.getString("lang.server");
 
         eventClassnames = VSRegisteredEvents.getProtocolClassnames();
+
         for (String eventClassname : eventClassnames) {
-            String eventShortname = VSRegisteredEvents.getShortname(eventClassname)
-                                    + " " + clientrequest;
+            String eventShortname_ = VSRegisteredEvents.getShortnameByClassname(eventClassname);
 
+            String eventShortname = eventShortname_ + " " + clientrequest;
             comboBox.addItem(eventShortname);
-
-            if (flag) {
+            if (createTaskFlag) {
                 VSCreateTask createTask = new VSCreateTask(eventClassname);
                 createTask.setShortname(eventShortname);
                 createTask.isClientRequest(true);
                 createTasks.add(createTask);
             }
-        }
-
-        comboBox.addItem("-- " + prefs.getString("lang.events.protocol") + " --");
-        if (flag)
-            createTasks.add(null);
-
-        eventClassnames = VSRegisteredEvents.getProtocolClassnames();
-        String activate = prefs.getString("lang.activate");
-        String deactivate = prefs.getString("lang.deactivate");
-        String client = prefs.getString("lang.client");
-        String server = prefs.getString("lang.server");
-        String protocolEventClassname = "events.internal.ProtocolEvent";
-
-        for (String eventClassname : eventClassnames) {
-            String eventShortname_ = VSRegisteredEvents.getShortname(eventClassname);
 
-            String eventShortname = eventShortname_ + " " + client + " " + activate;
+            eventShortname = eventShortname_ + " " + client + " " + activate;
             comboBox.addItem(eventShortname);
-            if (flag) {
+            if (createTaskFlag) {
                 VSCreateTask createTask = new VSCreateTask(protocolEventClassname);
                 createTask.isProtocolActivation(true);
                 createTask.isClientProtocol(true);
@@ -998,7 +990,7 @@ public class VSSimulator extends JPanel {
 
             eventShortname = eventShortname_ + " " + client + " " + deactivate;
             comboBox.addItem(eventShortname);
-            if (flag) {
+            if (createTaskFlag) {
                 VSCreateTask createTask = new VSCreateTask(protocolEventClassname);
                 createTask.isProtocolDeactivation(true);
                 createTask.isClientProtocol(true);
@@ -1009,7 +1001,7 @@ public class VSSimulator extends JPanel {
 
             eventShortname = eventShortname_ + " " + server + " " + activate;
             comboBox.addItem(eventShortname);
-            if (flag) {
+            if (createTaskFlag) {
                 VSCreateTask createTask = new VSCreateTask(protocolEventClassname);
                 createTask.isProtocolActivation(true);
                 createTask.isClientProtocol(false);
@@ -1020,7 +1012,7 @@ public class VSSimulator extends JPanel {
 
             eventShortname = eventShortname_ + " " + server + " " + deactivate;
             comboBox.addItem(eventShortname);
-            if (flag) {
+            if (createTaskFlag) {
                 VSCreateTask createTask = new VSCreateTask(protocolEventClassname);
                 createTask.isProtocolDeactivation(true);
                 createTask.isClientProtocol(false);