Changeset 32510 in osm for applications/editors/josm/plugins/tracer

Timestamp:

2016-07-02T00:04:39+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/tracer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/tracer/TracerAction.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="commit.message" value="Tracer plugin can load at runtime"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10279"/>
     <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java

@@ -53 +53 @@
             // bude se node slucovat s jinym?
             double minDistanceSq = MIN_DISTANCE;
-            List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(bbox);
+            List<Node> nodes = Main.getLayerManager().getEditDataSet().searchNodes(bbox);
             Node nearestNode = null;
             for (Node nn : nodes) {
@@ -133 +133 @@
         // node nebyl slouceny s jinym
         // hledani pripadne blizke usecky, kam bod pridat
-        List<Way> ways = Main.main.getCurrentDataSet().searchWays(bbox);
+        List<Way> ways = Main.getLayerManager().getEditDataSet().searchWays(bbox);
         double minDist = Double.MAX_VALUE;
         Way nearestWay = null;
@@ -190 +190 @@
             double minDistanceSq = MIN_DISTANCE_SQ;
             //double maxAngle = MAX_ANGLE;
-            List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
+            List<Node> nodes = Main.getLayerManager().getEditDataSet().searchNodes(new BBox(
                 Math.min(n1.getX(), n2.getX()) - minDistanceSq,
                 Math.min(n1.getY(), n2.getY()) - minDistanceSq,

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java

@@ -137 +137 @@
 
                 if (shift) {
-                    Main.main.getCurrentDataSet().addSelected(way);
+                    Main.getLayerManager().getEditDataSet().addSelected(way);
                 } else {
-                    Main.main.getCurrentDataSet().setSelected(way);
+                    Main.getLayerManager().getEditDataSet().setSelected(way);
                 }
             } else {