Merge branch 'master' into feature/extended-window

Author: mstr2

.github/workflows/submit.yml

@@ -298,7 +298,8 @@ jobs:
           java -version
           which ant
           ant -version
-          sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+          # We want to use Xcode 14, but GHA removed it from the macOS 14 runners
+          # sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
           xcodebuild -version
 
       - name: Build JavaFX artifacts

modules/javafx.base/src/main/java/com/sun/javafx/SecurityUtil.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024, 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;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Utility class to check for the presence of a security manager.
+ */
+public class SecurityUtil {
+
+    // Prevent class from being instantiated.
+    private SecurityUtil() {}
+
+    /**
+     * Check for the presence of a security manager (from an older JDK) and
+     * throw UnsupportedOperationException if enabled. Use reflection to avoid
+     * a dependency on an API that is deprecated for removal. This method does
+     * nothing if the security manager is not enabled or if
+     * System::getSecurityManager cannot be invoked.
+     *
+     * @throws UnsupportedOperationException if the security manager is enabled
+     */
+    public static void checkSecurityManager() {
+        try {
+            // Call System.getSecurityManager() using reflection. Throw an
+            // UnsupportedOperationException if it returns a non-null object.
+            // If we cannot find or invoke getSecurityManager, ignore the error.
+            Method meth = System.class.getMethod("getSecurityManager");
+            Object sm = meth.invoke(null);
+            if (sm != null) {
+                throw new UnsupportedOperationException("JavaFX does not support running with the Security Manager");
+            }
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
+            // Ignore the error
+        }
+    }
+}

modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java

@@ -25,6 +25,7 @@
 
 package com.sun.javafx.reflect;
 
+import com.sun.javafx.SecurityUtil;
 import java.security.AllPermission;
 import java.security.AccessController;
 import java.security.PermissionCollection;
@@ -76,6 +77,12 @@ private static Object invoke(Method m, Object obj, Object[] params)
  * Create a trampoline class.
  */
 public final class MethodUtil extends SecureClassLoader {
+
+    static {
+        // Check for security manager (throws exception if enabled)
+        SecurityUtil.checkSecurityManager();
+    }
+
     private static final String MISC_PKG = "com.sun.javafx.reflect.";
     private static final String TRAMPOLINE = MISC_PKG + "Trampoline";
     private static final Method bounce = getTrampoline();

modules/javafx.base/src/main/java/com/sun/javafx/reflect/ReflectUtil.java

@@ -26,10 +26,16 @@
 
 package com.sun.javafx.reflect;
 
+import com.sun.javafx.SecurityUtil;
 import java.lang.reflect.Proxy;
 
 public final class ReflectUtil {
 
+    static {
+        // Check for security manager (throws exception if enabled)
+        SecurityUtil.checkSecurityManager();
+    }
+
     private ReflectUtil() {
     }
 

modules/javafx.graphics/src/main/java/com/sun/glass/ui/Accessible.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -28,8 +28,6 @@
 import static javafx.scene.AccessibleAttribute.PARENT;
 import static javafx.scene.AccessibleAttribute.ROLE;
 import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.SceneHelper;
 import com.sun.javafx.tk.quantum.QuantumToolkit;
@@ -39,6 +37,8 @@
 import javafx.scene.Node;
 import javafx.scene.Scene;
 
+import java.util.function.Supplier;
+
 public abstract class Accessible {
 
     private EventHandler eventHandler;
@@ -137,10 +137,10 @@ private final AccessControlContext getAccessControlContext() {
         return acc;
     }
 
-    private class GetAttribute implements PrivilegedAction<Object> {
+    private class GetAttribute implements Supplier<Object> {
         AccessibleAttribute attribute;
         Object[] parameters;
-        @Override public Object run() {
+        @Override public Object get() {
             Object result = eventHandler.getAttribute(attribute, parameters);
             if (result != null) {
                 Class<?> clazz = attribute.getReturnType();
@@ -162,37 +162,27 @@ private class GetAttribute implements PrivilegedAction<Object> {
 
     private GetAttribute getAttribute = new GetAttribute();
 
-    @SuppressWarnings("removal")
     public Object getAttribute(AccessibleAttribute attribute, Object... parameters) {
-        AccessControlContext acc = getAccessControlContext();
-        if (acc == null) return null;
-        return QuantumToolkit.runWithoutRenderLock(() -> {
-            getAttribute.attribute = attribute;
-            getAttribute.parameters = parameters;
-            return AccessController.doPrivileged(getAttribute, acc);
-        });
+        getAttribute.attribute = attribute;
+        getAttribute.parameters = parameters;
+        return QuantumToolkit.runWithoutRenderLock(getAttribute);
     }
 
-    private class ExecuteAction implements PrivilegedAction<Void> {
+    private class ExecuteAction implements Supplier<Void> {
         AccessibleAction action;
         Object[] parameters;
-        @Override public Void run() {
+        @Override public Void get() {
             eventHandler.executeAction(action, parameters);
             return null;
         }
     }
 
     private ExecuteAction executeAction = new ExecuteAction();
 
-    @SuppressWarnings("removal")
     public void executeAction(AccessibleAction action, Object... parameters) {
-        AccessControlContext acc = getAccessControlContext();
-        if (acc == null) return;
-        QuantumToolkit.runWithoutRenderLock(() -> {
-            executeAction.action = action;
-            executeAction.parameters = parameters;
-            return AccessController.doPrivileged(executeAction, acc);
-        });
+        executeAction.action = action;
+        executeAction.parameters = parameters;
+        QuantumToolkit.runWithoutRenderLock(executeAction);
     }
 
     public abstract void sendNotification(AccessibleAttribute notification);

modules/javafx.graphics/src/main/java/com/sun/glass/ui/Application.java

@@ -32,12 +32,11 @@
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.List;
 import java.util.Map;
 import java.util.LinkedList;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public abstract class Application {
 
@@ -96,13 +95,11 @@ public void handlePreferencesChanged(Map<String, Object> preferences) {
     private static boolean loaded = false;
     private static Application application;
     private static Thread eventThread;
-    @SuppressWarnings("removal")
-    private static final boolean disableThreadChecks =
-        AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> {
-            final String str =
+    private static final boolean disableThreadChecks = ((Supplier<Boolean>) () -> {
+        final String str =
                     System.getProperty("glass.disableThreadChecks", "false");
             return "true".equalsIgnoreCase(str);
-        });
+    }).get();
 
     // May be called on any thread.
     protected static synchronized void loadNativeLibrary(final String libname) {
@@ -215,8 +212,7 @@ public void setName(String name) {
      */
     public String getDataDirectory() {
         checkEventThread();
-        @SuppressWarnings("removal")
-        String userHome = AccessController.doPrivileged((PrivilegedAction<String>) () -> System.getProperty("user.home"));
+        String userHome = System.getProperty("user.home");
         return userHome + File.separator + "." + name + File.separator;
     }
 

modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java

@@ -24,8 +24,6 @@
  */
 package com.sun.glass.ui;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import com.sun.javafx.PlatformUtil;
 
 final class Platform {
@@ -42,9 +40,7 @@ static public synchronized String determinePlatform() {
         if (type == null) {
 
             // Provide for a runtime override, allowing EGL for example
-            @SuppressWarnings("removal")
-            String userPlatform =
-                AccessController.doPrivileged((PrivilegedAction<String>) () -> System.getProperty("glass.platform"));
+            String userPlatform = System.getProperty("glass.platform");
 
             if (userPlatform != null) {
                 if (userPlatform.equals("macosx"))

modules/javafx.graphics/src/main/java/com/sun/glass/ui/Screen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, 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
@@ -24,8 +24,6 @@
  */
 package com.sun.glass.ui;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -37,9 +35,8 @@ public final class Screen {
     private static volatile List<Screen> screens = null ;
 
     // If dpiOverride is non-zero, use its value as screen DPI
-    @SuppressWarnings("removal")
-    private static final int dpiOverride = AccessController.doPrivileged((PrivilegedAction<Integer>) () ->
-        Integer.getInteger("com.sun.javafx.screenDPI", 0)).intValue();
+    private static final int dpiOverride =
+        Integer.getInteger("com.sun.javafx.screenDPI", 0);
 
     public static class EventHandler {
         public void handleSettingsChanged() {

modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java

@@ -29,9 +29,8 @@
 import javafx.scene.Node;
 import java.lang.annotation.Native;
 import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Map;
+import java.util.function.Supplier;
 
 public abstract class View {
 
@@ -44,8 +43,7 @@ public abstract class View {
     @Native public final static byte IME_ATTR_TARGET_NOTCONVERTED   = 0x03;
     @Native public final static byte IME_ATTR_INPUT_ERROR           = 0x04;
 
-    @SuppressWarnings("removal")
-    final static boolean accessible = AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> {
+    final static boolean accessible = ((Supplier<Boolean>) () -> {
         String force = System.getProperty("glass.accessible.force");
         if (force != null) return Boolean.parseBoolean(force);
 
@@ -60,7 +58,7 @@ public abstract class View {
         } catch (Exception e) {
             return false;
         }
-    });
+    }).get();
 
     public static class EventHandler {
         public void handleViewEvent(View view, long time, int type) {