Index: /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 19294)
+++ /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 19295)
@@ -305,12 +305,10 @@
                 .orElse(Locale.getDefault())
                 .getCountry();
-        switch (country) {
-            case "US":
-                // https://en.wikipedia.org/wiki/Metrication_in_the_United_States#Current_use
-                // Imperial units still used in transportation and Earth sciences
-                return IMPERIAL;
-            default:
-                return METRIC;
-        }
+        if (country == "US")
+            // https://en.wikipedia.org/wiki/Metrication_in_the_United_States#Current_use
+            // Imperial units still used in transportation and Earth sciences
+            return IMPERIAL;
+        else
+            return METRIC;
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java	(revision 19294)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java	(revision 19295)
@@ -90,6 +90,7 @@
         case "josm":
             return new XMLNamespace("josm", XML_URI_EXTENSIONS_JOSM, XML_XSD_EXTENSIONS_JOSM);
-        }
-        return null;
+        default:
+            return null;
+        }
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(revision 19294)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(revision 19295)
@@ -112,9 +112,6 @@
         if (testError.getTester() instanceof UntaggedNode) {
             int code = testError.getCode();
-            switch (code) {
-            case UNTAGGED_NODE_BLANK:
-            case UNTAGGED_NODE_CREATED_BY:
-            case UNTAGGED_NODE_WATCH:
-            case UNTAGGED_NODE_SOURCE:
+            if (code == UNTAGGED_NODE_BLANK || code == UNTAGGED_NODE_CREATED_BY
+                || code == UNTAGGED_NODE_WATCH || code == UNTAGGED_NODE_SOURCE) {
                 return true;
             }
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 19294)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 19295)
@@ -181,10 +181,11 @@
     public LatLon getMergedCoords() {
         switch (coordMergeDecision) {
-        case KEEP_MINE: return myCoords;
-        case KEEP_THEIR: return theirCoords;
-        case UNDECIDED: return null;
-        }
-        // should not happen
-        return null;
+        case KEEP_MINE:
+            return myCoords;
+        case KEEP_THEIR:
+            return theirCoords;
+        default:
+            return null;
+        }
     }
 
@@ -222,10 +223,11 @@
     public Boolean getMergedDeletedState() {
         switch (deletedMergeDecision) {
-        case KEEP_MINE: return myDeletedState;
-        case KEEP_THEIR: return theirDeletedState;
-        case UNDECIDED: return null;
-        }
-        // should not happen
-        return null;
+        case KEEP_MINE:
+            return myDeletedState;
+        case KEEP_THEIR:
+            return theirDeletedState;
+        default:
+            return null;
+        }
     }