--- old/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2015-03-04 01:21:27.000000000 +0300
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java	2015-03-04 01:21:27.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -36,6 +36,8 @@
 import java.beans.PropertyChangeListener;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+
+import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
 import sun.awt.AWTAutoShutdown;
 import sun.awt.AWTPermissions;
@@ -426,9 +428,8 @@
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void disableBackgroundErase(Canvas canvas) {
-        WCanvasPeer peer = (WCanvasPeer)canvas.getPeer();
+        WCanvasPeer peer = AWTAccessor.getComponentAccessor().getPeer(canvas);
         if (peer == null) {
             throw new IllegalStateException("Canvas must have a valid peer");
         }
@@ -1088,18 +1089,18 @@
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void grab(Window w) {
-        if (w.getPeer() != null) {
-            ((WWindowPeer)w.getPeer()).grab();
+        final Object peer = AWTAccessor.getComponentAccessor().getPeer(w);
+        if (peer != null) {
+            ((WWindowPeer) peer).grab();
         }
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void ungrab(Window w) {
-        if (w.getPeer() != null) {
-           ((WWindowPeer)w.getPeer()).ungrab();
+        final Object peer = AWTAccessor.getComponentAccessor().getPeer(w);
+        if (peer != null) {
+            ((WWindowPeer) peer).ungrab();
         }
     }