Changeset 8956 in josm for trunk/src/org

Timestamp:

2015-10-27T18:46:56+01:00 (9 years ago)

Author:

simon04

Message:

fix #12009 - Preserve filename for conversion GPX -> OSM -> GPX

Regression from r8830.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -30 +30 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -745 +746 @@
             final GpxData data = toGpxData();
             final GpxLayer gpxLayer = new GpxLayer(data, tr("Converted from: {0}", getName()));
-            gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), getAssociatedFile().getName() + ".gpx"));
+            final String filename = getAssociatedFile().getName().replaceAll(Pattern.quote(".gpx.osm") + "$", "") + ".gpx";
+            gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename));
             Main.main.addLayer(gpxLayer);
             if (Main.pref.getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {