Changeset 28154 in osm for applications/editors

Timestamp:

2012-03-27T00:52:01+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] fix some bugs introduced in last update

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io

Files:

• NetworkReader.java (modified) (1 diff)
• archive/ZipReader.java (modified) (1 diff)
• tabular/CsvReader.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java

@@ -177 +177 @@
             throw new OsmTransferException(e);
         } finally {
-                if (instance != null) {
-                        instance.finishTask();
-                }
             progressMonitor.finishTask();
             try {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java

@@ -198 +198 @@
                                 }
                                 if (from != null) {
-                                        if (progressMonitor != null) {
-                                                instance.finishTask();
-                                        }
                                         ds = from;
                                 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReader.java

@@ -47 +47 @@
         public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
                 CsvHandler csvHandler = null;
-                if (handler.getSpreadSheetHandler() instanceof CsvHandler) {
+                if (handler != null && handler.getSpreadSheetHandler() instanceof CsvHandler) {
                         csvHandler = (CsvHandler) handler.getSpreadSheetHandler();
                 }