Changeset 10970 in josm for trunk

Timestamp:

2016-09-07T00:00:53+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13491 - remove unused parameter

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/Command.java (modified) (2 diffs)
• data/validation/tests/DuplicateNode.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -253 +253 @@
      * Check whether user is about to operate on data outside of the download area.
      *
-     * @param operation the operation name which is used for setting some preferences
      * @param primitives the primitives to operate on
      * @param ignore {@code null} or a primitive to be ignored
      * @return true, if operating on outlying primitives is OK; false, otherwise
      */
-    public static int checkOutlyingOrIncompleteOperation(String operation,
+    public static int checkOutlyingOrIncompleteOperation(
             Collection<? extends OsmPrimitive> primitives,
             Collection<? extends OsmPrimitive> ignore) {
@@ -289 +288 @@
             Collection<? extends OsmPrimitive> primitives,
             Collection<? extends OsmPrimitive> ignore) {
-        int checkRes = checkOutlyingOrIncompleteOperation(operation, primitives, ignore);
+        int checkRes = checkOutlyingOrIncompleteOperation(primitives, ignore);
         if ((checkRes & IS_OUTSIDE) != 0) {
             JPanel msg = new JPanel(new GridBagLayout());

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

@@ -407 +407 @@
             }
 
-            if (Command.checkOutlyingOrIncompleteOperation("delete", nodes, Collections.singleton(target)) == Command.IS_OK)
+            if (Command.checkOutlyingOrIncompleteOperation(nodes, Collections.singleton(target)) == Command.IS_OK)
                 return MergeNodesAction.mergeNodes(Main.getLayerManager().getEditLayer(), nodes, target);
         }