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

Timestamp:

2016-10-09T04:03:32+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1871 - Two branches in the same conditional structure should not have exactly the same implementation

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MergeNodesAction.java (modified) (2 diffs)
• SessionSaveAsAction.java (modified) (1 diff)
• SimplifyWayAction.java (modified) (1 diff)
• UploadSelectionAction.java (modified) (1 diff)

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

@@ -161 +161 @@
                 // Among existing nodes, try to keep the oldest used one
                 if (!n.getReferrers().isEmpty()) {
-                    if (targetNode == null) {
-                        targetNode = n;
-                    } else if (n.getId() < targetNode.getId()) {
+                    if (targetNode == null || n.getId() < targetNode.getId()) {
                         targetNode = n;
                     }
-                } else if (oldestNode == null) {
-                    oldestNode = n;
-                } else if (n.getId() < oldestNode.getId()) {
+                } else if (oldestNode == null || n.getId() < oldestNode.getId()) {
                     oldestNode = n;
                 }
@@ -200 +196 @@
                 if (!nodesToDelete.contains(n) && !n.equals(targetNode)) {
                     newNodes.add(n);
-                } else if (newNodes.isEmpty()) {
-                    newNodes.add(targetNode);
-                } else if (!newNodes.get(newNodes.size()-1).equals(targetNode)) {
+                } else if (newNodes.isEmpty() || !newNodes.get(newNodes.size()-1).equals(targetNode)) {
                     // make sure we collapse a sequence of deleted nodes
                     // to exactly one occurrence of the merged target node

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

@@ -131 +131 @@
         boolean zip;
         FileFilter ff = fc.getFileFilter();
-        if (zipRequired) {
-            zip = true;
-        } else if (joz.equals(ff)) {
+        if (zipRequired || joz.equals(ff)) {
             zip = true;
         } else if (jos.equals(ff)) {

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

@@ -101 +101 @@
                 alertSelectAtLeastOneWay();
                 return;
-            } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) {
-                return;
-            } else if (ways.size() > 10 && !confirmSimplifyManyWays(ways.size())) {
+            } else if (!confirmWayWithNodesOutsideBoundingBox(ways) || (ways.size() > 10 && !confirmSimplifyManyWays(ways.size()))) {
                 return;
             }

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

@@ -79 +79 @@
         Set<OsmPrimitive> ret = new HashSet<>();
         for (OsmPrimitive p: primitives) {
-            if (p.isNewOrUndeleted()) {
-                ret.add(p);
-            } else if (p.isModified() && !p.isIncomplete()) {
+            if (p.isNewOrUndeleted() || (p.isModified() && !p.isIncomplete())) {
                 ret.add(p);
             }