Index: trunk/src/org/openstreetmap/josm/data/validation/TestError.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/TestError.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/data/validation/TestError.java	(revision 11191)
@@ -75,5 +75,5 @@
         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,5 +239,5 @@
     }
 
-    private TestError(Builder builder) {
+    TestError(Builder builder) {
         this.tester = builder.tester;
         this.severity = builder.severity;
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(revision 11191)
@@ -195,5 +195,5 @@
         @Override
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return (w1 != w2); // should not happen
+            return w1 != w2; // should not happen
         }
 
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 11191)
@@ -489,27 +489,25 @@
         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);
             }
         }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java	(revision 11191)
@@ -67,8 +67,6 @@
 
         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);
             }
         });
Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 11191)
@@ -135,5 +135,5 @@
                 geomObj.add("coordinates", multiPolygon);
             } catch (MultipolygonBuilder.JoinedPolygonCreationException ex) {
-                Main.warn("GeoJSON: Failed to export multipolygon " + r.getUniqueId());
+                Main.warn("GeoJSON: Failed to export multipolygon {0}", r.getUniqueId());
                 Main.warn(ex);
             }
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 11190)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 11191)
@@ -407,5 +407,5 @@
         Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName);
         if (!Files.isReadable(templateFile)) {
-            Main.warn("extended font config - unable to find font config template file "+templateFile.toString());
+            Main.warn("extended font config - unable to find font config template file {0}", templateFile.toString());
             return;
         }