--- old/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java 2011-12-08 12:47:09.321349600 +0400 +++ new/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java 2011-12-08 12:47:08.800283400 +0400 @@ -27,14 +27,12 @@ import sun.awt.*; import java.awt.*; -import java.awt.event.*; import java.awt.peer.ComponentPeer; -import java.util.*; -import java.awt.color.*; import java.awt.image.*; import sun.awt.image.ByteInterleavedRaster; import sun.security.action.GetPropertyAction; -import java.lang.reflect.*; +import java.security.PrivilegedAction; +import java.security.AccessController; public class WEmbeddedFrame extends EmbeddedFrame { @@ -52,8 +50,8 @@ private static int pScale = 0; private static final int MAX_BAND_SIZE = (1024*30); - private static String printScale = (String) java.security.AccessController - .doPrivileged(new GetPropertyAction("sun.java2d.print.pluginscalefactor")); + private static String printScale = AccessController.doPrivileged( + new GetPropertyAction("sun.java2d.print.pluginscalefactor")); public WEmbeddedFrame() { this((long)0); @@ -75,6 +73,7 @@ } } + @SuppressWarnings("deprecation") public void addNotify() { if (getPeer() == null) { WToolkit toolkit = (WToolkit)Toolkit.getDefaultToolkit(); @@ -134,8 +133,8 @@ bandHeight = Math.min(MAX_BAND_SIZE/bandWidth, frameHeight); - imgWid = (int)(bandWidth * xscale); - imgHgt = (int)(bandHeight * yscale); + imgWid = bandWidth * xscale; + imgHgt = bandHeight * yscale; bandImage = new BufferedImage(imgWid, imgHgt, BufferedImage.TYPE_3BYTE_BGR); } @@ -159,7 +158,7 @@ if ((bandTop+bandHeight) > frameHeight) { // last band currBandHeight = frameHeight - bandTop; - currImgHeight = (int)(currBandHeight*yscale); + currImgHeight = currBandHeight*yscale; // multiply by 3 because the image is a 3 byte BGR imageOffset = imgWid*(imgHgt-currImgHeight)*3; @@ -179,9 +178,9 @@ if (printScale == null) { // if no system property is specified, // check for environment setting - printScale = (String) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + printScale = AccessController.doPrivileged( + new PrivilegedAction() { + public String run() { return System.getenv("JAVA2D_PLUGIN_PRINT_SCALE"); } } @@ -226,6 +225,7 @@ public void activateEmbeddingTopLevel() { } + @SuppressWarnings("deprecation") public void synthesizeWindowActivation(final boolean doActivate) { if (!doActivate || EventQueue.isDispatchThread()) { ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(doActivate);