WIP

Author: mstr2

modules/javafx.graphics/src/main/java/com/sun/javafx/application/ThemeHelper.java

@@ -48,11 +48,11 @@ public static void setAccessor(Accessor accessor) {
     }
 
     public interface Accessor {
-        void platformThemeChanged(Theme theme, Map<String, String> changedProperties);
+        void platformThemeChanged(Map<String, String> changedProperties);
     }
 
-    public static void platformThemeChanged(Theme theme, Map<String, String> changedProperties) {
-        accessor.platformThemeChanged(theme, changedProperties);
+    public static void platformThemeChanged(Map<String, String> changedProperties) {
+        accessor.platformThemeChanged(changedProperties);
     }
 
     public static Theme tryResolve(String uri) {

modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java

@@ -27,7 +27,6 @@
 
 import com.sun.javafx.application.ThemeHelper;
 import javafx.application.ConditionalFeature;
-import javafx.application.Theme;
 import javafx.geometry.Dimension2D;
 import javafx.scene.image.Image;
 import javafx.scene.image.PixelBuffer;
@@ -368,10 +367,7 @@ void runToolkit() {
                 }
 
                 @Override public void handlePlatformThemeChanged(Map<String, String> properties) {
-                    Theme currentTheme = PlatformImpl.getCurrentTheme();
-                    if (currentTheme != null) {
-                        ThemeHelper.platformThemeChanged(currentTheme, properties);
-                    }
+                    ThemeHelper.platformThemeChanged(properties);
                 }
             });
         }

modules/javafx.graphics/src/main/java/javafx/application/Theme.java

@@ -32,7 +32,14 @@
 import javafx.collections.ObservableList;
 
 import java.lang.ref.WeakReference;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 
 import static com.sun.javafx.application.ThemeHelper.THEME_INSTANCE_SCHEME;
 
@@ -127,44 +134,31 @@ public abstract class Theme {
     static {
         ThemeHelper.setAccessor(new ThemeHelper.Accessor() {
             @Override
-            public void platformThemeChanged(Theme theme, Map<String, String> properties) {
-                theme.handlePlatformThemeChanged(properties);
+            public void platformThemeChanged(Map<String, String> properties) {
+                Iterator<WeakReference<Theme>> it = instances.iterator();
+                while (it.hasNext()) {
+                    Theme theme = it.next().get();
+                    if (theme != null) {
+                        theme.handlePlatformThemeChanged(properties);
+                    } else {
+                        it.remove();
+                    }
+                }
             }
         });
     }
 
     private static final Set<WeakReference<Theme>> instances = new HashSet<>();
 
-    private final Theme baseTheme;
-    private Map<String, String> properties;
-    private Map<String, String> propertiesUnmodifiable;
-    private String url;
+    private final String url = getClass().getName() + ":" + UUID.randomUUID();
+    private Map<String, String> properties = Toolkit.getToolkit().getPlatformThemeProperties();
+    private Map<String, String> propertiesUnmodifiable = Collections.unmodifiableMap(properties);
 
     /**
      * Creates a new {@code Theme} instance.
      */
     protected Theme() {
-        this.baseTheme = null;
-        this.properties = Toolkit.getToolkit().getPlatformThemeProperties();
-        this.propertiesUnmodifiable = Collections.unmodifiableMap(properties);
-    }
-
-    /**
-     * Creates a new {@code Theme} instance that extends the specified base theme.
-     * <p>
-     * Sub-classes should implement {@link #getStylesheets()} by returning a concatenation
-     * of the base theme's stylesheets with additional extended stylesheets.
-     *
-     * @param baseTheme the base theme
-     */
-    protected Theme(Theme baseTheme) {
-        if (baseTheme == null) {
-            throw new NullPointerException("baseTheme cannot be null");
-        }
-
-        this.baseTheme = baseTheme;
-        this.properties = baseTheme.properties;
-        this.propertiesUnmodifiable = baseTheme.propertiesUnmodifiable;
+        instances.add(new WeakReference<>(this));
     }
 
     /**
@@ -214,15 +208,6 @@ public static Theme of(String... stylesheets) {
             FXCollections.observableArrayList(stylesheets) : null);
     }
 
-    /**
-     * Gets the base theme that is extended by this theme.
-     *
-     * @return the base theme, or {@code null} if this theme has no base theme
-     */
-    protected final Theme getBaseTheme() {
-        return baseTheme;
-    }
-
     /**
      * The list of stylesheets that comprise this theme.
      * <p>
@@ -251,13 +236,8 @@ private void handlePlatformThemeChanged(Map<String, String> properties) {
         changed.keySet().removeIf(key -> Objects.equals(properties.get(key), this.properties.get(key)));
 
         if (!changed.isEmpty()) {
-            this.properties = new HashMap<>(properties);
+            this.properties = properties;
             this.propertiesUnmodifiable = Collections.unmodifiableMap(this.properties);
-
-            if (baseTheme != null) {
-                baseTheme.platformThemeChanged(changed);
-            }
-
             platformThemeChanged(changed);
         }
     }
@@ -285,15 +265,6 @@ protected final Map<String, String> getPlatformThemeProperties() {
      * @return the URL that corresponds to this {@code Theme} instance.
      */
     public final String toURL() {
-        if (url == null) {
-            url = getClass().getName() + ":" + UUID.randomUUID();
-
-            synchronized (instances) {
-                instances.removeIf(ref -> ref.get() == null);
-                instances.add(new WeakReference<>(this));
-            }
-        }
-
         return THEME_INSTANCE_SCHEME + url;
     }
 
@@ -318,12 +289,10 @@ public static Theme fromURL(String url) {
 
         url = url.substring(15);
 
-        synchronized (instances) {
-            for (var instance : instances) {
-                Theme theme = instance.get();
-                if (theme != null && theme.url.equals(url)) {
-                    return theme;
-                }
+        for (var instance : instances) {
+            Theme theme = instance.get();
+            if (theme != null && theme.url.equals(url)) {
+                return theme;
             }
         }
 
@@ -344,20 +313,20 @@ public ObservableList<String> getStylesheets() {
     }
 
     private static class ExtensionTheme extends Theme {
+        final Theme baseTheme;
         final ObservableList<String> allStylesheets;
 
         ExtensionTheme(Theme baseTheme, ObservableList<String> additionalStylesheets) {
-            super(baseTheme);
-
-            allStylesheets = new ListBinding<>() {
+            this.baseTheme = baseTheme;
+            this.allStylesheets = new ListBinding<>() {
                 {
-                    bind(getBaseTheme().getStylesheets(), additionalStylesheets);
+                    bind(baseTheme.getStylesheets(), additionalStylesheets);
                 }
 
                 @Override
-                @SuppressWarnings({"unchecked", "ConstantConditions"})
+                @SuppressWarnings("unchecked")
                 protected ObservableList<String> computeValue() {
-                    return FXCollections.concat(getBaseTheme().getStylesheets(), additionalStylesheets);
+                    return FXCollections.concat(baseTheme.getStylesheets(), additionalStylesheets);
                 }
             };
         }
@@ -366,6 +335,11 @@ protected ObservableList<String> computeValue() {
         public ObservableList<String> getStylesheets() {
             return allStylesheets;
         }
+
+        @Override
+        protected void platformThemeChanged(Map<String, String> properties) {
+            baseTheme.platformThemeChanged(properties);
+        }
     }
 
 }