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

Timestamp:

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

Author:

Don-vip

Message:

simplify/instrument SAX code

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

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));
+        }
+    }
 }