Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (12 diffs)

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

@@ -55 +55 @@
     public MergeNodesAction() {
         super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
-        Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
         DataSet.selListeners.add(this);
     }
 
     public void actionPerformed(ActionEvent event) {
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         LinkedList<Node> selectedNodes = new LinkedList<Node>();
 
@@ -67 +67 @@
         // anyway as long as we have at least two nodes
         for (OsmPrimitive osm : selection)
-            if (osm instanceof Node)
+            if (osm instanceof Node) {
                 selectedNodes.add((Node)osm);
+            }
 
         if (selectedNodes.size() < 2) {
@@ -93 +94 @@
             }
         }
-        if (useNode == null)
+        if (useNode == null) {
             useNode = selectedNodes.iterator().next();
+        }
 
         mergeNodes(selectedNodes, useNode);
@@ -102 +104 @@
      * really do the merging - returns the node that is left
      */
-    public static Node mergeNodes(LinkedList<Node> allNodes, Node dest) {
+    public Node mergeNodes(LinkedList<Node> allNodes, Node dest) {
         Node newNode = new Node(dest);
 
@@ -118 +120 @@
             new HashMap<Pair<Relation,String>, HashSet<Node>>();
         HashSet<Relation> relationsUsingNodes = new HashSet<Relation>();
-        for (Relation r : Main.ds.relations) {
-            if (r.deleted || r.incomplete) continue;
+        for (Relation r : getCurrentDataSet().relations) {
+            if (r.deleted || r.incomplete) {
+                continue;
+            }
             for (RelationMember rm : r.members) {
                 if (rm.member instanceof Node) {
@@ -148 +152 @@
                         tr("Merge nodes with different memberships?"),
                         tr("The selected nodes have differing relation memberships.  "
-                            + "Do you still want to merge them?"),
-                        new String[] {tr("Merge Anyway"), tr("Cancel")},
-                        new String[] {"mergenodes.png", "cancel.png"}).getValue();
-                if (option == 1) break;
+                                + "Do you still want to merge them?"),
+                                new String[] {tr("Merge Anyway"), tr("Cancel")},
+                                new String[] {"mergenodes.png", "cancel.png"}).getValue();
+                if (option == 1) {
+                    break;
+                }
                 return null;
             }
@@ -160 +166 @@
         for (Node n : allNodes) {
             for (Entry<String,String> e : n.entrySet()) {
-                if (!props.containsKey(e.getKey()))
+                if (!props.containsKey(e.getKey())) {
                     props.put(e.getKey(), new TreeSet<String>());
+                }
                 props.get(e.getKey()).add(e.getValue());
             }
@@ -187 +194 @@
         if (!components.isEmpty()) {
             int answer = new ExtendedDialog(Main.parent,
-                tr("Enter values for all conflicts."),
-                p,
-                new String[] {tr("Solve Conflicts"), tr("Cancel")},
-                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
+                    tr("Enter values for all conflicts."),
+                    p,
+                    new String[] {tr("Solve Conflicts"), tr("Cancel")},
+                    new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
             if (answer != 1)
                 return null;
-            for (Entry<String, JComboBox> e : components.entrySet())
+            for (Entry<String, JComboBox> e : components.entrySet()) {
                 newNode.put(e.getKey(), e.getValue().getEditor().getItem().toString());
+            }
         }
 
@@ -202 +210 @@
         Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>();
 
-        for (Way w : Main.ds.ways) {
-            if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
+        for (Way w : getCurrentDataSet().ways) {
+            if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                continue;
+            }
             boolean modify = false;
             for (Node sn : allNodes) {
-                if (sn == dest) continue;
+                if (sn == dest) {
+                    continue;
+                }
                 if (w.nodes.contains(sn)) {
                     modify = true;
                 }
             }
-            if (!modify) continue;
+            if (!modify) {
+                continue;
+            }
             // OK - this way contains one or more nodes to change
             ArrayList<Node> nn = new ArrayList<Node>();
@@ -227 +241 @@
             if (nn.size() < 2) {
                 CollectBackReferencesVisitor backRefs =
-                    new CollectBackReferencesVisitor(Main.ds, false);
+                    new CollectBackReferencesVisitor(getCurrentDataSet(), false);
                 w.visit(backRefs);
                 if (!backRefs.data.isEmpty()) {
                     JOptionPane.showMessageDialog(Main.parent,
-                        tr("Cannot merge nodes: " +
+                            tr("Cannot merge nodes: " +
                             "Would have to delete a way that is still used."));
                     return null;
@@ -247 +261 @@
         del.addAll(allNodes);
         del.remove(dest);
-        if (!del.isEmpty()) cmds.add(new DeleteCommand(del));
+        if (!del.isEmpty()) {
+            cmds.add(new DeleteCommand(del));
+        }
 
         // modify all relations containing the now-deleted nodes
@@ -270 +286 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Merge {0} nodes", allNodes.size()), cmds));
-        Main.ds.setSelected(dest);
+        getCurrentDataSet().setSelected(dest);
 
         return dest;