Changeset 1084 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2008-11-18T19:53:53+01:00 (16 years ago)

Author:

framm

Message:

• cosmetics: rename ShortCut to Shortcut, and shortCut to shortcut

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DeleteAction.java (modified) (2 diffs)
• DrawAction.java (modified) (2 diffs)
• ExtrudeAction.java (modified) (2 diffs)
• MapMode.java (modified) (2 diffs)
• SelectAction.java (modified) (2 diffs)
• ZoomAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -44 +44 @@
                                 "delete",
                                 tr("Delete nodes or ways."),
-                                ShortCut.registerShortCut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, ShortCut.GROUP_EDIT),
+                                Shortcut.registerShortcut("mapmode:delete", tr("Mode: {0}",tr("Delete")), KeyEvent.VK_D, Shortcut.GROUP_EDIT),
                                 mapFrame,
                                 ImageProvider.getCursor("normal", "delete"));

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -74 +74 @@
         public DrawAction(MapFrame mapFrame) {
                 super(tr("Draw"), "node/autonode", tr("Draw nodes"),
-                                ShortCut.registerShortCut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, ShortCut.GROUP_EDIT),
+                                Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.GROUP_EDIT),
                                 mapFrame, getCursor());
 
                 // Add extra shortcut N
                 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                        ShortCut.registerShortCut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, ShortCut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
+                        Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
 
                 //putValue("help", "Action/AddNode/Autnode");

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -74 +74 @@
         public ExtrudeAction(MapFrame mapFrame) {
                 super(tr("Extrude"), "extrude/extrude", tr("Create areas"),
-                                ShortCut.registerShortCut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, ShortCut.GROUP_EDIT),
+                                Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.GROUP_EDIT),
                         mapFrame,
                         getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -29 +29 @@
          * Constructor for mapmodes without an menu
          */
-        public MapMode(String name, String iconName, String tooltip, ShortCut shortCut, MapFrame mapFrame, Cursor cursor) {
-                super(name, "mapmode/"+iconName, tooltip, shortCut, false);
+        public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) {
+                super(name, "mapmode/"+iconName, tooltip, shortcut, false);
                 this.cursor = cursor;
                 putValue("active", false);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -86 +86 @@
         public SelectAction(MapFrame mapFrame) {
                 super(tr("Select"), "move/move", tr("Select, move and rotate objects"),
-                        ShortCut.registerShortCut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, ShortCut.GROUP_EDIT),
+                        Shortcut.registerShortcut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, Shortcut.GROUP_EDIT),
                         mapFrame,
                         getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));

trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -47 +47 @@
         public ZoomAction(MapFrame mapFrame) {
                 super(tr("Zoom"), "zoom", tr("Zoom and move map"),
-                ShortCut.registerShortCut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, ShortCut.GROUP_EDIT),
+                Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT),
                 mapFrame, ImageProvider.getCursor("normal", "zoom"));
                 mv = mapFrame.mapView;