Changeset 3321 in josm for trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

Timestamp:

2010-06-08T21:56:38+02:00 (14 years ago)

Author:

jttt

Message:

Validate tagging presets when they're added in Preferences dialog

File:

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

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

@@ -16 +16 @@
 import java.util.concurrent.BlockingQueue;
 
+import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Source;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.ValidatorHandler;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
@@ -101 +109 @@
     }
 
+    private class AddNamespaceFilter extends XMLFilterImpl {
+
+        private final String namespace;
+
+        public AddNamespaceFilter(String namespace) {
+            this.namespace = namespace;
+        }
+
+        @Override
+        public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException {
+            if ("".equals(uri)) {
+                super.startElement(namespace, localName, qName, atts);
+            } else {
+                super.startElement(uri, localName, qName, atts);
+            }
+
+        }
+
+    }
+
     private class Parser extends DefaultHandler {
         Stack<Object> current = new Stack<Object>();
@@ -271 +299 @@
     }
 
-    public Iterable<Object> start(final Reader in) {
+    private Iterable<Object> start(final Reader in, final ContentHandler contentHandler) {
         new Thread("XML Reader"){
             @Override public void run() {
                 try {
-                    SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(in), parser);
+                    SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+                    parserFactory.setNamespaceAware(true);
+                    SAXParser parser = parserFactory.newSAXParser();
+                    XMLReader reader = parser.getXMLReader();
+                    reader.setContentHandler(contentHandler);
+                    reader.parse(new InputSource(in));
                 } catch (Exception e) {
                     try {
@@ -282 +315 @@
                     }
                 }
-                parser = null;
                 try {
                     queue.put(EOS);
@@ -290 +322 @@
         }.start();
         return this;
+    }
+
+    public Iterable<Object> start(final Reader in) {
+        return start(in, parser);
+    }
+
+    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);
     }