Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 9477)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 9478)
@@ -22,10 +22,9 @@
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -42,5 +41,4 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
-import javax.swing.DefaultButtonModel;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
@@ -88,5 +86,4 @@
 import org.openstreetmap.josm.io.WMSLayerImporter;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 
 /**
@@ -377,5 +374,5 @@
     }
 
-    private class LoadTileAction extends AbstractAction {
+    private final class LoadTileAction extends AbstractAction {
 
         private LoadTileAction() {
@@ -431,4 +428,5 @@
         }
 
+        @Override
         public Component createMenuComponent() {
             JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
@@ -454,4 +452,5 @@
         }
 
+        @Override
         public Component createMenuComponent() {
             JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
@@ -582,22 +581,4 @@
             this.t = t;
         }
-    }
-
-    private class BooleanButtonModel extends DefaultButtonModel {
-        private final Field field;
-
-        BooleanButtonModel(Field field) {
-            this.field = field;
-        }
-
-        @Override
-        public boolean isSelected() {
-            try {
-                return field.getBoolean(AbstractTileSourceLayer.this);
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
     }
 
@@ -662,7 +643,12 @@
     }
 
+    /**
+     * Tile source layer popup menu.
+     */
     public class TileSourceLayerPopup extends JPopupMenu {
+        /**
+         * Constructs a new {@code TileSourceLayerPopup}.
+         */
         public TileSourceLayerPopup() {
-
             for (Action a : getCommonEntries()) {
                 if (a instanceof LayerAction) {
@@ -1650,4 +1636,8 @@
     }
 
+    /**
+     * Returns the common menu entries.
+     * @return the common menu entries
+     */
     public Action[] getCommonEntries() {
         return new Action[] {
@@ -1759,4 +1749,5 @@
     public void downloadAreaToCache(final PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {
         final Set<Tile> requestedTiles = new ConcurrentSkipListSet<>(new Comparator<Tile>() {
+            @Override
             public int compare(Tile o1, Tile o2) {
                 return String.CASE_INSENSITIVE_ORDER.compare(o1.getKey(), o2.getKey());