--- old/java/awt/Choice/GrabLockTest/GrabLockTest.java	2014-12-04 12:31:00.000000000 +0300
+++ new/java/awt/Choice/GrabLockTest/GrabLockTest.java	2014-12-04 12:30:59.000000000 +0300
@@ -1,23 +1,37 @@
 /*
-  test
+ * Copyright (c) 2003, 2014, 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 4800638
   @summary Tests that Choice does not lock the Desktop
-  @run applet GrabLockTest.html
+  @run main GrabLockTest
 */
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
-import sun.awt.SunToolkit;
 
-public class GrabLockTest extends Applet
+public class GrabLockTest 
 {
-    //Declare things used in the test, like buttons and labels here
-
-    public void init()
-    {
-    }//End  init()
-
-    public void start ()
+    public static void main (String args[])
     {
         Frame frame = new TestFrame();
     }
@@ -42,31 +56,31 @@
             robot.setAutoWaitForIdle(true);
             robot.setAutoDelay(50);
 
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
 
             Point pt = choice.getLocationOnScreen();
             robot.mouseMove(pt.x + choice.getWidth() - choice.getHeight()/2,
                 pt.y + choice.getHeight()/2);
             robot.mousePress(InputEvent.BUTTON1_MASK);
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
             robot.mouseMove(pt.x + choice.getWidth()/2,
                 pt.y + choice.getHeight()*2);
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
             robot.mousePress(InputEvent.BUTTON2_MASK);
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
             Point pt1 = panel.getLocationOnScreen();
             robot.mouseMove(pt1.x + panel.getWidth()/2,
                 pt1.y + panel.getHeight()/2);
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
             robot.mouseRelease(InputEvent.BUTTON1_MASK);
             robot.mouseRelease(InputEvent.BUTTON2_MASK);
 
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
 
             robot.mousePress(InputEvent.BUTTON1_MASK);
             robot.delay(30);
             robot.mouseRelease(InputEvent.BUTTON1_MASK);
-            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            robot.waitForIdle();
             if (nPressed == 0) {
                 robot.keyPress(KeyEvent.VK_ESCAPE);
                 robot.keyRelease(KeyEvent.VK_ESCAPE);
@@ -76,7 +90,7 @@
             throw new RuntimeException("The test was not completed.\n\n" + e);
         }
 
-    }// start()
+    }
 
     public int nPressed = 0;