Changeset 5449 in osm for applications/editors

Timestamp:

2007-11-11T14:01:05+01:00 (17 years ago)

Author:

ulf

Message:

rename mergenodeway to joinnodeway, to reflect it's menu name

Location:

applications/editors/josm/plugins/utilsplugin

Files:

• images/joinnodeway.png (moved) (moved from applications/editors/josm/plugins/utilsplugin/images/mergenodeway.png )
• src/UtilsPlugin/JoinNodeWayAction.java (moved) (moved from applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/MergeNodeWayAction.java ) (1 diff)
• src/UtilsPlugin/UtilsPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinNodeWayAction.java

@@ -31 +31 @@
 import javax.swing.AbstractAction;
 
-class MergeNodeWayAction extends JosmAction {
-        public MergeNodeWayAction() {
-            super(tr("Join node to way"), "mergenodeway",
+class JoinNodeWayAction extends JosmAction {
+        public JoinNodeWayAction() {
+            super(tr("Join node to way"), "joinnodeway",
                         tr("Join a node into the nearest way segments"), KeyEvent.VK_J, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
         }

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java

@@ -21 +21 @@
 
 public class UtilsPlugin extends Plugin {
-        JMenuItem MergeNodeWay;
+        JMenuItem JoinNodeWay;
         JMenuItem SimplifyWay;
 
@@ -27 +27 @@
                 JosmAction action;
                 
-                action = new MergeNodeWayAction();
-                MergeNodeWay = Main.main.menu.toolsMenu.add(action);
-                MergeNodeWay.setAccelerator(action.shortCut);
-                MergeNodeWay.setEnabled(false);
+                action = new JoinNodeWayAction();
+                JoinNodeWay = Main.main.menu.toolsMenu.add(action);
+                JoinNodeWay.setAccelerator(action.shortCut);
+                JoinNodeWay.setEnabled(false);
 
                 action = new SimplifyWayAction();
@@ -41 +41 @@
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
                 if (oldFrame == null && newFrame != null) {
-                        MergeNodeWay.setEnabled(true);
+                        JoinNodeWay.setEnabled(true);
                         SimplifyWay.setEnabled(true);
                 }