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

Timestamp:

2010-10-16T22:08:17+02:00 (14 years ago)

Author:

stoecker

Message:

add XML checking for mappaint files

File:

• trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (5 diffs)

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

@@ -5 +5 @@
 
 import java.io.Reader;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -19 +20 @@
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.ValidatorHandler;
+
+import org.openstreetmap.josm.io.MirroredInputStream;
 
 import org.xml.sax.Attributes;
@@ -276 +280 @@
 
     private Map<String, Entry> mapping = new HashMap<String, Entry>();
-    private Parser parser;
+    private DefaultHandler parser;
 
     /**
@@ -297 +301 @@
     public XmlObjectParser() {
         parser = new Parser();
+    }
+
+    public XmlObjectParser(DefaultHandler handler) {
+        parser = handler;
     }
 
@@ -328 +336 @@
     }
 
-    public Iterable<Object> startWithValidation(final Reader in, String namespace, Source schemaSource) throws SAXException {
-        SchemaFactory factory =  SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
-        Schema schema = factory.newSchema(schemaSource);
-        ValidatorHandler validator = schema.newValidatorHandler();
-        validator.setContentHandler(parser);
-        validator.setErrorHandler(parser);
-
-        AddNamespaceFilter filter = new AddNamespaceFilter(namespace);
-        filter.setContentHandler(validator);
-
-        return start(in, filter);
+    public Iterable<Object> startWithValidation(final Reader in, String namespace, String schemaSource) throws SAXException {
+        try {
+            SchemaFactory factory =  SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
+            Schema schema = factory.newSchema(new StreamSource(new MirroredInputStream(schemaSource)));
+            ValidatorHandler validator = schema.newValidatorHandler();
+            validator.setContentHandler(parser);
+            validator.setErrorHandler(parser);
+
+            AddNamespaceFilter filter = new AddNamespaceFilter(namespace);
+            filter.setContentHandler(validator);
+            return start(in, filter);
+        } catch(IOException e) {
+            throw new SAXException(tr("Failed to load XML schema."), e);
+        }
     }