Changeset 28204 in osm for applications/editors

Timestamp:

2012-04-05T21:16:32+02:00 (13 years ago)

Author:

jttt

Message:

Improve "Drop existing path" option

Location:

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

Files:

• GPXLayerImportAction.java (modified) (2 diffs)
• data/EditGpxData.java (modified) (1 diff)

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

@@ -81 +81 @@
 
             JCheckBox dropFirst = new JCheckBox(tr("Drop existing path"));
+            dropFirst.setEnabled(!this.data.getTracks().isEmpty());
 
             panel.add(layerList);
@@ -99 +100 @@
             }
 
-            for (Object o : layerList.getSelectedValues()) {
-                GpxLayer gpx = (GpxLayer )o;
-                synchronized(importing) {
-                    this.data.load(gpx.data, dropFirst.isSelected());
+            if (dropFirst.isSelected()) {
+                this.data.getTracks().clear();
+            }
+            synchronized(importing) {
+                for (Object o : layerList.getSelectedValues()) {
+                    GpxLayer gpx = (GpxLayer )o;
+                    this.data.load(gpx.data);
                 }
             }

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

@@ -16 +16 @@
     private final List<WayPoint> waypoints = new ArrayList<WayPoint>();
 
-    public void load(GpxData data, boolean drop) {
-        if(drop)
-            tracks.clear();
+    public void load(GpxData data) {
         for (GpxTrack track: data.tracks) {
             tracks.add(new EditGpxTrack(track));