--- old/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java	2016-04-04 09:40:19.618375000 +0300
+++ new/src/java.desktop/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java	2016-04-04 09:40:19.137365300 +0300
@@ -60,8 +60,8 @@
                 focusLog.fine("Clearing global focus owner " + focusOwner);
             }
             if (focusOwner != null) {
-                FocusEvent fl = new CausedFocusEvent(focusOwner, FocusEvent.FOCUS_LOST, false, null,
-                                                     CausedFocusEvent.Cause.CLEAR_GLOBAL_FOCUS_OWNER);
+                FocusEvent fl = new FocusEvent(focusOwner, FocusEvent.FOCUS_LOST, false, null,
+                                                     FocusEvent.Cause.CLEAR_GLOBAL_FOCUS_OWNER);
                 SunToolkit.postPriorityEvent(fl);
             }
         }
@@ -110,7 +110,7 @@
                                        boolean temporary,
                                        boolean focusedWindowChangeAllowed,
                                        long time,
-                                       CausedFocusEvent.Cause cause,
+                                       FocusEvent.Cause cause,
                                        Component currentFocusOwner) // provided by the descendant peers
     {
         if (lightweightChild == null) {
@@ -122,7 +122,7 @@
             currentOwner = null;
         }
         if (currentOwner != null) {
-            FocusEvent fl = new CausedFocusEvent(currentOwner, FocusEvent.FOCUS_LOST,
+            FocusEvent fl = new FocusEvent(currentOwner, FocusEvent.FOCUS_LOST,
                                                  false, lightweightChild, cause);
 
             if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
@@ -131,7 +131,7 @@
             SunToolkit.postEvent(SunToolkit.targetToAppContext(currentOwner), fl);
         }
 
-        FocusEvent fg = new CausedFocusEvent(lightweightChild, FocusEvent.FOCUS_GAINED,
+        FocusEvent fg = new FocusEvent(lightweightChild, FocusEvent.FOCUS_GAINED,
                                              false, currentOwner, cause);
 
         if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
@@ -142,7 +142,7 @@
     }
 
     // WARNING: Don't call it on the Toolkit thread.
-    public static boolean requestFocusFor(Component target, CausedFocusEvent.Cause cause) {
+    public static boolean requestFocusFor(Component target, FocusEvent.Cause cause) {
         return AWTAccessor.getComponentAccessor().requestFocus(target, cause);
     }
 
@@ -152,7 +152,7 @@
                                                      boolean temporary,
                                                      boolean focusedWindowChangeAllowed,
                                                      long time,
-                                                     CausedFocusEvent.Cause cause)
+                                                     FocusEvent.Cause cause)
     {
         return KfmAccessor.instance.shouldNativelyFocusHeavyweight(
             heavyweight, descendant, temporary, focusedWindowChangeAllowed,