Changeset 12602 in josm for trunk

Timestamp:

2017-08-14T13:44:21+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #15149 - do not register actions in toolbar when loading internal osm databases (traffic/boundaries) for the first time

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JoinAreasAction.java (modified) (2 diffs)
• PurgeAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -454 +454 @@
     /**
      * Constructs a new {@code JoinAreasAction} with optional shortcut.
-     * @param addShortcut controls whether the shortcut should be registered or not
+     * @param addShortcut controls whether the shortcut should be registered or not, as for toolbar registration
      * @since 11611
      */
@@ -460 +460 @@
         super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), addShortcut ?
         Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
-        : null, true);
+        : null, addShortcut);
     }
 

trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

@@ -86 +86 @@
     /**
      * Constructs a new {@code PurgeAction} with optional shortcut.
-     * @param addShortcut controls whether the shortcut should be registered or not
+     * @param addShortcut controls whether the shortcut should be registered or not, as for toolbar registration
      * @since 11611
      */
@@ -93 +93 @@
         super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."), addShortcut ?
                 Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")), KeyEvent.VK_P, Shortcut.CTRL_SHIFT)
-                : null, true);
+                : null, addShortcut);
         putValue("help", HelpUtil.ht("/Action/Purge"));
     }