java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java

@@ -1,6 +1,29 @@
 /*
+ * Copyright (c) 2005, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
   test
   @bug       6272324
   @summary   Modal excluded Window which decorated parent is blocked should be non-focusable.
   @author    anton.tarasov@sun.com: area=awt.focus
   @run       applet NonFocusableBlockedOwnerTest.html

@@ -108,12 +131,11 @@
             } catch (IllegalComponentStateException e) {}
         }
     }
     void waitForIdle() {
         try {
-            Toolkit.getDefaultToolkit().sync();
-            sun.awt.SunToolkit.flushPendingEvents();
+            robot.waitForIdle();
             EventQueue.invokeAndWait( new Runnable() {
                     public void run() {} // Dummy implementation
                 });
         } catch(InterruptedException ie) {
             Sysout.println("waitForIdle, non-fatal exception caught:");