Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4978)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4979)
@@ -305,5 +305,5 @@
     @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,4 +407,15 @@
     }
 
+/*  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,5 +462,5 @@
      */
     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);
     }