src/java.desktop/windows/classes/sun/awt/windows/WChoicePeer.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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.  Oracle designates this

@@ -28,10 +28,12 @@
 import java.awt.peer.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.awt.event.WindowAdapter;
+
+import sun.awt.AWTAccessor;
 import sun.awt.SunToolkit;
 
 final class WChoicePeer extends WComponentPeer implements ChoicePeer {
 
     // WComponentPeer overrides

@@ -92,11 +94,10 @@
 
     @Override
     native void create(WComponentPeer parent);
 
     @Override
-    @SuppressWarnings("deprecation")
     void initialize() {
         Choice opt = (Choice)target;
         int itemCount = opt.getItemCount();
         if (itemCount > 0) {
             String[] items = new String[itemCount];

@@ -109,11 +110,12 @@
             }
         }
 
         Window parentWindow = SunToolkit.getContainingWindow((Component)target);
         if (parentWindow != null) {
-            WWindowPeer wpeer = (WWindowPeer)parentWindow.getPeer();
+            final WWindowPeer wpeer = AWTAccessor.getComponentAccessor()
+                                                 .getPeer(parentWindow);
             if (wpeer != null) {
                 windowListener = new WindowAdapter() {
                         @Override
                         public void windowIconified(WindowEvent e) {
                             closeList();

@@ -128,17 +130,17 @@
         }
         super.initialize();
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     protected void disposeImpl() {
         // TODO: we should somehow reset the listener when the choice
         // is moved to another toplevel without destroying its peer.
         Window parentWindow = SunToolkit.getContainingWindow((Component)target);
         if (parentWindow != null) {
-            WWindowPeer wpeer = (WWindowPeer)parentWindow.getPeer();
+            final WWindowPeer wpeer = AWTAccessor.getComponentAccessor()
+                                                .getPeer(parentWindow);
             if (wpeer != null) {
                 wpeer.removeWindowListener(windowListener);
             }
         }
         super.disposeImpl();