Changeset 3894 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

Timestamp:

2011-02-13T10:30:28+01:00 (13 years ago)

Author:

bastiK

Message:

integrate wireframe into mappaint dialog; rename 'shortdescription' to 'title' (xml header key is unchanged)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

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

@@ -41 +41 @@
     @Override
     public void loadStyleSource() {
+        init();
         rules.clear();
-        clearErrors();
         try {
             MapCSSParser parser = new MapCSSParser(getSourceInputStream(), "UTF-8");
@@ -100 +100 @@
         }
         Cascade c = mc.getCascade("default");
-        String sd = c.get("title", null, String.class);
-        if (sd != null) {
-            this.shortdescription = sd;
+        String pTitle = c.get("title", null, String.class);
+        if (title == null) {
+            title = pTitle;
+        }
+        String pIcon = c.get("icon", null, String.class);
+        if (icon == null) {
+            icon = pIcon;
         }
     }