8344063: Remove doPrivileged calls from swing classes in the java.desktop module

Reviewed-by: honkar, kcr

Author: prrace

src/java.desktop/share/classes/javax/swing/AbstractAction.java

@@ -32,12 +32,9 @@
 import java.io.ObjectOutputStream;
 import java.io.Serial;
 import java.io.Serializable;
-import java.security.AccessController;
 
 import javax.swing.event.SwingPropertyChangeSupport;
 
-import sun.security.action.GetPropertyAction;
-
 /**
  * This class provides default implementations for the JFC <code>Action</code>
  * interface. Standard behaviors like the get and set methods for
@@ -81,14 +78,11 @@ public abstract class AbstractAction implements Action, Cloneable, Serializable
      * Whether or not to reconfigure all action properties from the
      * specified event.
      */
-    @SuppressWarnings("removal")
     static boolean shouldReconfigure(PropertyChangeEvent e) {
         if (e.getPropertyName() == null) {
             synchronized(AbstractAction.class) {
                 if (RECONFIGURE_ON_NULL == null) {
-                    RECONFIGURE_ON_NULL = Boolean.valueOf(
-                        AccessController.doPrivileged(new GetPropertyAction(
-                        "swing.actions.reconfigureOnNull", "false")));
+                    RECONFIGURE_ON_NULL = Boolean.getBoolean("swing.actions.reconfigureOnNull");
                 }
                 return RECONFIGURE_ON_NULL;
             }

src/java.desktop/share/classes/javax/swing/DebugGraphics.java

@@ -27,8 +27,6 @@
 
 import java.awt.*;
 import java.awt.image.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.text.AttributedCharacterIterator;
 
 /**
@@ -79,22 +77,14 @@ public class DebugGraphics extends Graphics {
      * applications, it is for internal use only. When called directly
      * it will create an un-usable instance.
      */
-    @SuppressWarnings("removal")
     public DebugGraphics() {
         super();
         buffer = null;
         xOffset = yOffset = 0;
 
         //  Creates a Graphics context when the constructor is called.
         if (this.graphics == null) {
-            StackWalker walker = AccessController.doPrivileged(new PrivilegedAction<StackWalker>() {
-                @Override
-                public StackWalker run() {
-                    StackWalker stackwalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
-                    return stackwalker;
-                }
-            });
-
+            StackWalker walker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
             if (walker.getCallerClass() != this.getClass()) {
                 BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
                 this.graphics = bi.createGraphics();

src/java.desktop/share/classes/javax/swing/ImageIcon.java

@@ -44,10 +44,6 @@
 import java.io.Serial;
 import java.io.Serializable;
 import java.net.URL;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Locale;
 
 import javax.accessibility.Accessible;
@@ -105,27 +101,19 @@ public class ImageIcon implements Icon, Serializable, Accessible {
      * It is left for backward compatibility only.
      * @deprecated since 1.8
      */
-    @SuppressWarnings("removal")
     @Deprecated
-    protected static final Component component
-            = AccessController.doPrivileged(new PrivilegedAction<Component>() {
-        public Component run() {
-            try {
-                final Component component = createNoPermsComponent();
-
-                // 6482575 - clear the appContext field so as not to leak it
-                AWTAccessor.getComponentAccessor().
-                        setAppContext(component, null);
-
-                return component;
-            } catch (Throwable e) {
-                // We don't care about component.
-                // So don't prevent class initialisation.
-                e.printStackTrace();
-                return null;
-            }
+    protected static final Component component = createComponent();
+
+    private static final Component createComponent() {
+        try {
+            Component component = new Component() {};
+            // 6482575 - clear the appContext field so as not to leak it
+            AWTAccessor.getComponentAccessor().setAppContext(component, null);
+            return component;
+        } catch (Throwable t) {
+            return null;
         }
-    });
+    }
 
     /**
      * Do not use this shared media tracker, which is used to load images.
@@ -135,23 +123,6 @@ public Component run() {
     @Deprecated
     protected static final MediaTracker tracker = new MediaTracker(component);
 
-    @SuppressWarnings("removal")
-    private static Component createNoPermsComponent() {
-        // 7020198 - set acc field to no permissions and no subject
-        // Note, will have appContext set.
-        return AccessController.doPrivileged(
-                new PrivilegedAction<Component>() {
-                    public Component run() {
-                        return new Component() {
-                        };
-                    }
-                },
-                new AccessControlContext(new ProtectionDomain[]{
-                        new ProtectionDomain(null, null)
-                })
-        );
-    }
-
     /**
      * Id used in loading images from MediaTracker.
      */

src/java.desktop/share/classes/javax/swing/JLayer.java

@@ -38,8 +38,6 @@
 import java.io.ObjectInputStream;
 import java.io.Serial;
 import java.util.ArrayList;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 /**
  * {@code JLayer} is a universal decorator for Swing components
@@ -816,27 +814,14 @@ private long getCurrentEventMask() {
             return currentEventMask;
         }
 
-        @SuppressWarnings("removal")
         private void addAWTEventListener(final long eventMask) {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    Toolkit.getDefaultToolkit().
-                            addAWTEventListener(LayerEventController.this, eventMask);
-                    return null;
-                }
-            });
-
+            Toolkit.getDefaultToolkit().
+                    addAWTEventListener(LayerEventController.this, eventMask);
         }
 
-        @SuppressWarnings("removal")
         private void removeAWTEventListener() {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    Toolkit.getDefaultToolkit().
-                            removeAWTEventListener(LayerEventController.this);
-                    return null;
-                }
-            });
+            Toolkit.getDefaultToolkit().
+                    removeAWTEventListener(LayerEventController.this);
         }
 
         private boolean isEventEnabled(long eventMask, int id) {

src/java.desktop/share/classes/javax/swing/JPopupMenu.java

@@ -119,11 +119,8 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
         new StringBuffer("JPopupMenu.defaultLWPopupEnabledKey");
 
     /** Bug#4425878-Property javax.swing.adjustPopupLocationToFit introduced */
-    @SuppressWarnings("removal")
     static boolean popupPositionFixDisabled =
-            java.security.AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction(
-                    "javax.swing.adjustPopupLocationToFit","")).equals("false");
+         System.getProperty("javax.swing.adjustPopupLocationToFit","").equals("false");
 
     transient  Component invoker;
     transient  Popup popup;

src/java.desktop/share/classes/javax/swing/JRootPane.java

@@ -26,13 +26,10 @@
 
 import java.awt.*;
 import java.beans.*;
-import java.security.AccessController;
 import javax.accessibility.*;
 import javax.swing.plaf.RootPaneUI;
 import java.io.Serializable;
 
-import sun.security.action.GetBooleanAction;
-
 
 /**
  * A lightweight container used behind the scenes by
@@ -202,19 +199,15 @@ public class JRootPane extends JComponent implements Accessible {
      * Whether or not we should dump the stack when true double buffering
      * is disabled. Default is false.
      */
-    @SuppressWarnings("removal")
     private static final boolean LOG_DISABLE_TRUE_DOUBLE_BUFFERING
-            = AccessController.doPrivileged(new GetBooleanAction(
-                                   "swing.logDoubleBufferingDisable"));
+            = Boolean.getBoolean("swing.logDoubleBufferingDisable");
 
     /**
      * Whether or not we should ignore requests to disable true double
      * buffering. Default is false.
      */
-    @SuppressWarnings("removal")
     private static final boolean IGNORE_DISABLE_TRUE_DOUBLE_BUFFERING
-            = AccessController.doPrivileged(new GetBooleanAction(
-                                   "swing.ignoreDoubleBufferingDisable"));
+           = Boolean.getBoolean("swing.ignoreDoubleBufferingDisable");
 
     /**
      * Constant used for the windowDecorationStyle property. Indicates that