Changeset 3863 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

Timestamp:

2011-02-07T09:35:27+01:00 (13 years ago)

Author:

bastiK

Message:

extended mappaint style dialog

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -51 +51 @@
 
     protected void init() {
-        hasError = false;
+        clearErrors();
         icons.clear();
         lines.clear();
@@ -66 +66 @@
         init();
         try {
-            MirroredInputStream in = new MirroredInputStream(url);
-            InputStream zip = in.getZipEntry("xml", "style");
-            InputStreamReader reader = null;
-            if (zip != null) {
-                reader = new InputStreamReader(zip);
-                zipIcons = in.getFile();
-            } else {
-                reader = new InputStreamReader(in);
-                zipIcons = null;
-            }
-
+            InputStreamReader reader = new InputStreamReader(getSourceInputStream());
             XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
             parser.startWithValidation(reader,
@@ -87 +77 @@
             System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
             e.printStackTrace();
-            hasError = true;
+            logError(e);
         } catch(SAXParseException e) {
             System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", url, e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
             e.printStackTrace();
-            hasError = true;
+            logError(e);
         } catch(SAXException e) {
             System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
             e.printStackTrace();
-            hasError = true;
+            logError(e);
+        }
+    }
+
+    public InputStream getSourceInputStream() throws IOException {
+        MirroredInputStream in = new MirroredInputStream(url);
+        InputStream zip = in.getZipEntry("xml", "style");
+        if (zip != null) {
+            zipIcons = in.getFile();
+            return zip;
+        } else {
+            zipIcons = null;
+            return in;
         }
     }