Changeset 11366 in josm for trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

Timestamp:

2016-12-08T00:54:43+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - SIC_INNER_SHOULD_BE_STATIC_ANON

File:

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

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

@@ -33 +33 @@
  */
 public class OverpassDownloadReader extends BoundingBoxDownloader {
+
+    static final class OverpassOsmReader extends OsmReader {
+        @Override
+        protected void parseUnknown(boolean printWarning) throws XMLStreamException {
+            if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
+                final String text = parser.getElementText();
+                if (text.contains("runtime error")) {
+                    throw new XMLStreamException(text);
+                }
+            }
+            super.parseUnknown(printWarning);
+        }
+    }
 
     final String overpassServer;
@@ -148 +161 @@
     @Override
     protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
-        return new OsmReader() {
-            @Override
-            protected void parseUnknown(boolean printWarning) throws XMLStreamException {
-                if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
-                    final String text = parser.getElementText();
-                    if (text.contains("runtime error")) {
-                        throw new XMLStreamException(text);
-                    }
-                }
-                super.parseUnknown(printWarning);
-            }
-        }.doParseDataSet(source, progressMonitor);
+        return new OverpassOsmReader().doParseDataSet(source, progressMonitor);
     }