diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java index 82ff8899349..f8dd9dfc380 100644 --- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -649,8 +649,9 @@ public abstract class DataTransferer { * The map keys are sorted according to the native formats preference * order. */ - public SortedMap getFormatsForTransferable(Transferable contents, - FlavorTable map) { + public SortedMap getFormatsForTransferable( + Transferable contents, FlavorTable map) + { DataFlavor[] flavors = contents.getTransferDataFlavors(); if (flavors == null) { return new TreeMap(); @@ -686,9 +687,13 @@ public abstract class DataTransferer { * DataFlavors and data formats * @throws NullPointerException if flavors or map is null */ - public SortedMap getFormatsForFlavors(DataFlavor[] flavors, FlavorTable map) { - Map formatMap = new HashMap(flavors.length); - Map textPlainMap = new HashMap(flavors.length); + public SortedMap getFormatsForFlavors( + DataFlavor[] flavors, FlavorTable map) + { + Map formatMap = + new HashMap <> (flavors.length); + Map textPlainMap = + new HashMap <> (flavors.length); // Maps formats to indices that will be used to sort the formats // according to the preference order. // Larger index value corresponds to the more preferable format. diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java index 78dc3413156..cfc2405ef63 100644 --- a/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java +++ b/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java @@ -52,6 +52,7 @@ import java.util.SortedMap; import sun.awt.SunToolkit; import sun.awt.datatransfer.DataTransferer; +import java.awt.datatransfer.DataFlavor; /** *

@@ -126,9 +127,9 @@ public abstract class SunDragSourceContextPeer implements DragSourceContextPeer dragImageOffset = p; Transferable transferable = getDragSourceContext().getTransferable(); - SortedMap formatMap = DataTransferer.getInstance().getFormatsForTransferable - (transferable, DataTransferer.adaptFlavorMap - (getTrigger().getDragSource().getFlavorMap())); + SortedMap formatMap = DataTransferer.getInstance(). + getFormatsForTransferable(transferable, DataTransferer.adaptFlavorMap + (getTrigger().getDragSource().getFlavorMap())); long[] formats = DataTransferer.getInstance(). keysToLongArray(formatMap); startDrag(transferable, formats, formatMap); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XClipboard.java b/jdk/src/solaris/classes/sun/awt/X11/XClipboard.java index 9a0a6c938de..44ee617783b 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XClipboard.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XClipboard.java @@ -26,6 +26,7 @@ package sun.awt.X11; import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.DataFlavor; import java.util.SortedMap; import java.io.IOException; import java.security.AccessController; @@ -83,7 +84,8 @@ public final class XClipboard extends SunClipboard implements OwnershipListener } protected synchronized void setContentsNative(Transferable contents) { - SortedMap formatMap = DataTransferer.getInstance().getFormatsForTransferable + SortedMap formatMap = + DataTransferer.getInstance().getFormatsForTransferable (contents, DataTransferer.adaptFlavorMap(flavorMap)); long[] formats = DataTransferer.keysToLongArray(formatMap); diff --git a/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java index f744ee2c74b..8a6106ad57b 100644 --- a/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java +++ b/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java @@ -40,6 +40,7 @@ import sun.java2d.DestSurfaceProvider; import sun.java2d.InvalidPipeException; import sun.java2d.Surface; import sun.java2d.pipe.RenderQueue; +import sun.java2d.pipe.BufferedContext; import sun.java2d.pipe.hw.AccelGraphicsConfig; import sun.java2d.pipe.hw.AccelSurface; import sun.security.action.GetPropertyAction; @@ -310,7 +311,7 @@ public abstract class TranslucentWindowPainter { RenderQueue rq = as.getContext().getRenderQueue(); rq.lock(); try { - as.getContext().validateContext(as); + BufferedContext.validateContext(as); rq.flushAndInvokeNow(new Runnable() { public void run() { long psdops = as.getNativeOps(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java b/jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java index 5a4ce2a18bb..4b346ca80a8 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java +++ b/jdk/src/windows/classes/sun/awt/windows/WBufferStrategy.java @@ -37,7 +37,7 @@ import java.awt.Component; */ public class WBufferStrategy { - private static native void initIDs(Class componentClass); + private static native void initIDs(Class componentClass); static { initIDs(Component.class); diff --git a/jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java b/jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java index 28a2a05d2bc..8ecc83ed866 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WChoicePeer.java @@ -84,6 +84,7 @@ class WChoicePeer extends WComponentPeer implements ChoicePeer { native void create(WComponentPeer parent); + @SuppressWarnings("deprecation") void initialize() { Choice opt = (Choice)target; int itemCount = opt.getItemCount(); @@ -116,6 +117,7 @@ class WChoicePeer extends WComponentPeer implements ChoicePeer { super.initialize(); } + @SuppressWarnings("deprecation") protected void disposeImpl() { // TODO: we should somehow reset the listener when the choice // is moved to another toplevel without destroying its peer. diff --git a/jdk/src/windows/classes/sun/awt/windows/WClipboard.java b/jdk/src/windows/classes/sun/awt/windows/WClipboard.java index 62570ac6632..602d228f342 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WClipboard.java +++ b/jdk/src/windows/classes/sun/awt/windows/WClipboard.java @@ -71,17 +71,14 @@ public class WClipboard extends SunClipboard { // Get all of the target formats into which the Transferable can be // translated. Then, for each format, translate the data and post // it to the Clipboard. - Map formatMap = WDataTransferer.getInstance(). + Map formatMap = WDataTransferer.getInstance(). getFormatsForTransferable(contents, flavorMap); openClipboard(this); try { - for (Iterator iter = formatMap.keySet().iterator(); - iter.hasNext(); ) { - Long lFormat = (Long)iter.next(); - long format = lFormat.longValue(); - DataFlavor flavor = (DataFlavor)formatMap.get(lFormat); + for (Long format : formatMap.keySet()) { + DataFlavor flavor = formatMap.get(format); try { byte[] bytes = WDataTransferer.getInstance(). diff --git a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java index a482fd9ca86..6f788c2ac5d 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java @@ -222,7 +222,7 @@ public abstract class WComponentPeer extends WObjectPeer updateWindow(); // make sure paint events are transferred to main event queue // for coalescing - WToolkit.getWToolkit().flushPendingEvents(); + SunToolkit.flushPendingEvents(); // paint the damaged area paintArea.paint(target, shouldClearRectBeforePaint()); } @@ -320,6 +320,7 @@ public abstract class WComponentPeer extends WObjectPeer native void nativeHandleEvent(AWTEvent e); + @SuppressWarnings("fallthrough") public void handleEvent(AWTEvent e) { int id = e.getID(); @@ -549,6 +550,7 @@ public abstract class WComponentPeer extends WObjectPeer // fallback default font object final static Font defaultFont = new Font(Font.DIALOG, Font.PLAIN, 12); + @SuppressWarnings("deprecation") public Graphics getGraphics() { if (isDisposed()) { return null; @@ -656,6 +658,7 @@ public abstract class WComponentPeer extends WObjectPeer } // TODO: consider moving it to KeyboardFocusManagerPeerImpl + @SuppressWarnings("deprecation") public boolean requestFocus(Component lightweightChild, boolean temporary, boolean focusedWindowChangeAllowed, long time, CausedFocusEvent.Cause cause) @@ -1058,6 +1061,7 @@ public abstract class WComponentPeer extends WObjectPeer // in the browser on Vista when DWM is enabled. // @return true if the toplevel container is not an EmbeddedFrame or // if this EmbeddedFrame is acceleration capable, false otherwise + @SuppressWarnings("deprecation") private static final boolean isContainingTopLevelAccelCapable(Component c) { while (c != null && !(c instanceof WEmbeddedFrame)) { c = c.getParent(); @@ -1072,6 +1076,7 @@ public abstract class WComponentPeer extends WObjectPeer * Applies the shape to the native component window. * @since 1.7 */ + @SuppressWarnings("deprecation") public void applyShape(Region shape) { if (shapeLog.isLoggable(PlatformLogger.FINER)) { shapeLog.finer( diff --git a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java index 47dcf275430..10888ed6e2b 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDataTransferer.java @@ -107,13 +107,15 @@ public class WDataTransferer extends DataTransferer { "DIBV5" }; - private static final Map predefinedClipboardNameMap; + private static final Map predefinedClipboardNameMap; static { - Map tempMap = new HashMap(predefinedClipboardNames.length, 1.0f); + Map tempMap = + new HashMap <> (predefinedClipboardNames.length, 1.0f); for (int i = 1; i < predefinedClipboardNames.length; i++) { tempMap.put(predefinedClipboardNames[i], Long.valueOf(i)); } - predefinedClipboardNameMap = Collections.synchronizedMap(tempMap); + predefinedClipboardNameMap = + Collections.synchronizedMap(tempMap); } /** @@ -135,7 +137,7 @@ public class WDataTransferer extends DataTransferer { public static final long CF_FILEGROUPDESCRIPTORA = registerClipboardFormat("FileGroupDescriptor"); //CF_FILECONTENTS supported as mandatory associated clipboard - private static final Long L_CF_LOCALE = (Long) + private static final Long L_CF_LOCALE = predefinedClipboardNameMap.get(predefinedClipboardNames[CF_LOCALE]); private static final DirectColorModel directColorModel = @@ -168,8 +170,11 @@ public class WDataTransferer extends DataTransferer { return transferer; } - public SortedMap getFormatsForFlavors(DataFlavor[] flavors, FlavorTable map) { - SortedMap retval = super.getFormatsForFlavors(flavors, map); + public SortedMap getFormatsForFlavors( + DataFlavor[] flavors, FlavorTable map) + { + SortedMap retval = + super.getFormatsForFlavors(flavors, map); // The Win32 native code does not support exporting LOCALE data, nor // should it. @@ -266,7 +271,7 @@ public class WDataTransferer extends DataTransferer { } protected Long getFormatForNativeAsLong(String str) { - Long format = (Long)predefinedClipboardNameMap.get(str); + Long format = predefinedClipboardNameMap.get(str); if (format == null) { format = Long.valueOf(registerClipboardFormat(str)); } diff --git a/jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java b/jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java index 525d42966bd..3c8f8c0f101 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java @@ -238,6 +238,7 @@ class WDesktopProperties { * Called by WToolkit when Windows settings change-- we (re)load properties and * set new values. */ + @SuppressWarnings("unchecked") synchronized Map getProperties() { ThemeReader.flush(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java b/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java index a5d2c2742b8..716a77f1591 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDialogPeer.java @@ -87,6 +87,7 @@ class WDialogPeer extends WWindowPeer implements DialogPeer { } } + @SuppressWarnings("deprecation") public void hide() { Dialog dlg = (Dialog)target; if (dlg.getModalityType() != Dialog.ModalityType.MODELESS) { diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java index 4e4e3838da5..b0f9cd3279d 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java +++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java @@ -27,14 +27,12 @@ package sun.awt.windows; 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 @@ public class WEmbeddedFrame extends EmbeddedFrame { 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 @@ public class WEmbeddedFrame extends EmbeddedFrame { } } + @SuppressWarnings("deprecation") public void addNotify() { if (getPeer() == null) { WToolkit toolkit = (WToolkit)Toolkit.getDefaultToolkit(); @@ -134,8 +133,8 @@ public class WEmbeddedFrame extends EmbeddedFrame { 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 @@ public class WEmbeddedFrame extends EmbeddedFrame { 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 @@ public class WEmbeddedFrame extends EmbeddedFrame { 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 class WEmbeddedFrame extends EmbeddedFrame { public void activateEmbeddingTopLevel() { } + @SuppressWarnings("deprecation") public void synthesizeWindowActivation(final boolean doActivate) { if (!doActivate || EventQueue.isDispatchThread()) { ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(doActivate); diff --git a/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java b/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java index ed216c00d2c..56568dcf3a1 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java @@ -167,7 +167,7 @@ public class WFileDialogPeer extends WWindowPeer implements FileDialogPeer { WToolkit.executeOnEventHandlerThread(fileDialog, new Runnable() { public void run() { - fileDialog.hide(); + fileDialog.setVisible(false); } }); } // handleSelected() @@ -182,16 +182,16 @@ public class WFileDialogPeer extends WWindowPeer implements FileDialogPeer { WToolkit.executeOnEventHandlerThread(fileDialog, new Runnable() { public void run() { - fileDialog.hide(); + fileDialog.setVisible(false); } }); } // handleCancel() //This whole static block is a part of 4152317 fix static { - String filterString = (String) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + String filterString = AccessController.doPrivileged( + new PrivilegedAction() { + public String run() { try { ResourceBundle rb = ResourceBundle.getBundle("sun.awt.windows.awtLocalization"); return rb.getString("allFiles"); diff --git a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java index 94cde03850f..368b8f60696 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java @@ -24,25 +24,12 @@ */ package sun.awt.windows; -import java.util.Vector; - import java.awt.*; import java.awt.peer.*; -import java.awt.image.ImageObserver; - -import java.awt.image.Raster; -import java.awt.image.DataBuffer; -import java.awt.image.DataBufferInt; -import java.awt.image.BufferedImage; - -import java.awt.image.ColorModel; - -import sun.awt.image.ImageRepresentation; -import sun.awt.image.IntegerComponentRaster; -import sun.awt.image.ToolkitImage; -import sun.awt.im.*; -import sun.awt.Win32GraphicsDevice; import sun.awt.AWTAccessor; +import sun.awt.im.InputMethodManager; +import java.security.AccessController; +import sun.security.action.GetPropertyAction; class WFramePeer extends WWindowPeer implements FramePeer { @@ -71,9 +58,9 @@ class WFramePeer extends WWindowPeer implements FramePeer { private native void clearMaximizedBounds(); private static final boolean keepOnMinimize = "true".equals( - (String)java.security.AccessController.doPrivileged( - new sun.security.action.GetPropertyAction( - "sun.awt.keepWorkingSetOnMinimize"))); + AccessController.doPrivileged( + new GetPropertyAction( + "sun.awt.keepWorkingSetOnMinimize"))); public void setMaximizedBounds(Rectangle b) { if (b == null) { diff --git a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java index d1423a31af5..dbecc230de0 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java +++ b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java @@ -82,12 +82,12 @@ public class WInputMethod extends InputMethodAdapter private final static boolean COMMIT_INPUT = true; private final static boolean DISCARD_INPUT = false; - private static Map[] highlightStyles; + private static Map [] highlightStyles; // Initialize highlight mapping table static { - Map styles[] = new Map[4]; - HashMap map; + Map styles[] = new Map[4]; + HashMap map; // UNSELECTED_RAW_TEXT_HIGHLIGHT map = new HashMap(1); @@ -410,7 +410,7 @@ public class WInputMethod extends InputMethodAdapter /** * @see java.awt.Toolkit#mapInputMethodHighlight */ - static Map mapInputMethodHighlight(InputMethodHighlight highlight) { + static Map mapInputMethodHighlight(InputMethodHighlight highlight) { int index; int state = highlight.getState(); if (state == InputMethodHighlight.RAW_TEXT) { diff --git a/jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java b/jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java index 1c71b62903f..716ab5dd26c 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java @@ -158,9 +158,9 @@ class WMenuItemPeer extends WObjectPeer implements MenuItemPeer { private static Font defaultMenuFont; static { - defaultMenuFont = (Font) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + defaultMenuFont = AccessController.doPrivileged( + new PrivilegedAction () { + public Font run() { try { ResourceBundle rb = ResourceBundle.getBundle("sun.awt.windows.awtLocalization"); return Font.decode(rb.getString("menuFont")); diff --git a/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java b/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java index 6beda8b4809..08e73c56825 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPageDialog.java @@ -55,6 +55,7 @@ public class WPageDialog extends WPrintDialog { this.painter = painter; } + @SuppressWarnings("deprecation") public void addNotify() { synchronized(getTreeLock()) { Container parent = getParent(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java b/jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java index e1fb9b022e6..707bc3f683a 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPageDialogPeer.java @@ -49,7 +49,7 @@ public class WPageDialogPeer extends WPrintDialogPeer { // but if it is we need to trap it so the thread does // not hide is called and the thread doesn't hang. } - ((WPrintDialog)target).hide(); + ((WPrintDialog)target).setVisible(false); } }).start(); } diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java b/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java index 0708d921ae1..af1a5dcb83e 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPrintDialog.java @@ -53,6 +53,7 @@ public class WPrintDialog extends Dialog { // Use native code to circumvent access restrictions on Component.peer protected native void setPeer(ComponentPeer peer); + @SuppressWarnings("deprecation") public void addNotify() { synchronized(getTreeLock()) { Container parent = getParent(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java b/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java index 769e73a6828..988098eb648 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java @@ -73,7 +73,7 @@ public class WPrintDialogPeer extends WWindowPeer implements DialogPeer { // but if it is we need to trap it so the thread does // not hide is called and the thread doesn't hang. } - ((WPrintDialog)target).hide(); + ((WPrintDialog)target).setVisible(false); } }).start(); } diff --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java index 26b234f1a9d..0c0cdd47aa7 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java +++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java @@ -74,7 +74,7 @@ public class WToolkit extends SunToolkit implements Runnable { WClipboard clipboard; // cache of font peers - private Hashtable cacheFontPeer; + private Hashtable cacheFontPeer; // Windows properties private WDesktopProperties wprops; @@ -110,10 +110,10 @@ public class WToolkit extends SunToolkit implements Runnable { log.fine("Win version: " + getWindowsVersion()); } - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() + AccessController.doPrivileged( + new PrivilegedAction () { - public Object run() { + public Void run() { String browserProp = System.getProperty("browser"); if (browserProp != null && browserProp.equals("sun.plugin")) { disableCustomPalette(); @@ -261,8 +261,8 @@ public class WToolkit extends SunToolkit implements Runnable { } private final void registerShutdownHook() { - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { ThreadGroup currentTG = Thread.currentThread().getThreadGroup(); ThreadGroup parentTG = currentTG.getParent(); @@ -399,6 +399,7 @@ public class WToolkit extends SunToolkit implements Runnable { return peer; } + @SuppressWarnings("deprecation") public void disableBackgroundErase(Canvas canvas) { WCanvasPeer peer = (WCanvasPeer)canvas.getPeer(); if (peer == null) { @@ -592,7 +593,7 @@ public class WToolkit extends SunToolkit implements Runnable { FontPeer retval = null; String lcName = name.toLowerCase(); if (null != cacheFontPeer) { - retval = (FontPeer)cacheFontPeer.get(lcName + style); + retval = cacheFontPeer.get(lcName + style); if (null != retval) { return retval; } @@ -600,7 +601,7 @@ public class WToolkit extends SunToolkit implements Runnable { retval = new WFontPeer(name, style); if (retval != null) { if (null == cacheFontPeer) { - cacheFontPeer = new Hashtable(5, (float)0.9); + cacheFontPeer = new Hashtable<>(5, 0.9f); } if (null != cacheFontPeer) { cacheFontPeer.put(lcName + style, retval); @@ -698,7 +699,9 @@ public class WToolkit extends SunToolkit implements Runnable { /** * Returns a style map for the input method highlight. */ - public Map mapInputMethodHighlight(InputMethodHighlight highlight) { + public Map mapInputMethodHighlight( + InputMethodHighlight highlight) + { return WInputMethod.mapInputMethodHighlight(highlight); } @@ -968,12 +971,14 @@ public class WToolkit extends SunToolkit implements Runnable { return !Win32GraphicsEnvironment.isDWMCompositionEnabled(); } + @SuppressWarnings("deprecation") public void grab(Window w) { if (w.getPeer() != null) { ((WWindowPeer)w.getPeer()).grab(); } } + @SuppressWarnings("deprecation") public void ungrab(Window w) { if (w.getPeer() != null) { ((WWindowPeer)w.getPeer()).ungrab(); diff --git a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java index cdd46edc9be..450535e7d72 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java @@ -92,7 +92,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, } // WComponentPeer overrides - + @SuppressWarnings("unchecked") protected void disposeImpl() { AppContext appContext = SunToolkit.targetToAppContext(target); synchronized (appContext) { @@ -378,6 +378,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, return modalBlocker != null; } + @SuppressWarnings("deprecation") public void setModalBlocked(Dialog dialog, boolean blocked) { synchronized (((Component)getTarget()).getTreeLock()) // State lock should always be after awtLock { @@ -417,6 +418,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, * The list is sorted by the time of activation, so the latest * active window is always at the end. */ + @SuppressWarnings("unchecked") public static long[] getActiveWindowHandles() { AppContext appContext = AppContext.getAppContext(); synchronized (appContext) { @@ -571,6 +573,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, super.print(g); } + @SuppressWarnings("deprecation") private void replaceSurfaceDataRecursively(Component c) { if (c instanceof Container) { for (Component child : ((Container)c).getComponents()) { @@ -691,13 +694,13 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, // its shape only. To restore the correct visual appearance // of the window (i.e. w/ the correct shape) we have to reset // the shape. - Shape shape = ((Window)target).getShape(); + Shape shape = target.getShape(); if (shape != null) { - ((Window)target).setShape(shape); + target.setShape(shape); } } - if (((Window)target).isVisible()) { + if (target.isVisible()) { updateWindow(true); } } @@ -730,6 +733,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, * then the method registers ActiveWindowListener, GuiDisposedListener listeners; * it executes the initilialization only once per AppContext. */ + @SuppressWarnings("unchecked") private static void initActiveWindowsTracking(Window w) { AppContext appContext = AppContext.getAppContext(); synchronized (appContext) { @@ -774,6 +778,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, * updates the list of active windows per AppContext, so the latest active * window is always at the end of the list. The list is stored in AppContext. */ + @SuppressWarnings( value = {"deprecation", "unchecked"}) private static class ActiveWindowListener implements PropertyChangeListener { public void propertyChange(PropertyChangeEvent e) { Window w = (Window)e.getNewValue();