8301302: Platform preferences API

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

@@ -51,7 +51,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 import javafx.application.Application;
@@ -726,55 +725,6 @@ public static void setPlatformUserAgentStylesheet(final String stylesheetUrl) {
         }
     }
 
-    /**
-     * Enumeration of possible high contrast scheme values.
-     *
-     * For each scheme, a theme key is defined. These keys can be
-     * used, for instance, in a resource bundle that defines the theme name values
-     * for supported locales.
-     *
-     * The high contrast feature may not be available on all platforms.
-     */
-    public enum HighContrastScheme {
-        HIGH_CONTRAST_BLACK("high.contrast.black.theme"),
-        HIGH_CONTRAST_WHITE("high.contrast.white.theme"),
-        HIGH_CONTRAST_1("high.contrast.1.theme"),
-        HIGH_CONTRAST_2("high.contrast.2.theme");
-
-        private final String themeKey;
-        HighContrastScheme(String themeKey) {
-            this.themeKey = themeKey;
-        }
-
-        public String getThemeKey() {
-            return themeKey;
-        }
-
-        /**
-         * Given a theme name string, this method finds the possible enum constant
-         * for which the result of a function, applying its theme key, matches the theme name.
-         *
-         * An example of such function can be {@code ResourceBundle::getString},
-         * as {@link java.util.ResourceBundle#getString(String)} returns a string for
-         * the given key.
-         *
-         * @param keyFunction a {@link Function} that returns a string for a given theme key string.
-         * @param themeName a string with the theme name
-         * @return the name of the enum constant or null if not found
-         */
-        public static String fromThemeName(Function<String, String> keyFunction, String themeName) {
-            if (keyFunction == null || themeName == null) {
-                return null;
-            }
-            for (HighContrastScheme item : values()) {
-                if (themeName.equalsIgnoreCase(keyFunction.apply(item.getThemeKey()))) {
-                    return item.toString();
-                }
-            }
-            return null;
-        }
-    }
-
     private static String accessibilityTheme;
     public static boolean setAccessibilityTheme(String platformTheme) {
 
@@ -823,7 +773,12 @@ private static void _setAccessibilityTheme(String platformTheme) {
             } else {
                 if (platformTheme != null) {
                     // The following names are Platform specific (Windows 7 and 8)
-                    switch (HighContrastScheme.valueOf(platformTheme)) {
+                    var highContrastScheme = WindowsHighContrastScheme.fromThemeName(platformTheme);
+                    if (highContrastScheme == null) {
+                        return;
+                    }
+
+                    switch (highContrastScheme) {
                         case HIGH_CONTRAST_WHITE:
                             accessibilityTheme = "com/sun/javafx/scene/control/skin/modena/blackOnWhite.css";
                             break;
@@ -834,7 +789,6 @@ private static void _setAccessibilityTheme(String platformTheme) {
                         case HIGH_CONTRAST_2: //TODO #2 should be green on black
                             accessibilityTheme = "com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css";
                             break;
-                        default:
                     }
                 }
             }

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.application;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Enumeration of possible high contrast scheme values.
+ * <p>
+ * For each scheme, a theme key is defined. These keys can be
+ * used in a resource bundle that defines the theme name values
+ * for supported locales.
+ * <p>
+ * The high contrast feature may not be available on all platforms.
+ */
+enum WindowsHighContrastScheme {
+
+    HIGH_CONTRAST_BLACK("high.contrast.black.theme"),
+    HIGH_CONTRAST_WHITE("high.contrast.white.theme"),
+    HIGH_CONTRAST_1("high.contrast.1.theme"),
+    HIGH_CONTRAST_2("high.contrast.2.theme");
+
+    private static final List<ResourceBundle> resourceBundles = Arrays.stream(Locale.getAvailableLocales())
+        .map(locale -> ResourceBundle.getBundle("com/sun/glass/ui/win/themes", locale))
+        .distinct()
+        .toList();
+
+    private final String themeKey;
+
+    WindowsHighContrastScheme(String themeKey) {
+        this.themeKey = themeKey;
+    }
+
+    public String getThemeKey() {
+        return themeKey;
+    }
+
+    /**
+     * Given a theme name string, this method finds the possible enum constant
+     * for which the result of a function, applying its theme key, matches the theme name.
+     *
+     * @param themeName a string with the localized theme name (for the locale of the OS, not the JVM)
+     * @return the enum constant or null if not found
+     */
+    public static WindowsHighContrastScheme fromThemeName(String themeName) {
+        if (themeName == null) {
+            return null;
+        }
+
+        // Iterate over all resource bundles and try to find a value that matches the theme name
+        // we got from the OS. We can't just look in the properties file for the current locale,
+        // since we might be running on a JVM with a locale that is different from the OS.
+        for (WindowsHighContrastScheme item : values()) {
+            for (ResourceBundle resourceBundle : resourceBundles) {
+                if (themeName.equalsIgnoreCase(resourceBundle.getString(item.getThemeKey()))) {
+                    return item;
+                }
+            }
+        }
+
+        return null;
+    }
+}

tests/manual/events/PlatformPreferencesChangedTest.java

@@ -69,7 +69,9 @@ public void start(Stage stage) {
             new VBox(
                 new Label("1. On a supported platform, change any of the platform preferences."),
                 new Label("    See javafx.application.Platform.Preferences for a list of supported platforms.")),
-            new Label("2. Observe whether the changed preferences are reported in the log below."),
+            new VBox(
+                new Label("2. Observe whether the changed preferences are reported in the log below."),
+                new Label("    Added or removed preferences are marked with a plus or minus sign.")),
             new Label("3. Click \"Pass\" if the changes were correctly reported, otherwise click \"Fail\"."),
             new HBox(5, passButton, failButton, clearButton)
         ));
@@ -87,7 +89,13 @@ public void start(Stage stage) {
         });
 
         Platform.getPreferences().addListener((MapChangeListener<String, Object>)change -> {
-            appendText(textArea, "\t" + change.getKey() + " = " + change.getValueAdded());
+            if (change.wasRemoved() && change.wasAdded()) {
+                appendText(textArea, "\t" + formatEntry(change.getKey(), change.getValueAdded()));
+            } else if (change.wasRemoved()) {
+                appendText(textArea, "\t-" + change.getKey());
+            } else {
+                appendText(textArea, "\t+" + formatEntry(change.getKey(), change.getValueAdded()));
+            }
         });
 
         stage.setScene(new Scene(root));
@@ -105,16 +113,17 @@ public static void main(String[] args) {
     }
 
     private static String formatPrefs(Set<Map.Entry<String, Object>> prefs) {
-        String entries = prefs.stream()
-                .sorted(Map.Entry.comparingByKey())
-                .map(entry -> {
-                    if (entry.getValue() instanceof Object[] array) {
-                        return entry.getKey() + "=" + Arrays.toString(array);
-                    }
-                    return entry.getKey() + "=" + entry.getValue();
-                })
-                .collect(Collectors.joining("\r\n\t"));
-
-        return "\r\n\t" + entries;
+        return "\r\n\t" + prefs.stream()
+            .sorted(Map.Entry.comparingByKey())
+            .map(entry -> formatEntry(entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining("\r\n\t"));
+    }
+
+    private static String formatEntry(String key, Object value) {
+        if (value instanceof Object[] array) {
+            return key + "=" + Arrays.toString(array);
+        }
+
+        return key + "=" + value;
     }
 }