Changeset 1508 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-03-19T20:56:26+01:00 (16 years ago)

Author:

stoecker

Message:

close #273 - copy GPX name on convert - patch by xeen

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (1 diff)
• Layer.java (modified) (1 diff)
• OsmDataLayer.java (modified) (2 diffs)

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

@@ -669 +669 @@
                 }
             }
-            Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", GpxLayer.this.name), null));
+            Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", GpxLayer.this.name),
+                        data.storageFile));
             Main.main.removeLayer(GpxLayer.this);
         }

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

@@ -16 +16 @@
 
 /**
- * A layer encapsulates the gui componente of one dataset and its representation.
+ * A layer encapsulates the gui component of one dataset and its representation.
  *
- * Some layers may display data directly importet from OSM server. Other only
+ * Some layers may display data directly imported from OSM server. Other only
  * display background images. Some can be edited, some not. Some are static and
  * other changes dynamically (auto-updated).

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

@@ -382 +382 @@
     }
 
-    public static GpxData toGpxData(DataSet data) {
+    public static GpxData toGpxData(DataSet data, File file) {
         GpxData gpxData = new GpxData();
+        gpxData.storageFile = file;
         HashSet<Node> doneNodes = new HashSet<Node>();
         for (Way w : data.ways) {
@@ -433 +434 @@
 
     public GpxData toGpxData() {
-        return toGpxData(data);
+        return toGpxData(data, associatedFile);
     }