Changeset 13901 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-06-08T22:43:20+02:00 (6 years ago)

Author:

Don-vip

Message:

add new XmlUtils class with more "safe factories" methods

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/CustomConfigurator.java (modified) (6 diffs)
• oauth/TestAccessTokenTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -35 +35 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
@@ -53 +52 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.XmlUtils;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -228 +228 @@
         try {
             String toXML = Main.pref.toXML(true);
-            DocumentBuilder builder = Utils.newSafeDOMBuilder();
+            DocumentBuilder builder = XmlUtils.newSafeDOMBuilder();
             document = builder.parse(new ByteArrayInputStream(toXML.getBytes(StandardCharsets.UTF_8)));
             exportDocument = builder.newDocument();
@@ -258 +258 @@
             }
             File f = new File(filename);
-            Transformer ts = TransformerFactory.newInstance().newTransformer();
+            Transformer ts = XmlUtils.newSafeTransformerFactory().newTransformer();
             ts.setOutputProperty(OutputKeys.INDENT, "yes");
             ts.transform(new DOMSource(exportDocument), new StreamResult(f.toURI().getPath()));
@@ -406 +406 @@
         public void openAndReadXML(InputStream is) {
             try {
-                Document document = Utils.parseSafeDOM(is);
+                Document document = XmlUtils.parseSafeDOM(is);
                 synchronized (CustomConfigurator.class) {
                     processXML(document);
@@ -681 +681 @@
             Preferences tmpPref = new Preferences();
             try {
-                Transformer xformer = TransformerFactory.newInstance().newTransformer();
+                Transformer xformer = XmlUtils.newSafeTransformerFactory().newTransformer();
                 CharArrayWriter outputWriter = new CharArrayWriter(8192);
                 StreamResult out = new StreamResult(outputWriter);

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -27 +27 @@
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.XmlParsingException;
+import org.openstreetmap.josm.tools.XmlUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -124 +125 @@
                 throw new OsmApiException(connection.getResponse().getResponseCode(),
                         connection.getResponse().getHeaderField("Error"), null);
-            Document d = Utils.parseSafeDOM(connection.getResponse().getContent());
+            Document d = XmlUtils.parseSafeDOM(connection.getResponse().getContent());
             return OsmServerUserInfoReader.buildFromXML(d);
         } catch (SAXException | ParserConfigurationException e) {