--- old/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java	2014-12-04 12:31:04.000000000 +0300
+++ new/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java	2014-12-04 12:31:04.000000000 +0300
@@ -8,14 +8,12 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import sun.awt.SunToolkit;
 import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.lang.reflect.InvocationTargetException;
 
 public class ModalDialogInitialFocusTest extends Applet {
     Robot robot;
-    SunToolkit toolkit;
 
     Dialog dialog = new Dialog((Window)null, "Test Dialog", Dialog.ModalityType.TOOLKIT_MODAL);
     Button button = new Button("button");
@@ -44,7 +42,6 @@
     }
 
     public void start() {
-        toolkit = (SunToolkit)Toolkit.getDefaultToolkit();
 
         dialog.setLayout(new FlowLayout());
         dialog.add(button);
@@ -69,7 +66,7 @@
 
         waitTillShown(dialog);
 
-        toolkit.realSync(); // wait for focus events
+        robot.waitForIdle();
 
         dialog.dispose();