Changeset 4979 in josm

Timestamp:

Feb 18, 2012 9:28:21 AM (15 months ago)

Author:

stoecker

Message:

fix #7410 - infinite loop

File:

• trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -305 +305 @@
     @Deprecated public static final int SHIFT_DEFAULT = 1;
     @Deprecated public static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup, int modifier) {
-        return registerShortcut(shortText, longText, requestedKey, requestedGroup, modifier);
+        return registerShortcut(shortText, longText, requestedKey, requestedGroup, new Integer(modifier));
     }
 
@@ -407 +407 @@
     }
 
+/*  NEW function: 
+    private static int findModifier(int group, Integer modifier) {
+        if(modifier == null) {
+            modifier = getGroupModifier(group);
+            if (modifier == null) { // garbage in, no shortcut out
+                modifier = getGroupModifier(NONE);
+            }
+        }
+        return modifier;
+    }*/
+
     // shutdown handling
     public static boolean savePrefs() {
@@ -451 +462 @@
      */
     public static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup) {
-        return registerShortcut(shortText, longText, requestedKey, requestedGroup);
+        return registerShortcut(shortText, longText, requestedKey, requestedGroup, null);
     }