Changeset 11815 in josm for trunk

Timestamp:

2017-04-01T02:22:13+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S3398 - "private" methods called only by inner classes should be moved to those classes

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (3 diffs)

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

@@ -246 +246 @@
             return new WMTSDefaultLayer(selectedLayer.identifier, selectedLayer.tileMatrixSet.identifier);
         }
+
+        private static List<Entry<String, List<Layer>>> groupLayersByNameAndTileMatrixSet(Collection<Layer> layers) {
+            Map<String, List<Layer>> layerByName = layers.stream().collect(
+                    Collectors.groupingBy(x -> x.identifier + '\u001c' + x.tileMatrixSet.identifier));
+            return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
+        }
     }
 
@@ -258 +264 @@
 
     private final WMTSDefaultLayer defaultLayer;
-
 
     /**
@@ -313 +318 @@
         matcher.appendTail(output);
         return output.toString();
-    }
-
-    private static List<Entry<String, List<Layer>>> groupLayersByNameAndTileMatrixSet(Collection<Layer> layers) {
-        Map<String, List<Layer>> layerByName = layers.stream().collect(
-                Collectors.groupingBy(x -> x.identifier + '\u001c' + x.tileMatrixSet.identifier));
-        return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
     }