Changeset 4770 in josm

Timestamp:

Jan 8, 2012 3:46:23 PM (17 months ago)

Author:

bastiK

Message:

change validation method. this should work around the java bug (see #7206)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -37 +37 @@
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
-import javax.xml.parsers.SAXParserFactory;
+import javax.xml.XMLConstants;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
@@ -1430 +1429 @@
 
     public void validateXML(Reader in) throws Exception {
-        SchemaFactory factory =  SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
+        SchemaFactory factory =  SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         Schema schema = factory.newSchema(new StreamSource(new MirroredInputStream("resource://data/preferences.xsd")));
-        XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(in);
         Validator validator = schema.newValidator();
-        validator.validate(new StAXSource(parser));
+        validator.validate(new StreamSource(in));
     }