Changeset 8347 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-05-11T13:50:25+02:00 (10 years ago)

Author:

Don-vip

Message:

simplify/instrument SAX code

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/download/PlaceSelection.java (modified) (1 diff)
• io/Capabilities.java (modified) (1 diff)
• io/DiffResultProcessor.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)
• io/NoteReader.java (modified) (1 diff)
• io/OsmChangesetContentParser.java (modified) (1 diff)
• io/OsmChangesetParser.java (modified) (1 diff)
• io/OsmHistoryReader.java (modified) (1 diff)
• io/imagery/ImageryReader.java (modified) (1 diff)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -379 +379 @@
                     InputSource inputSource = new InputSource(reader);
                     NameFinderResultParser parser = new NameFinderResultParser();
-                    Utils.newSafeSAXParser().parse(inputSource, parser);
+                    Utils.parseSafeSAX(inputSource, parser);
                     this.data = parser.getResult();
                 }

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

@@ -272 +272 @@
         public static Capabilities parse(InputSource inputSource) throws SAXException, IOException, ParserConfigurationException {
             CapabilitiesParser parser = new CapabilitiesParser();
-            Utils.newSafeSAXParser().parse(inputSource, parser);
+            Utils.parseSafeSAX(inputSource, parser);
             return parser.getCapabilities();
         }

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

@@ -84 +84 @@
             progressMonitor.beginTask(tr("Parsing response from server..."));
             InputSource inputSource = new InputSource(new StringReader(diffUploadResponse));
-            Utils.newSafeSAXParser().parse(inputSource, new Parser());
+            Utils.parseSafeSAX(inputSource, new Parser());
         } catch(XmlParsingException e) {
             throw e;

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

@@ -542 +542 @@
         Parser parser = new Parser();
         try {
-            Utils.newSafeSAXParser().parse(inputSource, parser);
+            Utils.parseSafeSAX(inputSource, parser);
             return true;
         } catch (SAXException e) {

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

@@ -222 +222 @@
         DefaultHandler parser = new Parser();
         try {
-            Utils.newSafeSAXParser().parse(inputSource, parser);
+            Utils.parseSafeSAX(inputSource, parser);
         } catch (ParserConfigurationException e) {
             Main.error(e); // broken SAXException chaining

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

@@ -151 +151 @@
             progressMonitor.beginTask("");
             progressMonitor.indeterminateSubTask(tr("Parsing changeset content ..."));
-            Utils.newSafeSAXParser().parse(source, new Parser());
+            Utils.parseSafeSAX(source, new Parser());
         } catch(XmlParsingException e) {
             throw e;

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

@@ -278 +278 @@
             progressMonitor.indeterminateSubTask(tr("Parsing list of changesets..."));
             InputSource inputSource = new InputSource(new InvalidXmlCharacterFilter(new InputStreamReader(source, StandardCharsets.UTF_8)));
-            Utils.newSafeSAXParser().parse(inputSource, parser.new Parser());
+            Utils.parseSafeSAX(inputSource, parser.new Parser());
             return parser.getChangesets();
         } catch(ParserConfigurationException | SAXException e) {

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

@@ -91 +91 @@
         progressMonitor.beginTask(tr("Parsing OSM history data ..."));
         try {
-            Utils.newSafeSAXParser().parse(inputSource, new Parser());
+            Utils.parseSafeSAX(inputSource, new Parser());
         } catch (ParserConfigurationException e) {
             Main.error(e); // broken SAXException chaining

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -57 +57 @@
                     .getInputStream()) {
                 InputSource is = new InputSource(UTFInputStreamReader.create(in));
-                Utils.newSafeSAXParser().parse(is, parser);
+                Utils.parseSafeSAX(is, parser);
                 return parser.entries;
             }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -59 +59 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -1227 +1229 @@
         return parserFactory.newSAXParser();
     }
+
+    /**
+     * Parse the content given {@link org.xml.sax.InputSource} as XML using the specified {@link org.xml.sax.helpers.DefaultHandler}.
+     * This method uses a secure SAX parser, supporting XML namespaces.
+     *
+     * @param is The InputSource containing the content to be parsed.
+     * @param dh The SAX DefaultHandler to use.
+     * @throws ParserConfigurationException if a parser cannot be created which satisfies the requested configuration.
+     * @throws SAXException for SAX errors.
+     * @throws IOException if any IO errors occur.
+     * @since 8347
+     */
+    public static void parseSafeSAX(InputSource is, DefaultHandler dh) throws ParserConfigurationException, SAXException, IOException {
+        long start = System.currentTimeMillis();
+        if (Main.isDebugEnabled()) {
+            Main.debug("Starting SAX parsing of "+is+" using "+dh);
+        }
+        newSafeSAXParser().parse(is, dh);
+        if (Main.isDebugEnabled()) {
+            Main.debug("SAX parsing done in " + getDurationString(System.currentTimeMillis()-start));
+        }
+    }
 }