Changeset 27852 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2012-02-18T13:40:52+01:00 (12 years ago)

Author:

stoecker

Message:

fix shortcut deprecation

Location:

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2

Files:

• AddIntersectionsAction.java (modified) (1 diff)
• ExtractPointAction.java (modified) (1 diff)
• LatLonAction.java (modified) (1 diff)
• SplitObjectAction.java (modified) (1 diff)
• SymmetryAction.java (modified) (1 diff)
• UnGlueRelationAction.java (modified) (1 diff)
• curves/CurveAction.java (modified) (1 diff)
• customurl/OpenPageAction.java (modified) (1 diff)
• dumbutils/AlignWayNodesAction.java (modified) (1 diff)
• dumbutils/PasteRelationsAction.java (modified) (1 diff)
• dumbutils/ReplaceGeometryAction.java (modified) (1 diff)
• dumbutils/SplitOnIntersectionsAction.java (modified) (1 diff)
• dumbutils/TagBufferAction.java (modified) (1 diff)
• dumbutils/TagSourceAction.java (modified) (1 diff)
• selection/AdjacentNodesAction.java (modified) (1 diff)
• selection/AdjacentWaysAction.java (modified) (1 diff)
• selection/ConnectedWaysAction.java (modified) (1 diff)
• selection/IntersectedWaysAction.java (modified) (1 diff)
• selection/IntersectedWaysRecursiveAction.java (modified) (1 diff)
• selection/MiddleNodesAction.java (modified) (1 diff)
• selection/SelectAllInsideAction.java (modified) (1 diff)
• selection/SelectBoundaryAction.java (modified) (1 diff)
• selection/SelectHighwayAction.java (modified) (1 diff)
• selection/SelectModNodesAction.java (modified) (1 diff)
• selection/SelectModWaysAction.java (modified) (1 diff)
• selection/SelectWayNodesAction.java (modified) (1 diff)
• selection/UndoSelectionAction.java (modified) (1 diff)
• selection/UnselectNodesAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java

@@ -29 +29 @@
     public AddIntersectionsAction() {
         super(tr("Add nodes at intersections"), "addintersect", tr("Add missing nodes at intersections of selected ways."),
-                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);
+                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut.ALT_CTRL_SHIFT), true);
         putValue("help", ht("/Action/AddIntersections"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java

@@ -34 +34 @@
                 tr("Extracts node from a way"),
                 Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
-                KeyEvent.VK_J, Shortcut.GROUP_DIRECT2  ), true);
+                KeyEvent.VK_J, Shortcut.ALT), true);
         putValue("help", ht("/Action/ExtractNode"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java

@@ -31 +31 @@
     public LatLonAction() {
         super(tr("Lat Lon tool"), "latlon", tr("Create geometry by entering lat lon coordinates for it."),
-                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.GROUP_DIRECT3), true);
+                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/AddNode"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java

@@ -43 +43 @@
         super(tr("Split Object"), "splitobject", tr("Split an object at the selected nodes."),
                 Shortcut.registerShortcut("tools:splitobject", tr("Tool: {0}", tr("Split Object")),
-                KeyEvent.VK_P,  Shortcut.GROUP_MENU)
+                KeyEvent.VK_P,  Shortcut.CTRL)
                 , true);
         putValue("help", ht("/Action/SplitObject"));

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java

@@ -36 +36 @@
         super(tr("Symmetry"), "symmetry", tr("Mirror selected nodes and ways."),
                 Shortcut.registerShortcut("tools:symmetry", tr("Tool: {0}", tr("Symmetry")),
-                        KeyEvent.VK_S, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                        KeyEvent.VK_S, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/Symmetry"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java

@@ -43 +43 @@
     public UnGlueRelationAction() {
         super(tr("UnGlue Relation"), "ungluerelations", tr("Duplicate nodes, ways and relations that are used by multiple relations."),
-              Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2 ), true);
+              Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.ALT_SHIFT ), true);
         putValue("help", ht("/Action/UnGlueRelation"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java

@@ -31 +31 @@
         super(tr("Circle arc"), "circlearc", tr("Create a circle arc"),
                 Shortcut.registerShortcut("tools:createcurve", tr("Tool: {0}", tr("Create a circle arc")), KeyEvent.VK_C,
-                        Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                        Shortcut.SHIFT), true);
         putValue("help", ht("/Action/CreateCircleArc"));
         updatePreferences();

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java

@@ -36 +36 @@
                 tr("Opens specified URL browser"),
                 Shortcut.registerShortcut("tools:openurl", tr("Tool: {0}", tr("Open custom URL")),
-                KeyEvent.VK_H, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_H, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/OpenPage"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java

@@ -23 +23 @@
     public AlignWayNodesAction() {
         super(TITLE, "dumbutils/alignwaynodes", tr("Align nodes in a way"),
-                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
+                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.SHIFT)
                 , true);
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java

@@ -21 +21 @@
     public PasteRelationsAction() {
         super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
-                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}",  tr("Paste Relations")), KeyEvent.VK_V, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}",  tr("Paste Relations")), KeyEvent.VK_V, Shortcut.ALT_CTRL), true);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java

@@ -33 +33 @@
     public ReplaceGeometryAction() {
         super(TITLE, "dumbutils/replacegeometry", tr("Replace geometry of selected object with a new one"),
-                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU)
+                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.CTRL_SHIFT)
                 , true);
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java

@@ -27 +27 @@
         super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"),
                 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")),
-                KeyEvent.VK_P, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+                KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), true);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java

@@ -24 +24 @@
     public TagBufferAction() {
         super(TITLE, "dumbutils/tagbuffer", tr("Pastes tags of previously selected object(s)"),
-                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
+                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.SHIFT)
                 , true);
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java

@@ -24 +24 @@
     public TagSourceAction() {
         super(TITLE, "dumbutils/sourcetag", tr("Add remembered source tag"),
-                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU)
+                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL)
                 , true);
         source = Main.pref.get("sourcetag.value");

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java

@@ -25 +25 @@
         super(tr("Adjacent nodes"), "adjnodes", tr("Select adjacent nodes"),
                 Shortcut.registerShortcut("tools:adjnodes", tr("Tool: {0}","Adjacent nodes"),
-                KeyEvent.VK_E, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_E, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/AdjacentNodes"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java

@@ -26 +26 @@
                 tr("Adjacent ways will be selected. Nodes will be deselected."),
                 Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}","Adjacent ways"),
-                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_E, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/AdjacentWays"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java

@@ -23 +23 @@
         super(tr("All connected ways"), "adjwaysall", tr("Select all connected ways"),
                 Shortcut.registerShortcut("tools:adjwaysall", tr("Tool: {0}","All connected ways"),
-                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_E, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectConnectedWays"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java

@@ -25 +25 @@
         super(tr("Intersecting ways"), "intway", tr("Select intersecting ways"),
                 Shortcut.registerShortcut("tools:intway", tr("Tool: {0}","Intersecting ways"),
-                KeyEvent.VK_I, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_I, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/SelectIntersectingWays"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java

@@ -25 +25 @@
         super(tr("All intersecting ways"), "intwayall", tr("Select all intersecting ways"),
                 Shortcut.registerShortcut("tools:intwayall", tr("Tool: {0}","All intersecting ways"),
-                KeyEvent.VK_MULTIPLY, Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_MULTIPLY, Shortcut.CTRL), true);
         putValue("help", ht("/Action/SelectAllIntersectingWays"));
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java

@@ -27 +27 @@
         super(tr("Middle nodes"), "midnodes", tr("Select middle nodes"),
                 Shortcut.registerShortcut("tools:midnodes", tr("Tool: {0}","Middle nodes"),
-                KeyEvent.VK_E,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                KeyEvent.VK_E,  Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/MiddleNodes"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java

@@ -29 +29 @@
         super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"),
                 Shortcut.registerShortcut("tools:selinside", tr("Tool: {0}","All inside"),
-                KeyEvent.VK_I, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                KeyEvent.VK_I, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectAllInside"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java

@@ -36 +36 @@
         super(tr("Area boundary [testing]"), "selboundary", tr("Select relation or all ways that forms area boundary"),
                 Shortcut.registerShortcut("tools:selboundary", tr("Tool: {0}","Area boundary [testing]"),
-                KeyEvent.VK_SLASH, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_SLASH, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectAreaBoundary"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java

@@ -24 +24 @@
         super(tr("Select Highway"), "selecthighway", tr("Select highway for the name/ref given"),
                 Shortcut.registerShortcut("tools:selecthighway", tr("Tool: {0}","Select Highway"),
-                KeyEvent.VK_W, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_W, Shortcut.ALT_CTRL), true);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java

@@ -28 +28 @@
                 tr("Select last modified nodes"),
                 Shortcut.registerShortcut("tools:selmodnodes", tr("Tool: {0}","Select last modified nodes"),
-                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_Z, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedNodes"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java

@@ -28 +28 @@
                 tr("Select last modified ways"),
                 Shortcut.registerShortcut("tools:selmodways", tr("Tool: {0}","Select last modified ways"),
-                KeyEvent.VK_Z,  Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1), true);
+                KeyEvent.VK_Z,  Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedWays"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java

@@ -31 +31 @@
     public SelectWayNodesAction() {
         super(tr("Select Way Nodes"),"selectwaynodes" , tr("Select all nodes of a selected way."),
-                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectWayNodes"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java

@@ -27 +27 @@
                 tr("Reselect last added object or selection form history"),
                 Shortcut.registerShortcut("tools:undoselection", tr("Tool: {0}","Undo selection"),
-                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_Z, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/UndoSelection"));
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java

@@ -24 +24 @@
                 tr("Removes all nodes from selection"),
                 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_U, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/UnselectNodes"));
     }