Changeset 11462 in josm for trunk/src/org

Timestamp:

2017-01-12T23:28:57+01: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

Files:

• actions/mapmode/ExtrudeAction.java (modified) (1 diff)
• data/validation/tests/WayConnectedToArea.java (modified) (1 diff)
• gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (1 diff)

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

@@ -270 +270 @@
             else if (mode == Mode.translate_node)
                 rv = new StringBuilder(tr("Move the node along one of the segments, then release the mouse button."));
-            else if (mode == Mode.extrude)
-                rv = new StringBuilder(tr("Draw a rectangle of the desired size, then release the mouse button."));
-            else if (mode == Mode.create_new)
+            else if (mode == Mode.extrude || mode == Mode.create_new)
                 rv = new StringBuilder(tr("Draw a rectangle of the desired size, then release the mouse button."));
             else {

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

@@ -63 +63 @@
 
     private void testForError(Way w, Node wayNode, OsmPrimitive p) {
-        if (wayNode.isOutsideDownloadArea()) {
-            return;
-        } else if (wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
+        if (wayNode.isOutsideDownloadArea()
+                || wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
             return;
         } else if (isArea(p)) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -244 +244 @@
                         indices.add(decision.getPos());
                     }
-                    if (roles.size() != 1) {
-                        // roles to not patch, leave undecided
-                        continue;
-                    } else if (!isCollectionOfConsecutiveNumbers(indices)) {
-                        // not consecutive members in relation, leave undecided
+                    if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
+                        // roles to not patch or not consecutive members in relation, leave undecided
                         continue;
                     }