Changeset 16505 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2020-05-27T08:31:01+02:00 (4 years ago)

Author:

GerdP

Message:

see #19296: Actions should avoid to install listeners which are not needed
tbc

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (1 diff)
• ChangesetManagerToggleAction.java (modified) (1 diff)
• CloseChangesetAction.java (modified) (1 diff)
• DownloadPrimitiveAction.java (modified) (1 diff)
• ExitAction.java (modified) (1 diff)
• FullscreenToggleAction.java (modified) (1 diff)
• HistoryInfoAction.java (modified) (1 diff)
• NewAction.java (modified) (1 diff)
• OpenFileAction.java (modified) (1 diff)
• OpenLocationAction.java (modified) (1 diff)
• PreferencesAction.java (modified) (1 diff)
• RestartAction.java (modified) (1 diff)

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

@@ -64 +64 @@
         super(tr("About"), "logo", tr("Display the about screen."),
             Shortcut.registerShortcut("system:about", tr("About"),
-            KeyEvent.VK_F1, Shortcut.SHIFT), true);
+            KeyEvent.VK_F1, Shortcut.SHIFT), true, false);
     }
 

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

@@ -39 +39 @@
 
     @Override
+    protected void installAdapters() {
+        // do nothing
+    }
+
+    @Override
     public void actionPerformed(ActionEvent e) {
         toggleSelectedState(e);

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

@@ -52 +52 @@
                 tr("File: {0}", tr("Close open changesets")),
                 KeyEvent.VK_Q, Shortcut.ALT_CTRL),
-            true
+            true, false
         );
         setHelpId(ht("/Action/CloseChangeset"));

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

@@ -34 +34 @@
     public DownloadPrimitiveAction() {
         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID"),
-                SHORTCUT, true);
+                SHORTCUT, true, false);
         setHelpId(ht("/Action/DownloadObject"));
     }

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

@@ -22 +22 @@
     public ExitAction() {
         super(tr("Exit"), "exit", tr("Exit the application."),
-                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/Exit"));
     }

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

@@ -49 +49 @@
         setSelected(Config.getPref().getBoolean("draw.fullscreen", false));
         notifySelectedState();
+    }
+
+    @Override
+    protected void installAdapters() {
+        // not needed
     }
 

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

@@ -36 +36 @@
         super(tr("History"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations."),
-                SHORTCUT, false);
+                SHORTCUT, true, "action/historyinfo", false);
         setHelpId(ht("/Action/ObjectHistory"));
-        setToolbarId("action/historyinfo");
-        MainApplication.getToolbar().register(this);
         setEnabled(true);
     }

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

@@ -23 +23 @@
     public NewAction() {
         super(tr("New Layer"), "new", tr("Create a new map layer."),
-                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/NewLayer"));
     }

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

@@ -67 +67 @@
     public OpenFileAction() {
         super(tr("Open..."), "open", tr("Open a file."),
-                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
+                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL),
+                true, null, false);
         setHelpId(ht("/Action/Open"));
     }

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

@@ -87 +87 @@
         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);
+                        KeyEvent.VK_L, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/OpenLocation"));
         this.downloadTasks = new ArrayList<>();

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

@@ -88 +88 @@
     public PreferencesAction() {
         super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
-                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true, false);
         setHelpId(ht("/Action/Preferences"));
         this.tab = null;

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

@@ -49 +49 @@
     public RestartAction() {
         super(tr("Restart"), "restart", tr("Restart the application."),
-                Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false);
+                Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false, false);
         setHelpId(ht("/Action/Restart"));
         setToolbarId("action/restart");