Changeset 32509 in osm for applications/editors/josm/plugins

Timestamp:

2016-07-02T00:03:27+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/tagging-preset-tester

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java (modified) (2 diffs)

applications/editors/josm/plugins/tagging-preset-tester/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="[josm_tagging_preset_tester] #josm10288: fix NPE when starting without map"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8863"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -53 +54 @@
             return;
         Collection<OsmPrimitive> x;
-        if (Main.main!=null && Main.main.hasEditLayer()) {
-            x = Main.main.getCurrentDataSet().getSelected();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            x = ds.getSelected();
         } else {
             x = makeFakeSuitablePrimitive(preset);