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

Timestamp:

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

Author:

stoecker

Message:

add XML checking for mappaint files

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/MapPaintStyles.java (modified) (3 diffs)
• tagging/TaggingPreset.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.Collections;
@@ -16 +17 @@
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.xml.sax.InputSource;
+import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
+import org.xml.sax.SAXParseException;
 
 public class MapPaintStyles {
@@ -86 +86 @@
                     a = new String[] { null, file };
                 }
-                XMLReader xmlReader = XMLReaderFactory.createXMLReader();
-                ElemStyleHandler handler = new ElemStyleHandler(a[0]);
-                xmlReader.setContentHandler(handler);
-                xmlReader.setErrorHandler(handler);
+                XmlObjectParser parser = new XmlObjectParser(new ElemStyleHandler(a[0]));
                 MirroredInputStream in = new MirroredInputStream(a[1]);
                 InputStream zip = in.getZipEntry("xml","style");
+                InputStreamReader ins;
                 if(zip != null)
                 {
                     zipIcons = in.getFile();
-                    xmlReader.parse(new InputSource(zip));
+                    ins = new InputStreamReader(zip);
                 } else {
-                    xmlReader.parse(new InputSource(in));
+                    ins = new InputStreamReader(in);
+                }
+                parser.startWithValidation(ins, "http://josm.openstreetmap.de/mappaint-styöe-1.0",
+                "resource://data/mappaint-style.xsd");
+                while(parser.hasNext()) {
                 }
             } catch(IOException e) {
                 System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
                 e.printStackTrace();
+            } catch(SAXParseException e) {
+                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", a[1], e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
+                e.printStackTrace();
             } catch(SAXException e) {
-                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
+                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", a[1], e.getMessage()));
                 e.printStackTrace();
             }

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -40 +40 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import javax.xml.transform.stream.StreamSource;
 
 import org.openstreetmap.josm.Main;
@@ -749 +748 @@
 
         if (validate) {
-            parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", new StreamSource(TaggingPreset.class.getResourceAsStream("/data/tagging-preset.xsd")));
+            parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
         } else {
             parser.start(in);