8384602: Remove AppContext from java.awt.Component

src/java.desktop/share/classes/java/awt/Component.java

@@ -88,7 +88,6 @@
 import javax.swing.JRootPane;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.ComponentFactory;
 import sun.awt.ConstrainableGraphics;
 import sun.awt.EmbeddedFrame;
@@ -235,11 +234,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
      */
     transient Container parent;
 
-    /**
-     * The {@code AppContext} of the component.
-     */
-    transient AppContext appContext;
-
     /**
      * The x position of the component in the parent's coordinate system.
      *
@@ -877,12 +871,6 @@ public boolean isVisible(Component comp) {
             {
                  Component.setRequestFocusController(requestController);
             }
-            public AppContext getAppContext(Component comp) {
-                 return comp.appContext;
-            }
-            public void setAppContext(Component comp, AppContext appContext) {
-                 comp.appContext = appContext;
-            }
             public Container getParent(Component comp) {
                 return comp.getParent_NoClientCode();
             }
@@ -975,7 +963,6 @@ public BufferStrategy getBufferStrategy(Component comp) {
      * tree (for example, by a {@code Frame} object).
      */
     protected Component() {
-        appContext = AppContext.getAppContext();
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
@@ -3452,7 +3439,7 @@ public void repaint(long tm, int x, int y, int width, int height) {
                 (width > 0) && (height > 0)) {
                 PaintEvent e = new PaintEvent(this, PaintEvent.UPDATE,
                                               new Rectangle(x, y, width, height));
-                SunToolkit.postEvent(SunToolkit.targetToAppContext(this), e);
+                SunToolkit.postEvent(e);
             }
         }
     }
@@ -4787,14 +4774,6 @@ public final void dispatchEvent(AWTEvent e) {
     void dispatchEventImpl(AWTEvent e) {
         int id = e.getID();
 
-        // Check that this component belongs to this app-context
-        AppContext compContext = appContext;
-        if (compContext != null && !compContext.equals(AppContext.getAppContext())) {
-            if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
-                eventLog.fine("Event " + e + " is being dispatched on the wrong AppContext");
-            }
-        }
-
         if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
             eventLog.finest("{0}", e);
         }
@@ -8936,7 +8915,6 @@ private void readObject(ObjectInputStream s)
 
         s.defaultReadObject();
 
-        appContext = AppContext.getAppContext();
         coalescingEnabled = checkCoalescing();
         if (componentSerializedDataVersion < 4) {
             // These fields are non-transient and rely on default

src/java.desktop/share/classes/sun/awt/AWTAccessor.java

@@ -127,16 +127,6 @@ public interface ComponentAccessor {
          */
         void setRequestFocusController(RequestFocusController requestController);
 
-        /**
-         * Returns the appContext of the component.
-         */
-        AppContext getAppContext(Component comp);
-
-        /**
-         * Sets the appContext of the component.
-         */
-        void setAppContext(Component comp, AppContext appContext);
-
         /**
          * Returns the parent of the component.
          */

src/java.desktop/share/classes/sun/awt/SunToolkit.java

@@ -322,24 +322,16 @@ protected static void targetDisposedPeer(Object target, Object peer) {
      */
     private static boolean setAppContext(Object target,
                                          AppContext context) {
-        if (target instanceof Component) {
-            AWTAccessor.getComponentAccessor().
-                setAppContext((Component)target, context);
-        } else {
-            return false;
-        }
-        return true;
+        return (target instanceof Component);
     }
 
     /**
      * Returns the appContext field for target. If target is not a
      * Component or MenuComponent this returns null.
      */
     private static AppContext getAppContext(Object target) {
-        if (target instanceof Component) {
-            return AWTAccessor.getComponentAccessor().
-                       getAppContext((Component)target);
-        } else if (target instanceof MenuComponent) {
+        if ((target instanceof Component) ||
+            (target instanceof MenuComponent)) {
             return AppContext.getAppContext();
         } else {
             return null;