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

@@ -66,11 +66,10 @@
 import sun.awt.AppContext;
 import sun.awt.AWTAccessor;
 import sun.awt.ConstrainableGraphics;
 import sun.awt.SubRegionShowable;
 import sun.awt.SunToolkit;
-import sun.awt.CausedFocusEvent;
 import sun.awt.EmbeddedFrame;
 import sun.awt.dnd.SunDropTargetEvent;
 import sun.awt.im.CompositionArea;
 import sun.font.FontManager;
 import sun.font.FontManagerFactory;

@@ -876,11 +875,11 @@
             public void setGraphicsConfiguration(Component comp,
                     GraphicsConfiguration gc)
             {
                 comp.setGraphicsConfiguration(gc);
             }
-            public boolean requestFocus(Component comp, CausedFocusEvent.Cause cause) {
+            public boolean requestFocus(Component comp, FocusEvent.Cause cause) {
                 return comp.requestFocus(cause);
             }
             public boolean canBeFocusOwner(Component comp) {
                 return comp.canBeFocusOwner();
             }

@@ -7538,11 +7537,11 @@
      */
     public void requestFocus() {
         requestFocusHelper(false, true);
     }
 
-    boolean requestFocus(CausedFocusEvent.Cause cause) {
+    boolean requestFocus(FocusEvent.Cause cause) {
         return requestFocusHelper(false, true, cause);
     }
 
     /**
      * Requests that this <code>Component</code> get the input focus,

@@ -7605,11 +7604,11 @@
      */
     protected boolean requestFocus(boolean temporary) {
         return requestFocusHelper(temporary, true);
     }
 
-    boolean requestFocus(boolean temporary, CausedFocusEvent.Cause cause) {
+    boolean requestFocus(boolean temporary, FocusEvent.Cause cause) {
         return requestFocusHelper(temporary, true, cause);
     }
     /**
      * Requests that this Component get the input focus, if this
      * Component's top-level ancestor is already the focused

@@ -7656,11 +7655,11 @@
      */
     public boolean requestFocusInWindow() {
         return requestFocusHelper(false, false);
     }
 
-    boolean requestFocusInWindow(CausedFocusEvent.Cause cause) {
+    boolean requestFocusInWindow(FocusEvent.Cause cause) {
         return requestFocusHelper(false, false, cause);
     }
 
     /**
      * Requests that this <code>Component</code> get the input focus,

@@ -7721,22 +7720,22 @@
      */
     protected boolean requestFocusInWindow(boolean temporary) {
         return requestFocusHelper(temporary, false);
     }
 
-    boolean requestFocusInWindow(boolean temporary, CausedFocusEvent.Cause cause) {
+    boolean requestFocusInWindow(boolean temporary, FocusEvent.Cause cause) {
         return requestFocusHelper(temporary, false, cause);
     }
 
     final boolean requestFocusHelper(boolean temporary,
                                      boolean focusedWindowChangeAllowed) {
-        return requestFocusHelper(temporary, focusedWindowChangeAllowed, CausedFocusEvent.Cause.UNKNOWN);
+        return requestFocusHelper(temporary, focusedWindowChangeAllowed, FocusEvent.Cause.UNKNOWN);
     }
 
     final boolean requestFocusHelper(boolean temporary,
                                      boolean focusedWindowChangeAllowed,
-                                     CausedFocusEvent.Cause cause)
+                                     FocusEvent.Cause cause)
     {
         // 1) Check if the event being dispatched is a system-generated mouse event.
         AWTEvent currentEvent = EventQueue.getCurrentEvent();
         if (currentEvent instanceof MouseEvent &&
             SunToolkit.isSystemGenerated(currentEvent))

@@ -7820,11 +7819,11 @@
         return success;
     }
 
     private boolean isRequestFocusAccepted(boolean temporary,
                                            boolean focusedWindowChangeAllowed,
-                                           CausedFocusEvent.Cause cause)
+                                           FocusEvent.Cause cause)
     {
         if (!isFocusable() || !isVisible()) {
             if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
                 focusLog.finest("Not focusable or not visible");
             }

@@ -7867,11 +7866,11 @@
                 focusLog.finest("focus owner is null or this");
             }
             return true;
         }
 
-        if (CausedFocusEvent.Cause.ACTIVATION == cause) {
+        if (FocusEvent.Cause.ACTIVATION == cause) {
             // we shouldn't call RequestFocusController in case we are
             // in activation.  We do request focus on component which
             // has got temporary focus lost and then on component which is
             // most recent focus owner.  But most recent focus owner can be
             // changed by requestFocusXXX() call only, so this transfer has

@@ -7899,11 +7898,11 @@
     // Swing access this method through reflection to implement InputVerifier's functionality.
     // Perhaps, we should make this method public (later ;)
     private static class DummyRequestFocusController implements RequestFocusController {
         public boolean acceptRequestFocus(Component from, Component to,
                                           boolean temporary, boolean focusedWindowChangeAllowed,
-                                          CausedFocusEvent.Cause cause)
+                                          FocusEvent.Cause cause)
         {
             return true;
         }
     };
 

@@ -7983,11 +7982,11 @@
             focusLog.finer("clearOnFailure = " + clearOnFailure);
         }
         Component toFocus = getNextFocusCandidate();
         boolean res = false;
         if (toFocus != null && !toFocus.isFocusOwner() && toFocus != this) {
-            res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_FORWARD);
+            res = toFocus.requestFocusInWindow(FocusEvent.Cause.TRAVERSAL_FORWARD);
         }
         if (clearOnFailure && !res) {
             if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
                 focusLog.finer("clear global focus owner");
             }

@@ -8063,11 +8062,11 @@
             Component toFocus = policy.getComponentBefore(rootAncestor, comp);
             if (toFocus == null) {
                 toFocus = policy.getDefaultComponent(rootAncestor);
             }
             if (toFocus != null) {
-                res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD);
+                res = toFocus.requestFocusInWindow(FocusEvent.Cause.TRAVERSAL_BACKWARD);
             }
         }
         if (clearOnFailure && !res) {
             if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
                 focusLog.finer("clear global focus owner");

@@ -8108,21 +8107,21 @@
             Container fcr = (rootAncestorRootAncestor != null) ?
                 rootAncestorRootAncestor : rootAncestor;
 
             KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 setGlobalCurrentFocusCycleRootPriv(fcr);
-            rootAncestor.requestFocus(CausedFocusEvent.Cause.TRAVERSAL_UP);
+            rootAncestor.requestFocus(FocusEvent.Cause.TRAVERSAL_UP);
         } else {
             Window window = getContainingWindow();
 
             if (window != null) {
                 Component toFocus = window.getFocusTraversalPolicy().
                     getDefaultComponent(window);
                 if (toFocus != null) {
                     KeyboardFocusManager.getCurrentKeyboardFocusManager().
                         setGlobalCurrentFocusCycleRootPriv(window);
-                    toFocus.requestFocus(CausedFocusEvent.Cause.TRAVERSAL_UP);
+                    toFocus.requestFocus(FocusEvent.Cause.TRAVERSAL_UP);
                 }
             }
         }
     }