Changeset 33570 in osm for applications/editors

Timestamp:

2017-08-27T20:27:34+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12671

Location:

applications/editors/josm/plugins/poly

Files:

• build.xml (modified) (1 diff)
• src/poly/DownloadPolyTask.java (modified) (3 diffs)
• src/poly/PolyExporter.java (modified) (1 diff)
• src/poly/PolyImporter.java (modified) (3 diffs)
• src/poly/PolyPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/poly/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12671"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/poly/src/poly/DownloadPolyTask.java

@@ -2 +2 @@
 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 +29 @@
     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 +42 @@
     }
 
-    public class ServerPolyReader extends OsmServerReader {
+    public static class ServerPolyReader extends OsmServerReader {
         private String url;
 

applications/editors/josm/plugins/poly/src/poly/PolyExporter.java

@@ -20 +20 @@
 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;
 
 /**

applications/editors/josm/plugins/poly/src/poly/PolyImporter.java

@@ -20 +20 @@
 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 +143 @@
     private DataSet constructDataSet(List<Area> areas) {
         DataSet ds = new DataSet();
-        ds.setUploadDiscouraged(true);
+        ds.setUploadPolicy(UploadPolicy.DISCOURAGED);
 
         boolean foundInner = false;
@@ -163 +164 @@
     }
 
-    private class Area {
+    private static class Area {
         private String name;
         private String polygonName;

applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java

@@ -2 +2 @@
 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 +22 @@
         ExtensionFileFilter.addImporter(new PolyImporter());
         ExtensionFileFilter.addExporter(new PolyExporter());
-        Main.main.menu.openLocation.addDownloadTaskClass(DownloadPolyTask.class);
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(DownloadPolyTask.class);
     }
 }