Changeset 11919 in josm for trunk

Timestamp:

2017-04-15T16:42:23+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14653 - refactor AbstractReader

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• AbstractReader.java (modified) (3 diffs)
• OsmReader.java (modified) (1 diff)
• OverpassDownloadReader.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23 +24 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
 /**
@@ -202 +204 @@
         }
     }
+
+    protected abstract DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException;
 }

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

@@ -585 +585 @@
     }
 
+    @Override
     protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
         if (progressMonitor == null) {

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

@@ -99 +99 @@
     static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL);
 
-    static final Map<OverpassOutpoutFormat, Class<? extends OsmReader>> outputFormatReaders = new ConcurrentHashMap<>();
+    static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> outputFormatReaders = new ConcurrentHashMap<>();
 
     final String overpassServer;
@@ -123 +123 @@
      * @return the previous value associated with {@code format}, or {@code null} if there was no mapping
      */
-    public static final Class<? extends OsmReader> registerOverpassOutpoutFormatReader(
-            OverpassOutpoutFormat format, Class<? extends OsmReader> readerClass) {
+    public static final Class<? extends AbstractReader> registerOverpassOutpoutFormatReader(
+            OverpassOutpoutFormat format, Class<? extends AbstractReader> readerClass) {
         return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass));
     }
@@ -230 +230 @@
     @Override
     protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
-        OsmReader reader = null;
+        AbstractReader reader = null;
         Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery);
         if (m.matches()) {
-            Class<? extends OsmReader> readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1)));
+            Class<? extends AbstractReader> readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1)));
             if (readerClass != null) {
                 try {