Changeset 27300 in osm

Timestamp:

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

Author:

donvip

Message:

JOSM PBF plugin: update to JOSM 4687

Location:

applications/editors/josm/plugins/pbf

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pbf/io/PbfImporter.java (modified) (2 diffs)

applications/editors/josm/plugins/pbf/build.xml

@@ -32 +32 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4574"/>
+    <property name="plugin.main.version" value="4687"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfImporter.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.pbf.io;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -38 +37 @@
         super(FILE_FILTER);
     }
+    
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.io.OsmImporter#parseDataSet(java.io.InputStream, org.openstreetmap.josm.gui.progress.ProgressMonitor)
+         */
+        @Override
+        protected DataSet parseDataSet(InputStream in, ProgressMonitor progressMonitor) throws IllegalDataException {
+                return PbfReader.parseDataSet(in, progressMonitor);
+        }
 
-    /* (non-Javadoc)
-     * @see org.openstreetmap.josm.io.OsmImporter#importData(java.io.InputStream, java.io.File)
-     */
-    @Override
-    protected void importData(InputStream in, File associatedFile) throws IllegalDataException {
-        final DataSet dataSet = PbfReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
-        final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
-        addDataLayer(dataSet, layer, associatedFile.getPath());
-    }
-    
         protected DataSet parseDataSet(final String source) throws IOException, SAXException, IllegalDataException {
-        return PbfReader.parseDataSet(new MirroredInputStream(source), NullProgressMonitor.INSTANCE);
+        return parseDataSet(new MirroredInputStream(source), NullProgressMonitor.INSTANCE);
         }
 }