Changeset 29222 in osm for applications/editors/josm/plugins/DirectDownload

Timestamp:

2013-01-31T14:39:51+01:00 (13 years ago)

Author:

bastik

Message:

adapt to changes in JOSM core ([josm5679] and [josm5681])

Location:

applications/editors/josm/plugins/DirectDownload

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (modified) (1 diff)

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

@@ -32 +32 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="5679"/>
     <!--
       ************************************************

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

@@ -65 +65 @@
                     GpxReader r = new GpxReader(is);
                     boolean parsedProperly = r.parse(true);
-                    GpxLayer gpxLayer = new GpxLayer(r.data, track.filename, true);
+                    GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), track.filename, true);
 
-                    if (r.data.hasRoutePoints() || r.data.hasTrackPoints()) {
+                    if (r.getGpxData().hasRoutePoints() || r.getGpxData().hasTrackPoints()) {
                         Main.main.addLayer(gpxLayer);
                     }
 
-                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) {
-                        MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", track.filename), null, gpxLayer);
+                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.getGpxData().waypoints.isEmpty()) {
+                        MarkerLayer ml = new MarkerLayer(r.getGpxData(), tr("Markers from {0}", track.filename), null, gpxLayer);
                         if (ml.data.size() > 0) {
                             Main.main.addLayer(ml);