Index: applications/editors/josm/plugins/poly/src/poly/DownloadPolyTask.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/DownloadPolyTask.java	(revision 33003)
+++ applications/editors/josm/plugins/poly/src/poly/DownloadPolyTask.java	(revision 33570)
@@ -2,10 +2,12 @@
 package poly;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.util.concurrent.Future;
-import org.openstreetmap.josm.Main;
-import static org.openstreetmap.josm.tools.I18n.tr;
+
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmServerReader;
@@ -27,5 +29,5 @@
     public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
         downloadTask = new DownloadTask(new_layer, new ServerPolyReader(url), progressMonitor);
-        return Main.worker.submit(downloadTask);
+        return MainApplication.worker.submit(downloadTask);
     }
 
@@ -40,5 +42,5 @@
     }
 
-    public class ServerPolyReader extends OsmServerReader {
+    public static class ServerPolyReader extends OsmServerReader {
         private String url;
 
Index: applications/editors/josm/plugins/poly/src/poly/PolyExporter.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/PolyExporter.java	(revision 33003)
+++ applications/editors/josm/plugins/poly/src/poly/PolyExporter.java	(revision 33570)
@@ -20,7 +20,7 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.io.importexport.OsmExporter;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.io.OsmExporter;
 
 /**
Index: applications/editors/josm/plugins/poly/src/poly/PolyImporter.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/PolyImporter.java	(revision 33003)
+++ applications/editors/josm/plugins/poly/src/poly/PolyImporter.java	(revision 33570)
@@ -20,9 +20,10 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.xml.sax.SAXException;
@@ -142,5 +143,5 @@
     private DataSet constructDataSet(List<Area> areas) {
         DataSet ds = new DataSet();
-        ds.setUploadDiscouraged(true);
+        ds.setUploadPolicy(UploadPolicy.DISCOURAGED);
 
         boolean foundInner = false;
@@ -163,5 +164,5 @@
     }
 
-    private class Area {
+    private static class Area {
         private String name;
         private String polygonName;
Index: applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java	(revision 33003)
+++ applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java	(revision 33570)
@@ -2,6 +2,6 @@
 package poly;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -22,5 +22,5 @@
         ExtensionFileFilter.addImporter(new PolyImporter());
         ExtensionFileFilter.addExporter(new PolyExporter());
-        Main.main.menu.openLocation.addDownloadTaskClass(DownloadPolyTask.class);
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(DownloadPolyTask.class);
     }
 }