Changeset 13845 in josm for trunk/src

Timestamp:

2018-05-26T17:53:54+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16321, see #10047 - mapcss metadata is required

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MapPaintStyles.java (modified) (1 diff)
• StyleSource.java (modified) (1 diff)
• mapcss/MapCSSStyleSource.java (modified) (3 diffs)

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

@@ -315 +315 @@
             if (source.active) {
                 loadStyleForFirstTime(source);
+            } else {
+                source.loadStyleSource(true);
             }
         }

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

@@ -101 +101 @@
 
     /**
+     * Loads the complete style source.
+     */
+    public void loadStyleSource() {
+        loadStyleSource(false);
+    }
+
+    /**
      * Loads the style source.
-     */
-    public abstract void loadStyleSource();
+     * @param metadataOnly if {@code true}, only metadata are loaded
+     * @since 13845
+     */
+    public abstract void loadStyleSource(boolean metadataOnly);
 
     /**

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

@@ -413 +413 @@
 
     @Override
-    public void loadStyleSource() {
+    public void loadStyleSource(boolean metadataOnly) {
         STYLE_SOURCE_LOCK.writeLock().lock();
         try {
@@ -436 +436 @@
 
                     loadMeta();
-                    loadCanvas();
-                    loadSettings();
+                    if (!metadataOnly) {
+                        loadCanvas();
+                        loadSettings();
+                    }
                     // remove "areaStyle" pseudo classes intended only for validator (causes StackOverflowError otherwise)
                     removeAreaStyleClasses();
@@ -455 +457 @@
                 Logging.error(e);
                 logError(new ParseException(e.getMessage())); // allow e to be garbage collected, it links to the entire token stream
+            }
+            if (metadataOnly) {
+                return;
             }
             // optimization: filter rules for different primitive types