Changeset 17530 in osm for applications/editors/josm/plugins/editgpx/src/org/openstreetmap

Timestamp:

2009-09-08T23:20:23+02:00 (15 years ago)

Author:

guggis

Message:

Replacing deprecated field access - update to JOSM r2082

Location:

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx

Files:

• EditGpxLayer.java (modified) (4 diffs)
• EditGpxMode.java (modified) (1 diff)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -112 +112 @@
         synchronized(layerImport.importing) {
             for(Node n: dataSet.nodes) {
-                if (!n.deleted) {
+                if (!n.isDeleted()) {
                     Point pnt = Main.map.mapView.getPoint(n.getEastNorth());
                     g.drawOval(pnt.x - 2, pnt.y - 2, 4, 4);
@@ -143 +143 @@
         //add all ways
         for (Way w : dataSet.ways) {
-            if (w.incomplete || w.deleted) continue;
+            if (w.incomplete || w.isDeleted()) continue;
             GpxTrack trk = new GpxTrack();
             gpxData.tracks.add(trk);
@@ -152 +152 @@
             ArrayList<WayPoint> trkseg = null;
             for (Node n : w.getNodes()) {
-                if (n.incomplete || n.deleted) {
+                if (n.incomplete || n.isDeleted()) {
                     trkseg = null;
                     continue;
@@ -179 +179 @@
         // add nodes as waypoints
         for (Node n : dataSet.nodes) {
-            if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
+            if (n.incomplete || n.isDeleted() || doneNodes.contains(n)) continue;
 
             Date tstamp = n.getTimestamp();

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

@@ -70 +70 @@
                 Point p = Main.map.mapView.getPoint(n);
                 if (r.contains(p)) {
-                    n.deleted = true; //only set as deleted. this makes reset to beginning possible
+                        n.setDeleted(true);
                 }
             }