Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 11217)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 11218)
@@ -224,5 +224,5 @@
         }
 
-        private List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
+        private static List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
             Map<String, List<Layer>> layerByName = layers.stream().collect(Collectors.groupingBy(x -> x.name));
             return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
@@ -247,5 +247,5 @@
     private ScaleList nativeScaleList;
 
-    private String defaultLayer;
+    private final String defaultLayer;
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 11217)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java	(revision 11218)
@@ -373,5 +373,5 @@
      * @return the dot directory
      */
-    private File getDotDirectory() {
+    private static File getDotDirectory() {
         String dirName = "." + Main.pref.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);
         return new File(System.getProperty("user.home"), dirName);
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 11217)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 11218)
@@ -100,4 +100,5 @@
          */
         public FontEntry() {
+            // Default constructor needed for construction by reflection
         }
 
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 11217)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 11218)
@@ -292,5 +292,5 @@
             }
         }
-    };
+    }
 
     // and here our modifier groups