Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 33557)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 33558)
@@ -16,7 +16,8 @@
 import java.util.zip.ZipFile;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
@@ -24,4 +25,5 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.Logging;
 
 class CanVecTile {
@@ -190,6 +192,6 @@
     private ZipFile openZip() throws IOException {
         File downloadPath = new File(layer.plugin.getPluginDir() + File.separator);
-        if (!downloadPath.mkdir() && Main.isDebugEnabled()) {
-            Main.debug("Unable to create directory: "+downloadPath);
+        if (!downloadPath.mkdir() && Logging.isDebugEnabled()) {
+            Logging.debug("Unable to create directory: "+downloadPath);
         }
         CachedFile tileZip = new CachedFile(getDownloadUrl()).setDestDir(downloadPath.toString());
@@ -203,5 +205,5 @@
             zipFile = openZip();
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
             return;
         }
@@ -230,11 +232,11 @@
                     OsmImporter importer = new OsmImporter();
                     OsmImporterData temp = importer.loadLayer(rawtile, null, entry.getName(), null);
-                    Main.worker.submit(temp.getPostLayerTask());
-                    Main.getLayerManager().addLayer(temp.getLayer());
-                    temp.getLayer().data.setUploadDiscouraged(false);
+                    MainApplication.worker.submit(temp.getPostLayerTask());
+                    MainApplication.getLayerManager().addLayer(temp.getLayer());
+                    temp.getLayer().data.setUploadPolicy(UploadPolicy.NORMAL);
                 }
             }
         } catch (IOException | IllegalDataException e) {
-            Main.error(e);
+            Logging.error(e);
             return;
         }
Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java	(revision 33557)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java	(revision 33558)
@@ -2,5 +2,5 @@
 package org.openstreetmap.josm.plugins.canvec_helper;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -17,5 +17,5 @@
     public CanvecHelper(PluginInformation info) {
         super(info);
-        Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this));
+        MainApplication.getMenu().imagerySubMenu.add(new CanvecHelperAction(this));
     }
 }
Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java	(revision 33557)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java	(revision 33558)
@@ -2,6 +2,6 @@
 package org.openstreetmap.josm.plugins.canvec_helper;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 
 class CanvecHelperAction extends JosmAction {
@@ -14,5 +14,5 @@
     @Override
     public void actionPerformed(java.awt.event.ActionEvent action) {
-        Main.getLayerManager().addLayer(new CanvecLayer("canvec tile helper", parentTemp));
+        MainApplication.getLayerManager().addLayer(new CanvecLayer("canvec tile helper", parentTemp));
     }
 }
Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 33557)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 33558)
@@ -26,5 +26,4 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -34,4 +33,5 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.Logging;
 
 // most of the layout was copied from the openstreetbugs plugin to get things started
@@ -72,5 +72,5 @@
                     lastCell = cell;
                 } else if (!line.contains("Metadata.txt")) {
-                    Main.warn("bad line '" + line + "'\n");
+                    Logging.warn("bad line '" + line + "'\n");
                 }
             }
@@ -78,11 +78,11 @@
             if (tile.isValid()) tiles.add(tile);
 
-            if (Main.isDebugEnabled()) {
+            if (Logging.isDebugEnabled()) {
                 long end = System.currentTimeMillis();
-                Main.debug((end-start)+"ms spent");
+                Logging.debug((end-start)+"ms spent");
             }
         } catch (IOException e) {
-            Main.error("exception getting index");
-            Main.error(e);
+            Logging.error("exception getting index");
+            Logging.error(e);
         }
     }