Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java	(revision 17339)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java	(revision 17340)
@@ -10,5 +10,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
@@ -27,5 +26,5 @@
     {
         this.b = b;
-        this.proj = Main.main.proj;
+        this.proj = Main.proj;
         this.pixelPerDegree = layer.pixelPerDegree;
         this.image = image;
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 17339)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 17340)
@@ -77,10 +77,10 @@
     protected URL getURL(double w, double s,double e,double n,
             int wi, int ht) throws MalformedURLException {
-        String proj = Main.proj.toCode();
+        String myProj = Main.proj.toCode();
         if(Main.proj instanceof Mercator) // don't use mercator code directly
         {
             LatLon sw = Main.proj.eastNorth2latlon(new EastNorth(w, s));
             LatLon ne = Main.proj.eastNorth2latlon(new EastNorth(e, n));
-            proj = "EPSG:4326";
+            myProj = "EPSG:4326";
             s = sw.lat();
             w = sw.lon();
@@ -96,5 +96,5 @@
 
         if (urlWithPatterns) {
-            str = str.replaceAll("\\{proj\\}", proj)
+            str = str.replaceAll("\\{proj\\}", myProj)
             .replaceAll("\\{bbox\\}", bbox)
             .replaceAll("\\{width\\}", String.valueOf(wi))
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 17339)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 17340)
@@ -1,4 +1,5 @@
 package wmsplugin;
 
+import org.openstreetmap.josm.io.CacheFiles;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -257,5 +258,5 @@
 			// Delete small files, because they're probably blank tiles.
 			// See https://josm.openstreetmap.de/ticket/2307
-			WMSPlugin.cache.customCleanUp(WMSPlugin.cache.CLEAN_SMALL_FILES, 2048);
+			WMSPlugin.cache.customCleanUp(CacheFiles.CLEAN_SMALL_FILES, 2048);
 
 			for (int x = 0; x < dax; ++x) {
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 17339)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 17340)
@@ -49,5 +49,5 @@
     public WMSPlugin() {
         refreshMenu();
-        cache.setExpire(cache.EXPIRE_MONTHLY, false);
+        cache.setExpire(CacheFiles.EXPIRE_MONTHLY, false);
         cache.setMaxSize(70, false);
     }
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 17339)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 17340)
@@ -2,7 +2,4 @@
 
 import java.awt.FlowLayout;
-import javax.swing.JCheckBox;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
 import org.openstreetmap.josm.Main;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -56,5 +53,5 @@
         	@Override
             public boolean isCellEditable(int row,int column){return false;}
-        };;
+        };
         JScrollPane scrolldef = new JScrollPane(listdef);
         p.add(scrolldef, GBC.eol().insets(0,5,0,0).fill(GBC.BOTH));