Changeset 3863 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.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/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -42 +42 @@
     public void loadStyleSource() {
         rules.clear();
-        hasError = false;
+        clearErrors();
         try {
-            MirroredInputStream in = new MirroredInputStream(url);
-            InputStream zip = in.getZipEntry("mapcss", "style");
-            InputStream input;
-            if (zip != null) {
-                input = zip;
-                zipIcons = in.getFile();
-            } else {
-                input = in;
-                zipIcons = null;
-            }
-            MapCSSParser parser = new MapCSSParser(input, "UTF-8");
+            MapCSSParser parser = new MapCSSParser(getSourceInputStream(), "UTF-8");
             parser.sheet(this);
             loadMeta();
@@ -60 +50 @@
             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 (TokenMgrError 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);
         } catch (ParseException 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("mapcss", "style");
+        if (zip != null) {
+            zipIcons = in.getFile();
+            return zip;
+        } else {
+            zipIcons = null;
+            return in;
         }
     }