Changeset 13897 in josm for trunk/src/org

Timestamp:

2018-06-07T02:05:53+02:00 (6 years ago)

Author:

Don-vip

Message:

SonarQube fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.imagery.LayerDetails;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
+import org.openstreetmap.josm.data.imagery.WMTSTileSource.Layer;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -111 +112 @@
                         String layerName = tileSource.getLayers().stream()
                                 .filter(x -> x.getIdentifier().equals(layerId.getLayerName()))
-                                .map(x -> x.getUserTitle())
+                                .map(Layer::getUserTitle)
                                 .findFirst()
                                 .orElse("");

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -387 +387 @@
     }
 
+    /**
+     * Returns best zoom level.
+     * @return best zoom level
+     */
     public int getBestZoom() {
         double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
@@ -424 +428 @@
         protected final Tile tile;
 
-        private AbstractTileAction(String name, AbstractTileSourceLayer<?> layer, Tile tile) {
+        AbstractTileAction(String name, AbstractTileSourceLayer<?> layer, Tile tile) {
             super(name);
             this.layer = layer;
             this.tile = tile;
         }
-
-        @Override
-        public abstract void actionPerformed(ActionEvent arg0);
     }
 
@@ -441 +442 @@
         }
 
-        private String getSizeString(int size) {
+        private static String getSizeString(int size) {
             return new StringBuilder().append(size).append('x').append(size).toString();
         }
@@ -525 +526 @@
     }
 
-    private void sendOsmTileRequest(Tile tile, String request) {
+    private static void sendOsmTileRequest(Tile tile, String request) {
         if (tile != null) {
             try {
@@ -544 +545 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.sendOsmTileRequest(tile, "status");
+            sendOsmTileRequest(tile, "status");
         }
     }
@@ -556 +557 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.sendOsmTileRequest(tile, "dirty");
+            sendOsmTileRequest(tile, "dirty");
         }
     }