--- old/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java	2014-12-04 12:31:01.000000000 +0300
+++ new/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java	2014-12-04 12:31:01.000000000 +0300
@@ -1,4 +1,26 @@
 /*
+ * Copyright (c) 2002, 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 1.3 02/06/25
   @bug 4902933
   @summary Test that selecting the current item sends an ItemEvent
@@ -28,7 +50,6 @@
 import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
-import sun.awt.SunToolkit;
 
 //Automated tests should run as applet tests if possible because they
 // get their environments cleaned up, including AWT threads, any
@@ -136,7 +157,7 @@
         robot.setAutoDelay(250);
         robot.mousePress(InputEvent.BUTTON1_MASK);
         robot.mouseRelease(InputEvent.BUTTON1_MASK);
-        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+        robot.waitForIdle();
         synchronized(lock) {
             lock.notify();
         }