Changeset 10741 in josm

Timestamp:

2016-08-06T00:00:24+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11924 - XMLReaderFactory has been deprecated in Java 9, see ​https://bugs.openjdk.java.net/browse/JDK-8152912

Location:

trunk/src

Files:

• com/kitfox/svg/SVGUniverse.java (modified) (3 diffs)
• org/openstreetmap/josm/tools/ImageProvider.java (modified) (4 diffs)

trunk/src/com/kitfox/svg/SVGUniverse.java

@@ -63 +63 @@
 import javax.imageio.ImageIO;
 import javax.xml.bind.DatatypeConverter;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -68 +70 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
@@ -574 +575 @@
     }
 
-    private XMLReader getXMLReaderCached() throws SAXException
+    private XMLReader getXMLReaderCached() throws SAXException, ParserConfigurationException
     {
         if (cachedReader == null)
         {
-            cachedReader = XMLReaderFactory.createXMLReader();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            cachedReader = factory.newSAXParser().getXMLReader();
         }
         return cachedReader;

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

@@ -56 +56 @@
 import javax.swing.ImageIcon;
 import javax.xml.bind.DatatypeConverter;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.openstreetmap.josm.Main;
@@ -80 +81 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import com.kitfox.svg.SVGDiagram;
@@ -1216 +1216 @@
     private static String getImgUrlFromWikiInfoPage(final String base, final String fn) {
         try {
-            final XMLReader parser = XMLReaderFactory.createXMLReader();
+            final XMLReader parser = Utils.newSafeSAXParser().getXMLReader();
             parser.setContentHandler(new DefaultHandler() {
                 @Override
@@ -1239 +1239 @@
             Main.trace(r);
             return r.getResult();
-        } catch (IOException | SAXException e) {
+        } catch (IOException | SAXException | ParserConfigurationException e) {
             Main.warn("Parsing " + base + fn + " failed:\n" + e);
             return null;