Changeset 4726 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-12-27T18:25:55+01:00 (13 years ago)

Author:

jttt

Message:

Fix exception handling (xml file not valid against xsd can't cause RuntimeException, see #6795), remove unused inner class

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -306 +306 @@
      * All data sources of this DataSet.
      */
-    public Collection<DataSource> dataSources = new LinkedList<DataSource>();
+    public final Collection<DataSource> dataSources = new LinkedList<DataSource>();
 
     /**

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.io.Reader;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -15 +15 @@
 import java.util.Stack;
 
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -23 +24 @@
 
 import org.openstreetmap.josm.io.MirroredInputStream;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -89 +89 @@
 
     public static final String lang = LanguageInfo.getLanguageCodeXML();
-    public static class Uniform<T> implements Iterable<T>{
-        private Iterator<Object> iterator;
-        /**
-         * @param klass This has to be specified since generics are erased from
-         * class files so the JVM cannot deduce T itself.
-         */
-        public Uniform(Reader input, String tagname, Class<T> klass) {
-            XmlObjectParser parser = new XmlObjectParser();
-            parser.map(tagname, klass);
-            parser.start(input);
-            iterator = parser.iterator();
-        }
-        public Iterator<T> iterator() {
-            return new Iterator<T>(){
-                public boolean hasNext() {return iterator.hasNext();}
-                @SuppressWarnings("unchecked") public T next() {return (T)iterator.next();}
-                public void remove() {iterator.remove();}
-            };
-        }
-    }
 
     private static class AddNamespaceFilter extends XMLFilterImpl {
@@ -204 +184 @@
                     {
                         String locfieldName = "locale_" +
-                        fieldName.substring(lang.length());
+                                fieldName.substring(lang.length());
                         try {
                             f = c.getClass().getField(locfieldName);
@@ -285 +265 @@
     }
 
-    private Iterable<Object> start(final Reader in, final ContentHandler contentHandler) {
+    private Iterable<Object> start(final Reader in, final ContentHandler contentHandler) throws SAXException, IOException {
         try {
             SAXParserFactory parserFactory = SAXParserFactory.newInstance();
@@ -293 +273 @@
             reader.setContentHandler(contentHandler);
             reader.parse(new InputSource(in));
-        } catch (Exception e) {
+            queueIterator = queue.iterator();
+            return this;
+        } catch (ParserConfigurationException e) {
+            // This should never happen ;-)
             throw new RuntimeException(e);
         }
-        queueIterator = queue.iterator();
-        return this;
-    }
-
-    public Iterable<Object> start(final Reader in) {
-        return start(in, parser);
+    }
+
+    public Iterable<Object> start(final Reader in) throws SAXException {
+        try {
+            return start(in, parser);
+        } catch (IOException e) {
+            throw new SAXException(e);
+        }
     }