8342457: Remove calls to doPrivileged in swing

Reviewed-by: kcr, psadhukhan

Author: Andy Goryachev

modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/Disposer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -51,30 +51,19 @@ public class Disposer implements Runnable {
     static {
         disposerInstance = new Disposer();
 
+        /* The thread must be a member of a thread group
+         * which will not get GCed before VM exit.
+         * Make its parent the top-level thread group.
+         */
         ThreadGroup tg = Thread.currentThread().getThreadGroup();
-        @SuppressWarnings("removal")
-        var dummy = java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction() {
-                @Override
-                public Object run() {
-                    /* The thread must be a member of a thread group
-                     * which will not get GCed before VM exit.
-                     * Make its parent the top-level thread group.
-                     */
-                    ThreadGroup tg = Thread.currentThread().getThreadGroup();
-                    for (ThreadGroup tgn = tg;
-                         tgn != null;
-                         tg = tgn, tgn = tg.getParent());
-                    Thread t =
-                        new Thread(tg, disposerInstance, "SwingNode Disposer");
-                    t.setContextClassLoader(null);
-                    t.setDaemon(true);
-                    t.setPriority(Thread.MAX_PRIORITY);
-                    t.start();
-                    return null;
-                }
-            }
-        );
+        for (ThreadGroup tgn = tg;
+             tgn != null;
+             tg = tgn, tgn = tg.getParent());
+        Thread t = new Thread(tg, disposerInstance, "SwingNode Disposer");
+        t.setContextClassLoader(null);
+        t.setDaemon(true);
+        t.setPriority(Thread.MAX_PRIORITY);
+        t.start();
     }
 
     /**

modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/FXDnD.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, 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
@@ -32,8 +32,6 @@
 import java.awt.dnd.DragSource;
 import java.awt.dnd.DropTarget;
 import java.awt.dnd.InvalidDnDOperationException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import javafx.embed.swing.SwingNode;
 import com.sun.javafx.embed.swing.newimpl.FXDnDInteropN;
 
@@ -42,22 +40,9 @@
  * It allows Swing content to use the FX machinery for performing DnD.
  */
 final public class FXDnD {
-    public static boolean fxAppThreadIsDispatchThread;
+    public static boolean fxAppThreadIsDispatchThread = "true".equals(System.getProperty("javafx.embed.singleThread"));
     private FXDnDInteropN fxdndiop;
 
-    static {
-        @SuppressWarnings("removal")
-        var dummy = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            @Override
-            public Object run() {
-                fxAppThreadIsDispatchThread =
-                        "true".equals(System.getProperty("javafx.embed.singleThread"));
-                return null;
-            }
-        });
-
-    }
-
     public FXDnD(SwingNode node) {
         fxdndiop = new FXDnDInteropN();
         fxdndiop.setNode(node);

modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/SwingFXUtilsImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -26,8 +26,6 @@
 package com.sun.javafx.embed.swing;
 
 import java.awt.EventQueue;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import com.sun.javafx.embed.swing.newimpl.SwingFXUtilsImplInteropN;
 
 public class SwingFXUtilsImpl {
@@ -38,10 +36,8 @@ public class SwingFXUtilsImpl {
         swFXUtilIOP = new SwingFXUtilsImplInteropN();
     }
 
-    @SuppressWarnings("removal")
     private static EventQueue getEventQueue() {
-        return AccessController.doPrivileged(
-                (PrivilegedAction<EventQueue>) () -> java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue());
+        return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
     }
 
     //Called with reflection from PlatformImpl to avoid dependency

modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java

@@ -57,8 +57,6 @@
 import java.awt.image.DataBufferInt;
 import java.nio.IntBuffer;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
 
@@ -237,10 +235,7 @@ private synchronized static void initFx() {
         if (fxInitialized) {
             return;
         }
-        @SuppressWarnings("removal")
-        EventQueue eventQueue = AccessController.doPrivileged(
-                                (PrivilegedAction<EventQueue>) java.awt.Toolkit
-                                .getDefaultToolkit()::getSystemEventQueue);
+        EventQueue eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
         if (eventQueue.isDispatchThread()) {
             // We won't block EDT by FX initialization
             SecondaryLoop secondaryLoop = eventQueue.createSecondaryLoop();
@@ -321,10 +316,7 @@ public void setScene(final Scene newScene) {
         if (Toolkit.getToolkit().isFxUserThread()) {
             setSceneImpl(newScene);
         } else {
-            @SuppressWarnings("removal")
-            EventQueue eventQueue = AccessController.doPrivileged(
-                    (PrivilegedAction<EventQueue>) java.awt.Toolkit
-                            .getDefaultToolkit()::getSystemEventQueue);
+            EventQueue eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
             SecondaryLoop secondaryLoop = eventQueue.createSecondaryLoop();
             Platform.runLater(() -> {
                 try {
@@ -949,18 +941,14 @@ private void setFxEnabled(boolean enabled) {
      * method is invoked, the chain of parent components is set up with
      * KeyboardAction event listeners.
      */
-    @SuppressWarnings("removal")
     @Override
     public void addNotify() {
         super.addNotify();
 
         registerFinishListener();
 
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            JFXPanel.this.getToolkit().addAWTEventListener(ungrabListener,
-                                               jfxPanelIOP.getMask());
-            return null;
-        });
+        getToolkit().addAWTEventListener(ungrabListener, jfxPanelIOP.getMask());
+
         updateComponentSize(); // see RT-23603
         SwingNodeHelper.runOnFxThread(() -> {
             if ((stage != null) && !stage.isShowing()) {
@@ -984,7 +972,6 @@ public InputMethodRequests getInputMethodRequests() {
      * When this method is invoked, any KeyboardActions set up in the the
      * chain of parent components are removed.
      */
-    @SuppressWarnings("removal")
     @Override public void removeNotify() {
         SwingNodeHelper.runOnFxThread(() -> {
             if ((stage != null) && stage.isShowing()) {
@@ -998,10 +985,7 @@ public InputMethodRequests getInputMethodRequests() {
 
         super.removeNotify();
 
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            JFXPanel.this.getToolkit().removeAWTEventListener(ungrabListener);
-            return null;
-        });
+        getToolkit().removeAWTEventListener(ungrabListener);
 
         /* see CR 4867453 */
         getInputContext().removeNotify(this);

modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -55,8 +55,6 @@
 import javafx.stage.Window;
 import java.lang.ref.WeakReference;
 import java.nio.IntBuffer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import com.sun.javafx.embed.swing.Disposer;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.transform.BaseTransform;
@@ -117,20 +115,9 @@
  * @since JavaFX 8.0
  */
 public class SwingNode extends Node {
-    private static boolean isThreadMerged;
+    private static boolean isThreadMerged = Boolean.valueOf(System.getProperty("javafx.embed.singleThread"));
 
     static {
-        @SuppressWarnings("removal")
-        var dummy = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            @Override
-            public Object run() {
-                isThreadMerged = Boolean.valueOf(
-                        System.getProperty("javafx.embed.singleThread"));
-                return null;
-            }
-        });
-
-
          // This is used by classes in different packages to get access to
          // private and package private methods.
         SwingNodeHelper.setSwingNodeAccessor(new SwingNodeHelper.SwingNodeAccessor() {
@@ -562,12 +549,10 @@ private boolean doComputeContains(double localX, double localY) {
         locateLwFrame();
     };
 
-    @SuppressWarnings("removal")
     private final EventHandler<FocusUngrabEvent> ungrabHandler = event -> {
         if (!skipBackwardUnrgabNotification) {
             if (lwFrame != null) {
-                AccessController.doPrivileged(new PostEventAction(
-                    swNodeIOP.createUngrabEvent(lwFrame)));
+                postAWTEvent(swNodeIOP.createUngrabEvent(lwFrame));
             }
         }
     };
@@ -830,17 +815,9 @@ private void ungrabFocus(boolean postUngrabEvent) {
         }
     }
 
-    private class PostEventAction implements PrivilegedAction<Void> {
-        private AWTEvent event;
-        PostEventAction(AWTEvent event) {
-            this.event = event;
-        }
-        @Override
-        public Void run() {
-            EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
-            eq.postEvent(event);
-            return null;
-        }
+    private static void postAWTEvent(AWTEvent event) {
+        EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
+        eq.postEvent(event);
     }
 
     private class SwingMouseEventHandler implements EventHandler<MouseEvent> {
@@ -890,8 +867,7 @@ public void handle(MouseEvent event) {
                         frame, swingID, swingWhen, swingModifiers,
                         relX, relY, absX, absY,
                         event.getClickCount(), swingPopupTrigger, swingButton);
-            @SuppressWarnings("removal")
-            var dummy = AccessController.doPrivileged(new PostEventAction(mouseEvent));
+            postAWTEvent(mouseEvent);
         }
     }
 
@@ -932,8 +908,7 @@ private void sendMouseWheelEvent(Object source, double fxX, double fxY, int swin
             int y = (int) Math.round(fxY);
             MouseWheelEvent mouseWheelEvent =
                 swNodeIOP.createMouseWheelEvent(source, swingModifiers, x, y, -wheelRotation);
-            @SuppressWarnings("removal")
-            var dummy = AccessController.doPrivileged(new PostEventAction(mouseWheelEvent));
+            postAWTEvent(mouseWheelEvent);
         }
     }
 
@@ -978,10 +953,7 @@ public void handle(KeyEvent event) {
             java.awt.event.KeyEvent keyEvent = swNodeIOP.createKeyEvent(frame,
                 swingID, swingWhen, swingModifiers, swingKeyCode,
                 swingChar);
-            @SuppressWarnings("removal")
-            var dummy = AccessController.doPrivileged(new PostEventAction(keyEvent));
+            postAWTEvent(keyEvent);
         }
     }
 }
-
-