Index: /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 13896)
+++ /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 13897)
@@ -27,4 +27,5 @@
 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,5 +112,5 @@
                         String layerName = tileSource.getLayers().stream()
                                 .filter(x -> x.getIdentifier().equals(layerId.getLayerName()))
-                                .map(x -> x.getUserTitle())
+                                .map(Layer::getUserTitle)
                                 .findFirst()
                                 .orElse("");
Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 13896)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 13897)
@@ -387,4 +387,8 @@
     }
 
+    /**
+     * 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,12 +428,9 @@
         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,5 +442,5 @@
         }
 
-        private String getSizeString(int size) {
+        private static String getSizeString(int size) {
             return new StringBuilder().append(size).append('x').append(size).toString();
         }
@@ -525,5 +526,5 @@
     }
 
-    private void sendOsmTileRequest(Tile tile, String request) {
+    private static void sendOsmTileRequest(Tile tile, String request) {
         if (tile != null) {
             try {
@@ -544,5 +545,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.sendOsmTileRequest(tile, "status");
+            sendOsmTileRequest(tile, "status");
         }
     }
@@ -556,5 +557,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            layer.sendOsmTileRequest(tile, "dirty");
+            sendOsmTileRequest(tile, "dirty");
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 13896)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 13897)
@@ -3,4 +3,5 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.nio.file.Files;
@@ -126,5 +127,5 @@
         assertEquals("b8e36d51-119a-423b-b156-d744d54123d5", wmsImageryInfo.getCustomHttpHeaders().get("X-WAAPI-TOKEN"));
         assertEquals("b8e36d51-119a-423b-b156-d744d54123d5", tileSource.getHeaders().get("X-WAAPI-TOKEN"));
-        assertEquals(true, wmsImageryInfo.isGeoreferenceValid());
+        assertTrue(wmsImageryInfo.isGeoreferenceValid());
         tileServer.verify(
                 WireMock.getRequestedFor(WireMock.urlEqualTo("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities"))
@@ -143,5 +144,4 @@
                 + "BBOX=20037506.6204108,-60112521.5836107,60112521.5836107,-20037506.6204108",
                 tileSource.getTileUrl(1, 1, 1));
-
     }
 }