Changeset 4757 in josm

Timestamp:

Jan 1, 2012 1:17:54 PM (17 months ago)

Author:

stoecker

Message:

i18n update

Location:

trunk

Files:

• data/da.lang (modified) (previous)
• data/el.lang (modified) (previous)
• data/es.lang (modified) (previous)
• data/fr.lang (modified) (previous)
• data/ja.lang (modified) (previous)
• data/pl.lang (modified) (previous)
• src/org/openstreetmap/josm/io/GpxImporter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/GpxImporter.java

@@ -24 +24 @@
 public class GpxImporter extends FileImporter {
 
-    protected GpxLayer gpxLayer;
-    protected MarkerLayer markerLayer;
-    protected Runnable postLayerTask;
+    protected class GpxImporterData {
+        public GpxLayer gpxLayer;
+        public MarkerLayer markerLayer;
+        public Runnable postLayerTask;
+    }
 
     public GpxImporter() {
@@ -40 +42 @@
         }
         String fileName = file.getName();
-        loadLayers(is, file, fileName, tr("Markers from {0}", fileName), progressMonitor);
+        final GpxImporterData data = loadLayers(is, file, fileName, tr("Markers from {0}", fileName), progressMonitor);
 
         final GpxLayer gpxLayer = this.gpxLayer;
@@ -49 +51 @@
         GuiHelper.runInEDT(new Runnable() {
             public void run() {
-                if (markerLayer != null) {
-                    Main.main.addLayer(markerLayer);
+                if (data.markerLayer != null) {
+                    Main.main.addLayer(data.markerLayer);
                 }
-                if (gpxLayer != null) {
-                    Main.main.addLayer(gpxLayer);
+                if (data.gpxLayer != null) {
+                    Main.main.addLayer(data.gpxLayer);
                 }
-                postLayerTask.run();
+                data.postLayerTask.run();
             }
         });
     }
 
-    public void loadLayers(InputStream is, final File associatedFile,
+    public GpxImporterData loadLayers(InputStream is, final File associatedFile,
                     final String gpxLayerName, String markerLayerName, ProgressMonitor progressMonitor) throws IOException {
+        final GpxImporterData data = new GpxImporterData();
         try {
             final GpxReader r = new GpxReader(is);
@@ -67 +70 @@
             r.data.storageFile = associatedFile;
             if (r.data.hasRoutePoints() || r.data.hasTrackPoints()) {
-                gpxLayer = new GpxLayer(r.data, gpxLayerName, associatedFile != null);
+                data.gpxLayer = new GpxLayer(r.data, gpxLayerName, associatedFile != null);
             }
             if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) {
-                markerLayer = new MarkerLayer(r.data, markerLayerName, associatedFile, gpxLayer, false);
-                if (markerLayer.data.size() == 0) {
-                    markerLayer = null;
+                data.markerLayer = new MarkerLayer(r.data, markerLayerName, associatedFile, data.gpxLayer, false);
+                if (data.markerLayer.data.size() == 0) {
+                    data.markerLayer = null;
                 }
             }
-            postLayerTask = new Runnable() {
+            data.postLayerTask = new Runnable() {
                 @Override
                 public void run() {
-                    if (markerLayer != null) {
-                        markerLayer.addMouseHandler();
+                    if (data.markerLayer != null) {
+                        data.markerLayer.addMouseHandler();
                     }
                     if (!parsedProperly) {
@@ -98 +101 @@
             throw new IOException(tr("Parsing data for layer ''{0}'' failed", gpxLayerName));
         }
-    }
-
-    public GpxLayer getGpxLayer() {
-        return gpxLayer;
-    }
-
-    public MarkerLayer getMarkerLayer() {
-        return markerLayer;
-    }
-
-    public Runnable getPostLayerTask() {
-        return postLayerTask;
+        return data;
     }
 }