Changeset 12639 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

Timestamp:

2017-08-25T01:37:31+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate shortcut handling and mapframe listener methods in Main. Replacement: same methods in gui.MainApplication

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -22 +22 @@
 import javax.swing.JToggleButton;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
@@ -101 +100 @@
                 "geoimage:previous", tr("Geoimage: {0}", tr("Show previous Image")), KeyEvent.VK_PAGE_UP, Shortcut.DIRECT);
         final String previousImage = "Previous Image";
-        Main.registerActionShortcut(prevAction, scPrev);
+        MainApplication.registerActionShortcut(prevAction, scPrev);
         btnPrevious.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scPrev.getKeyStroke(), previousImage);
         btnPrevious.getActionMap().put(previousImage, prevAction);
@@ -112 +111 @@
         Shortcut scDelete = Shortcut.registerShortcut(
                 "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT);
-        Main.registerActionShortcut(delAction, scDelete);
+        MainApplication.registerActionShortcut(delAction, scDelete);
         btnDelete.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDelete.getKeyStroke(), removePhoto);
         btnDelete.getActionMap().put(removePhoto, delAction);
@@ -123 +122 @@
                 "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete File from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT);
         final String deleteImage = "Delete image file from disk";
-        Main.registerActionShortcut(delFromDiskAction, scDeleteFromDisk);
+        MainApplication.registerActionShortcut(delFromDiskAction, scDeleteFromDisk);
         btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), deleteImage);
         btnDeleteFromDisk.getActionMap().put(deleteImage, delFromDiskAction);
@@ -133 +132 @@
                 "geoimage:copypath", tr("Geoimage: {0}", tr("Copy image path")), KeyEvent.VK_C, Shortcut.ALT_CTRL_SHIFT);
         final String copyImage = "Copy image path";
-        Main.registerActionShortcut(copyPathAction, scCopyPath);
+        MainApplication.registerActionShortcut(copyPathAction, scCopyPath);
         btnCopyPath.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), copyImage);
         btnCopyPath.getActionMap().put(copyImage, copyPathAction);
@@ -143 +142 @@
                 "geoimage:next", tr("Geoimage: {0}", tr("Show next Image")), KeyEvent.VK_PAGE_DOWN, Shortcut.DIRECT);
         final String nextImage = "Next Image";
-        Main.registerActionShortcut(nextAction, scNext);
+        MainApplication.registerActionShortcut(nextAction, scNext);
         btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), nextImage);
         btnNext.getActionMap().put(nextImage, nextAction);
         btnNext.setEnabled(false);
 
-        Main.registerActionShortcut(
+        MainApplication.registerActionShortcut(
                 new ImageAction(COMMAND_FIRST, null, null),
                 Shortcut.registerShortcut(
                         "geoimage:first", tr("Geoimage: {0}", tr("Show first Image")), KeyEvent.VK_HOME, Shortcut.DIRECT)
         );
-        Main.registerActionShortcut(
+        MainApplication.registerActionShortcut(
                 new ImageAction(COMMAND_LAST, null, null),
                 Shortcut.registerShortcut(