Changeset 33243 in osm for applications/editors/josm/plugins/o5m/src/org

Timestamp:

2017-04-15T16:52:41+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 11919

File:

• applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java (modified) (5 diffs)

applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -30 +31 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-
 
 /**
@@ -132 +131 @@
                 readFile();
                 if (discourageUpload)
-                    ds.setUploadDiscouraged(true);
+                    ds.setUploadPolicy(UploadPolicy.DISCOURAGED);
             } catch (IOException e) {
                 e.printStackTrace();
@@ -716 +715 @@
         }
         CheckParameterUtil.ensureParameterNotNull(source, "source");
-
-        O5mReader reader = new O5mReader(source);
-        
+        return new O5mReader(source).doParseDataSet(source, progressMonitor);
+    }
+
+    @Override
+    protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor)
+            throws IllegalDataException {
         try {
             progressMonitor.beginTask(tr("Prepare OSM data...", 2));
             progressMonitor.indeterminateSubTask(tr("Reading OSM data..."));
 
-            reader.parse();
+            parse();
             progressMonitor.worked(1);
 
             progressMonitor.indeterminateSubTask(tr("Preparing data set..."));
-            reader.prepareDataSet();
+            prepareDataSet();
             progressMonitor.worked(1);
-            return reader.getDataSet();
+            return getDataSet();
         } catch (IllegalDataException e) {
             throw e;
@@ -738 +740 @@
         }
     }
-
 }