Changeset 1050 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2008-10-23T11:25:14+02:00 (16 years ago)

Author:

stoecker

Message:

added modifier support to ShortCut definitions. Removed all internal conflicts

File:

• trunk/src/org/openstreetmap/josm/tools/ShortCut.java (modified) (6 diffs)

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

@@ -29 +29 @@
  */
 public class ShortCut {
+        public static final int SHIFT = KeyEvent.SHIFT_DOWN_MASK;
+        public static final int CTRL = KeyEvent.CTRL_DOWN_MASK;
+        public static final int SHIFT_CTRL = KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK;
         private String shortText;        // the unique ID of the shortcut
         private String longText;         // a human readable description that will be shown in the preferences
@@ -306 +309 @@
                 int i = 0;
                 for (ShortCut sc : ShortCuts.values()) {
-                        if (!sc.getAutomatic() && !sc.getReset()) {
+                        if (!sc.getAutomatic() && !sc.getReset() && sc.getAssignedUser()) {
                                 Main.pref.put("shortcut.shortcut."+i, sc.asPrefString());
                                 i++;
@@ -316 +319 @@
         // this is used to register a shortcut that was read from the preferences
         private static void registerShortCut(ShortCut sc) {
-                if (sc.getAssignedDefault()) { // a 100% default shortcut will go though unchanged -- unless the groups have been reconfigured
-                        registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
-                } else if (sc.getAssignedUser()) { // put a user configured shortcut in as-is -- unless there's a conflict
-                        ShortCut potentialShortCut = findShortcut(sc.getAssignedKey(), sc.getAssignedModifier());
-                        if (potentialShortCut == null) {
-                                ShortCuts.put(sc.getShortText(), sc);
-                        } else {
-                                registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
-                        }
-                } else { // this shortcut was auto-moved before, re-register and warn if it changes
-                        registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
-                }
+                registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc.getAssignedModifier(), sc);
         }
 
@@ -367 +359 @@
          *                  constants defined above.
          */
+        public static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup, int modifier) {
+                return registerShortCut(shortText, longText, requestedKey, requestedGroup, modifier, null);
+        }
         public static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup) {
-                return registerShortCut(shortText, longText, requestedKey, requestedGroup, null);
+                return registerShortCut(shortText, longText, requestedKey, requestedGroup, null, null);
+        }
+
+        private static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup,
+        ShortCut originalShortCut) {
+                return registerShortCut(shortText, longText, requestedKey, requestedGroup, null, originalShortCut);
         }
 
@@ -376 +376 @@
         // read from the preferences file). New shortcuts will never warn, even when they land on some funny
         // random fallback key like Ctrl+Alt+Shift+Z for "File Open..." <g>
-        private static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup, ShortCut originalShortCut) {
+        private static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup, Integer modifier,
+        ShortCut originalShortCut) {
                 doInit();
                 if (ShortCuts.containsKey(shortText)) { // a re-register? maybe a sc already read from the preferences?
@@ -384 +385 @@
                 }
                 Integer defaultModifier = Groups.get(requestedGroup + GROUPS_DEFAULT);
-                if (defaultModifier == null) { // garbage in, no shortcurt out
+                if(modifier != null) {
+                        defaultModifier = modifier;
+                }
+                else if (defaultModifier == null) { // garbage in, no shortcurt out
                         defaultModifier = Groups.get(GROUP_NONE + GROUPS_DEFAULT);
                 }