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

Timestamp:

2011-12-21T20:17:44+01:00 (13 years ago)

Author:

Don-vip

Message:

fix layer name creation of layers without associated files + allow plugins to reuse code portions of loadLayer()

File:

• trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified) (2 diffs)

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

@@ -45 +45 @@
 
     protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
-        loadLayer(in, associatedFile, associatedFile.getName(), NullProgressMonitor.INSTANCE);
+        loadLayer(in, associatedFile, associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), NullProgressMonitor.INSTANCE);
         // FIXME: remove UI stuff from IO subsystem
         Runnable uiStuff = new Runnable() {
@@ -68 +68 @@
     public void loadLayer(InputStream in, final File associatedFile, final String layerName, ProgressMonitor progressMonitor) throws IllegalDataException {
         final DataSet dataSet = OsmReader.parseDataSet(in, progressMonitor);
-        String name = associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName();
-        layer = new OsmDataLayer(dataSet, layerName, associatedFile);
-        postLayerTask = new Runnable() {
+        layer = createLayer(dataSet, associatedFile, layerName);
+        postLayerTask = createPostLayerTask(dataSet, associatedFile, layerName);
+    }
+    
+    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) {
+        return new Runnable() {
             @Override
             public void run() {