Changeset 12689 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-08-28T19:09:01+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - refactor MergeNodesAction to avoid unneeded GUI dependence in DuplicateNode test

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeNodesAction.java (modified) (5 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (1 diff)
• data/validation/tests/DuplicateNode.java (modified) (2 diffs)

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

@@ -93 +93 @@
         if (targetNode != null) {
             Node targetLocationNode = selectTargetLocationNode(selectedNodes);
-            Command cmd = mergeNodes(getLayerManager().getEditLayer(), selectedNodes, targetNode, targetLocationNode);
+            Command cmd = mergeNodes(selectedNodes, targetNode, targetLocationNode);
             if (cmd != null) {
                 MainApplication.undoRedo.add(cmd);
@@ -272 +272 @@
 
         if (target != null) {
-            Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
+            Command cmd = mergeNodes(nodes, target, targetLocationNode);
             if (cmd != null) {
                 MainApplication.undoRedo.add(cmd);
@@ -281 +281 @@
 
     /**
-     * Merges the nodes in {@code nodes} at the specified node's location. Uses the dataset
-     * managed by {@code layer} as reference.
-     *
-     * @param layer layer the reference data layer. Must not be null.
+     * Merges the nodes in {@code nodes} at the specified node's location.
+     *
+     * @param layer unused
      * @param nodes the collection of nodes. Ignored if null.
      * @param targetLocationNode this node's location will be used for the targetNode.
      * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do
      * @throws IllegalArgumentException if {@code layer} is null
-     */
+     * @deprecated use {@link #mergeNodes(Collection, Node)} instead
+     */
+    @Deprecated
     public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) {
+        return mergeNodes(nodes, targetLocationNode);
+    }
+
+    /**
+     * Merges the nodes in {@code nodes} at the specified node's location.
+     *
+     * @param nodes the collection of nodes. Ignored if null.
+     * @param targetLocationNode this node's location will be used for the targetNode.
+     * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do
+     * @throws IllegalArgumentException if {@code layer} is null
+     * @since 12689
+     */
+    public static Command mergeNodes(Collection<Node> nodes, Node targetLocationNode) {
         if (nodes == null) {
             return null;
@@ -296 +310 @@
         Set<Node> allNodes = new HashSet<>(nodes);
         allNodes.add(targetLocationNode);
-        return mergeNodes(layer, nodes, selectTargetNode(allNodes), targetLocationNode);
-    }
-
-    /**
-     * Merges the nodes in <code>nodes</code> onto one of the nodes. Uses the dataset
-     * managed by <code>layer</code> as reference.
-     *
-     * @param layer layer the reference data layer. Must not be null.
+        return mergeNodes(nodes, selectTargetNode(allNodes), targetLocationNode);
+    }
+
+    /**
+     * Merges the nodes in <code>nodes</code> onto one of the nodes.
+     *
      * @param nodes the collection of nodes. Ignored if null.
      * @param targetNode the target node the collection of nodes is merged to. Must not be null.
@@ -310 +322 @@
      * @throws IllegalArgumentException if layer is null
      */
-    public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode, Node targetLocationNode) {
-        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+    public static Command mergeNodes(Collection<Node> nodes, Node targetNode, Node targetLocationNode) {
         CheckParameterUtil.ensureParameterNotNull(targetNode, "targetNode");
         if (nodes == null) {

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

@@ -722 +722 @@
         Node targetNode = MergeNodesAction.selectTargetNode(changedNodes);
         Node locNode = MergeNodesAction.selectTargetLocationNode(changedNodes);
-        Command mergeCmd = MergeNodesAction.mergeNodes(MainApplication.getLayerManager().getEditLayer(), changedNodes, targetNode, locNode);
+        Command mergeCmd = MergeNodesAction.mergeNodes(changedNodes, targetNode, locNode);
         if (mergeCmd != null) {
             MainApplication.undoRedo.add(mergeCmd);

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -334 +333 @@
 
             if (Command.checkOutlyingOrIncompleteOperation(nodes, Collections.singleton(target)) == Command.IS_OK)
-                return MergeNodesAction.mergeNodes(MainApplication.getLayerManager().getEditLayer(), nodes, target);
+                return MergeNodesAction.mergeNodes(nodes, target);
         }