Changeset 17335 in josm for trunk

Timestamp:

2020-11-23T16:47:41+01:00 (4 years ago)

Author:

Don-vip

Message:

see #20139 - avoid shortcut conflict between "open location" actions

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (1 diff)
• gui/datatransfer/importers/OsmLinkPaster.java (modified) (1 diff)

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

@@ -84 +84 @@
      */
     public OpenLocationAction() {
+        this(Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.CTRL));
+    }
+
+    /**
+     * Create an open action. The name is "Open a file".
+     * @param shortcut action shortcut, can be null for subclasses
+     */
+    protected OpenLocationAction(Shortcut shortcut) {
         /* I18N: Command to download a specific location/URL */
-        super(tr("Open Location..."), "openlocation", tr("Open an URL."),
-                Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")),
-                        KeyEvent.VK_L, Shortcut.CTRL), true, false);
+        super(tr("Open Location..."), "openlocation", tr("Open an URL."), shortcut, shortcut != null, false);
         setHelpId(ht("/Action/OpenLocation"));
         this.downloadTasks = new ArrayList<>();

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java

@@ -28 +28 @@
 
     static final class NoWarnOpenLocationAction extends OpenLocationAction {
+
+        NoWarnOpenLocationAction() {
+            super(null);
+        }
+
         @Override
         protected void warnNoSuitableTasks(String url) {