Changeset 11191 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2016-10-30T00:38:36+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fix some recent warnings

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• TestError.java (modified) (2 diffs)
• tests/CrossingWays.java (modified) (1 diff)
• tests/MultipolygonTest.java (modified) (1 diff)
• tests/NameMismatch.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -75 +75 @@
         private Supplier<Command> fixingCommand;
 
-        private Builder(Test tester, Severity severity, int code) {
+        Builder(Test tester, Severity severity, int code) {
             this.tester = tester;
             this.severity = severity;
@@ -239 +239 @@
     }
 
-    private TestError(Builder builder) {
+    TestError(Builder builder) {
         this.tester = builder.tester;
         this.severity = builder.severity;

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

@@ -195 +195 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return (w1 != w2); // should not happen
+            return w1 != w2; // should not happen
         }
 

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

@@ -489 +489 @@
         if (testError.getCode() == REPEATED_MEMBER_SAME_ROLE) {
             ArrayList<OsmPrimitive> primitives = new ArrayList<>(testError.getPrimitives());
-            if (primitives.size() >= 2) {
-                if (primitives.get(0) instanceof Relation) {
-                    Relation oldRel = (Relation) primitives.get(0);
-                    Relation newRel = new Relation(oldRel);
-                    List<OsmPrimitive> repeatedPrims = primitives.subList(1, primitives.size());
-                    List<RelationMember> oldMembers = oldRel.getMembers();
-
-                    List<RelationMember> newMembers = new ArrayList<>();
-                    HashSet<OsmPrimitive> toRemove = new HashSet<>(repeatedPrims);
-                    HashSet<OsmPrimitive> found = new HashSet<>(repeatedPrims.size());
-                    for (RelationMember rm : oldMembers) {
-                        if (toRemove.contains(rm.getMember())) {
-                            if (!found.contains(rm.getMember())) {
-                                found.add(rm.getMember());
-                                newMembers.add(rm);
-                            }
-                        } else {
+            if (primitives.size() >= 2 && primitives.get(0) instanceof Relation) {
+                Relation oldRel = (Relation) primitives.get(0);
+                Relation newRel = new Relation(oldRel);
+                List<OsmPrimitive> repeatedPrims = primitives.subList(1, primitives.size());
+                List<RelationMember> oldMembers = oldRel.getMembers();
+
+                List<RelationMember> newMembers = new ArrayList<>();
+                HashSet<OsmPrimitive> toRemove = new HashSet<>(repeatedPrims);
+                HashSet<OsmPrimitive> found = new HashSet<>(repeatedPrims.size());
+                for (RelationMember rm : oldMembers) {
+                    if (toRemove.contains(rm.getMember())) {
+                        if (!found.contains(rm.getMember())) {
+                            found.add(rm.getMember());
                             newMembers.add(rm);
                         }
+                    } else {
+                        newMembers.add(rm);
                     }
-                    newRel.setMembers(newMembers);
-                    return new ChangeCommand(oldRel, newRel);
-                }
+                }
+                newRel.setMembers(newMembers);
+                return new ChangeCommand(oldRel, newRel);
             }
         }

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

@@ -67 +67 @@
 
         p.getKeys().forEach((key, n) -> {
-            if (key.startsWith("name:") && !"name:etymology:wikidata".equals(key)) {
-                if (n != null) {
-                    names.add(n);
-                }
+            if (n != null && key.startsWith("name:") && !"name:etymology:wikidata".equals(key)) {
+                names.add(n);
             }
         });