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

Timestamp:

2012-01-18T15:39:14+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #7281 - compile error

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (1 diff)
• OsmImporter.java (modified) (3 diffs)
• session/OsmDataSessionImporter.java (modified) (1 diff)

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

@@ -194 +194 @@
                 System.err.println(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
                         capabilities.get("version", "minimum"), capabilities.get("version", "maximum")));
-                initialized = false; // FIXME get's overridden by next assignment
+                initialized = false; // FIXME gets overridden by next assignment
             }
             initialized = true;

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

@@ -22 +22 @@
 public class OsmImporter extends FileImporter {
 
-    protected class OsmImporterData {
-        public OsmDataLayer layer;
-        public Runnable postLayerTask;
+    public static class OsmImporterData {
+
+        private OsmDataLayer layer;
+        private Runnable postLayerTask;
+
+        public OsmImporterData(OsmDataLayer layer, Runnable postLayerTask) {
+            this.layer = layer;
+            this.postLayerTask = postLayerTask;
+        }
+
+        public OsmDataLayer getLayer() {
+            return layer;
+        }
+
+        public Runnable getPostLayerTask() {
+            return postLayerTask;
+        }
     }
 
@@ -47 +61 @@
 
     protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
-        final OsmImporterData data = loadLayer(in, associatedFile, 
+        final OsmImporterData data = loadLayer(in, associatedFile,
                 associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), NullProgressMonitor.INSTANCE);
 
@@ -70 +84 @@
             throw new IllegalDataException(tr("Invalid dataset"));
         }
-        OsmImporterData data = new OsmImporterData();
-        data.layer = createLayer(dataSet, associatedFile, layerName);
-        data.postLayerTask = createPostLayerTask(dataSet, associatedFile, layerName, data.layer);
-        return data;
+        OsmDataLayer layer = createLayer(dataSet, associatedFile, layerName);
+        Runnable postLayerTask = createPostLayerTask(dataSet, associatedFile, layerName, layer);
+        return new OsmImporterData(layer, postLayerTask);
     }
-    
+
     protected DataSet parseDataSet(InputStream in, ProgressMonitor progressMonitor) throws IllegalDataException {
         return OsmReader.parseDataSet(in, progressMonitor);
     }
-    
+
     protected OsmDataLayer createLayer(final DataSet dataSet, final File associatedFile, final String layerName) {
         return new OsmDataLayer(dataSet, layerName, associatedFile);
     }
-    
+
     protected Runnable createPostLayerTask(final DataSet dataSet, final File associatedFile, final String layerName, final OsmDataLayer layer) {
         return new Runnable() {

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java

@@ -40 +40 @@
             OsmImporter importer = new OsmImporter();
             InputStream in = support.getInputStream(fileStr);
-            importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
+            OsmImporter.OsmImporterData importData = importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
 
-            support.addPostLayersTask(importer.getPostLayerTask());
-            return importer.getLayer();
+            support.addPostLayersTask(importData.getPostLayerTask());
+            return importData.getLayer();
 
         } catch (XPathExpressionException e) {