#149 "Unhandled event loop exception" with 36 menu items and quick menu

Signed-off-by: Andre Bossert <[email protected]>

Author: anb0s

plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandPopup.java

@@ -47,7 +47,9 @@ public ExecuteCommandPopup(Shell parent, IWorkbench workbench, MenuDataList menu
         for (Character ch='a';ch<='z';ch++) {
             chars.add(ch);
         }
-        int charsSize = menuDataList.size();
+        int charsSize = chars.size();
+        if (menuDataList.size() < charsSize)
+            charsSize = menuDataList.size();
         String info = "use '0'";
         if (charsSize > 1) {
             if( charsSize <= 10) {
@@ -71,7 +73,7 @@ protected Control createDialogArea(Composite parent) {
         listView.addKeyListener(this);
         for (int i=0;i<menuDataList.size();i++) {
             MenuData item = menuDataList.get(i);
-            String prefix = Character.toString(chars.get(i)) + ": ";
+            String prefix = (i < chars.size() ? Character.toString(chars.get(i)) : "?") + ": ";
             listView.add(prefix + item.getNameExpanded());
         }
         listView.select(0);
@@ -87,7 +89,7 @@ private void executeCommandFromList(int index) {
             index = selIndex;
         }
         if (index < 0 || index >= menuDataList.size()) {
-        	//Activator.logError("executeCommandFromList: bad index " + index, null);
+            //Activator.logError("executeCommandFromList: bad index " + index, null);
             return;
         }
         listView.setSelection(index);
@@ -121,7 +123,7 @@ public void keyPressed(KeyEvent e) {
                 executeCommandFromList((e.keyCode - 'a') + ('9' - '0' + 1));
             }
         } else {
-        	//Activator.logError("keyPressed", null);
+            //Activator.logError("keyPressed", null);
         }
     }
 

plugin/src/de/anbos/eclipse/easyshell/plugin/types/Version.java

@@ -25,11 +25,11 @@ public enum Version {
     v2_0_004(5, "v2.0 beta 4"),
     v2_0_005(6, "v2.0 RC1 / RC2"),
     v2_0_006(7, "v2.0 RC3 / Final"),
-	v2_1_001(8, "v2.1 alpha 1"),
-	v2_1_002(9, "v2.1 alpha 2"),
-	v2_1_003(10, "v2.1 beta 1 / 2"),
-	v2_1_004(11, "v2.1 beta 3"),
-	v2_1_005(12, "v2.1 RC1");
+    v2_1_001(8, "v2.1 alpha 1"),
+    v2_1_002(9, "v2.1 alpha 2"),
+    v2_1_003(10, "v2.1 beta 1 / 2"),
+    v2_1_004(11, "v2.1 beta 3"),
+    v2_1_005(12, "v2.1 beta 4 / RC1");
     // actual version is always the last one!
     public static Version actual =  Version.values()[Version.values().length-1];
     // attributes