Changeset 424 in josm for trunk

Timestamp:

2007-10-26T08:47:32+02:00 (17 years ago)

Author:

gebner

Message:

Add new icon for the merge-nodes action.

Location:

trunk

Files:

• images/mergenodes.png (added)
• src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (1 diff)

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

@@ -52 +52 @@
 
         public MergeNodesAction() {
-                super(tr("Merge Nodes"), "combineway", tr("Merge nodes into one."), KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
+                super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into one."), KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
                 DataSet.selListeners.add(this);
         }

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

@@ -233 +233 @@
                 }
                 restoreCursor();
-    if (mode == Mode.move) {
-                  boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-      if (ctrl) {
-                    Collection<OsmPrimitive> selection = Main.ds.getSelected();
-                    Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-                    Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
-        if (nn != null) {
-          Node n = nn.iterator().next();
-          LinkedList<Node> selNodes = new LinkedList<Node>();
-          for (OsmPrimitive osm : selection)
-            if (osm instanceof Node)
-              selNodes.add((Node)osm);
-          if (selNodes.size() > 0) {
-            selNodes.add(n);
-            MergeNodesAction.mergeNodes(selNodes, n);
-          }
-        }
-      }
-    }
+
+                if (mode == Mode.move) {
+                        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+                        if (ctrl) {
+                                Collection<OsmPrimitive> selection = Main.ds.getSelected();
+                                Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+                                Collection<Node> nn = Main.map.mapView.getNearestNodes(e.getPoint(), affectedNodes);
+                                if (nn != null) {
+                                        Node n = nn.iterator().next();
+                                    LinkedList<Node> selNodes = new LinkedList<Node>();
+                                    for (OsmPrimitive osm : selection)
+                                                if (osm instanceof Node)
+                                                        selNodes.add((Node)osm);
+                                        if (selNodes.size() > 0) {
+                                                selNodes.add(n);
+                                                MergeNodesAction.mergeNodes(selNodes, n);
+                                        }
+                                }
+                        }
+                }
+
                 updateStatusLine();
                 mode = null;