Changeset 11218 in josm for trunk

Timestamp:

2016-11-04T17:58:48+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix various recent issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (1 diff)
• tools/Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -224 +224 @@
         }
 
-        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 +247 @@
     private ScaleList nativeScaleList;
 
-    private String defaultLayer;
+    private final String defaultLayer;
 
     /**

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -373 +373 @@
      * @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);

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -100 +100 @@
          */
         public FontEntry() {
+            // Default constructor needed for construction by reflection
         }
 

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -292 +292 @@
             }
         }
-    };
+    }
 
     // and here our modifier groups