Changeset 13815 in josm for trunk/src

Timestamp:

2018-05-22T00:45:56+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #10047 - Initialize only active mappaint styles

Location:

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

Files:

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

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

@@ -313 +313 @@
         }
         for (StyleSource source : styles.getStyleSources()) {
-            loadStyleForFirstTime(source);
+            if (source.active) {
+                loadStyleForFirstTime(source);
+            }
         }
         fireMapPaintSylesUpdated();
@@ -406 +408 @@
             StyleSource s = data.get(p);
             s.active = !s.active;
+            if (s.active && !s.isLoaded()) {
+                loadStyleForFirstTime(s);
+            }
         }
         MapPaintPrefHelper.INSTANCE.put(data);

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

@@ -39 +39 @@
     private final List<Throwable> errors = new CopyOnWriteArrayList<>();
     private final Set<String> warnings = new CopyOnWriteArraySet<>();
+    protected boolean loaded;
+
     /**
      * The zip file containing the icons for this style
@@ -257 +259 @@
         return null;
     }
+
+    /**
+     * Determines if the style has been loaded (initialized).
+     * @return {@code true} if the style has been loaded
+     * @since 13815
+     */
+    public final boolean isLoaded() {
+        return loaded;
+    }
 }

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

@@ -507 +507 @@
             multipolygonRules.initIndex();
             canvasRules.initIndex();
+            loaded = true;
         } finally {
             STYLE_SOURCE_LOCK.writeLock().unlock();