From 8538800448bf5872fcdbb86609e2969be41b9ffe Mon Sep 17 00:00:00 2001 From: Henry Jen Date: Thu, 5 Jun 2014 13:59:01 -0700 Subject: [PATCH] 8044551: Fix raw and unchecked lint warnings in platform-specific sun.awt files 8044396: Fix raw and unchecked lint warnings in platform-specific sun.java2d.* Reviewed-by: darcy, prr --- .../windows/classes/sun/awt/Win32FontManager.java | 10 ++++------ .../windows/classes/sun/awt/Win32GraphicsDevice.java | 8 ++++---- .../classes/sun/awt/shell/Win32ShellFolder2.java | 12 ++++++------ .../sun/awt/shell/Win32ShellFolderManager2.java | 4 ++-- .../sun/awt/windows/WDragSourceContextPeer.java | 6 ++++-- .../classes/sun/awt/windows/WFontConfiguration.java | 12 ++++++------ .../classes/sun/awt/windows/WFontMetrics.java | 4 ++-- .../classes/sun/awt/windows/WInputMethod.java | 9 +++++---- .../windows/classes/sun/awt/windows/WToolkit.java | 1 + .../windows/classes/sun/java2d/d3d/D3DBlitLoops.java | 6 +++--- .../classes/sun/java2d/d3d/D3DGraphicsDevice.java | 5 ++--- .../sun/java2d/windows/GDIWindowSurfaceData.java | 2 +- .../classes/sun/java2d/windows/WindowsFlags.java | 2 +- 13 files changed, 41 insertions(+), 40 deletions(-) diff --git a/jdk/src/windows/classes/sun/awt/Win32FontManager.java b/jdk/src/windows/classes/sun/awt/Win32FontManager.java index 5e925f3ce45..68136e98f4e 100644 --- a/jdk/src/windows/classes/sun/awt/Win32FontManager.java +++ b/jdk/src/windows/classes/sun/awt/Win32FontManager.java @@ -42,8 +42,6 @@ import sun.awt.windows.WFontConfiguration; import sun.font.FontManager; import sun.font.SunFontManager; import sun.font.TrueTypeFont; -import sun.java2d.HeadlessGraphicsEnvironment; -import sun.java2d.SunGraphicsEnvironment; /** * The X11 implementation of {@link FontManager}. @@ -56,7 +54,7 @@ public class Win32FontManager extends SunFontManager { static { - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { String eudcFile = getEUDCFontFile(); @@ -90,7 +88,7 @@ public class Win32FontManager extends SunFontManager { public Win32FontManager() { super(); - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { /* Register the JRE fonts so that the native platform can @@ -227,7 +225,7 @@ public class Win32FontManager extends SunFontManager { final String[] dirs = getPlatformFontDirs(true); if (dirs.length > 1) { String dir = (String) - AccessController.doPrivileged(new PrivilegedAction() { + AccessController.doPrivileged(new PrivilegedAction() { public Object run() { for (int i=0; i() { public Object run() { File f1 = new File(pathName); String[] ls = f1.list(SunFontManager.getInstance(). diff --git a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java b/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java index d7cfc58e1e8..8ff76dc7e13 100644 --- a/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java +++ b/jdk/src/windows/classes/sun/awt/Win32GraphicsDevice.java @@ -172,7 +172,7 @@ public class Win32GraphicsDevice extends GraphicsDevice implements int max = getMaxConfigs(screen); int defaultPixID = getDefaultPixID(screen); - Vector v = new Vector( max ); + Vector v = new Vector<>( max ); if (defaultPixID == 0) { // Workaround for failing GDI calls defaultConfig = Win32GraphicsConfig.getConfig(this, @@ -437,7 +437,7 @@ public class Win32GraphicsDevice extends GraphicsDevice implements protected native void configDisplayMode(int screen, WindowPeer w, int width, int height, int bitDepth, int refreshRate); - protected native void enumDisplayModes(int screen, ArrayList modes); + protected native void enumDisplayModes(int screen, ArrayList modes); @Override public synchronized DisplayMode getDisplayMode() { @@ -447,12 +447,12 @@ public class Win32GraphicsDevice extends GraphicsDevice implements @Override public synchronized DisplayMode[] getDisplayModes() { - ArrayList modes = new ArrayList(); + ArrayList modes = new ArrayList<>(); enumDisplayModes(screen, modes); int listSize = modes.size(); DisplayMode[] retArray = new DisplayMode[listSize]; for (int i = 0; i < listSize; i++) { - retArray[i] = (DisplayMode)modes.get(i); + retArray[i] = modes.get(i); } return retArray; } diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java index 696633917a2..42975132b15 100644 --- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java +++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java @@ -894,10 +894,10 @@ final class Win32ShellFolder2 extends ShellFolder { // Icons - private static Map smallSystemImages = new HashMap(); - private static Map largeSystemImages = new HashMap(); - private static Map smallLinkedSystemImages = new HashMap(); - private static Map largeLinkedSystemImages = new HashMap(); + private static Map smallSystemImages = new HashMap<>(); + private static Map largeSystemImages = new HashMap<>(); + private static Map smallLinkedSystemImages = new HashMap<>(); + private static Map largeLinkedSystemImages = new HashMap<>(); // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details private static native long getIShellIcon(long pIShellFolder); @@ -970,13 +970,13 @@ final class Win32ShellFolder2 extends ShellFolder { // These are cached per type (using the index in the system image list) int index = getIconIndex(parentIShellIcon, relativePIDL); if (index > 0) { - Map imageCache; + Map imageCache; if (isLink()) { imageCache = getLargeIcon ? largeLinkedSystemImages : smallLinkedSystemImages; } else { imageCache = getLargeIcon ? largeSystemImages : smallSystemImages; } - newIcon = (Image) imageCache.get(Integer.valueOf(index)); + newIcon = imageCache.get(Integer.valueOf(index)); if (newIcon == null) { long hIcon = getIcon(getAbsolutePath(), getLargeIcon); newIcon = makeIcon(hIcon, getLargeIcon); diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java index 269eff2e421..426a0eb77ff 100644 --- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java +++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java @@ -414,14 +414,14 @@ public class Win32ShellFolderManager2 extends ShellFolderManager { return false; } - private static List topFolderList = null; + private static List topFolderList = null; static int compareShellFolders(Win32ShellFolder2 sf1, Win32ShellFolder2 sf2) { boolean special1 = sf1.isSpecial(); boolean special2 = sf2.isSpecial(); if (special1 || special2) { if (topFolderList == null) { - ArrayList tmpTopFolderList = new ArrayList(); + ArrayList tmpTopFolderList = new ArrayList<>(); tmpTopFolderList.add(Win32ShellFolderManager2.getPersonal()); tmpTopFolderList.add(Win32ShellFolderManager2.getDesktop()); tmpTopFolderList.add(Win32ShellFolderManager2.getDrives()); diff --git a/jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java b/jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java index 36280f2e571..360d842834b 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java +++ b/jdk/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java @@ -29,6 +29,7 @@ import java.awt.Component; import java.awt.Cursor; import java.awt.Image; import java.awt.Point; +import java.awt.datatransfer.DataFlavor; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; @@ -76,8 +77,9 @@ final class WDragSourceContextPeer extends SunDragSourceContextPeer { return theInstance; } + @Override protected void startDrag(Transferable trans, - long[] formats, Map formatMap) { + long[] formats, Map formatMap) { long nativeCtxtLocal = 0; @@ -153,7 +155,7 @@ final class WDragSourceContextPeer extends SunDragSourceContextPeer { InputEvent nativeTrigger, int actions, long[] formats, - Map formatMap); + Map formatMap); /** * downcall into native code diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java b/jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java index 7315b97db77..4cd88216bca 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFontConfiguration.java @@ -53,7 +53,7 @@ public final class WFontConfiguration extends FontConfiguration { @Override protected void initReorderMap() { if (encoding.equalsIgnoreCase("windows-31j")) { - localeMap = new Hashtable(); + localeMap = new Hashtable<>(); /* Substitute Mincho for Gothic in this one case. * Note the windows fontconfig files already contain the mapping: * filename.MS_Mincho=MSMINCHO.TTC @@ -67,7 +67,7 @@ public final class WFontConfiguration extends FontConfiguration { localeMap.put("dialoginput.italic.japanese", "MS Mincho"); localeMap.put("dialoginput.bolditalic.japanese", "MS Mincho"); } - reorderMap = new HashMap(); + reorderMap = new HashMap<>(); reorderMap.put("UTF-8.hi", "devanagari"); reorderMap.put("windows-1255", "hebrew"); reorderMap.put("x-windows-874", "thai"); @@ -118,7 +118,7 @@ public final class WFontConfiguration extends FontConfiguration { @Override protected String makeAWTFontName(String platformFontName, String characterSubsetName) { - String windowsCharset = (String) subsetCharsetMap.get(characterSubsetName); + String windowsCharset = subsetCharsetMap.get(characterSubsetName); if (windowsCharset == null) { windowsCharset = "DEFAULT_CHARSET"; } @@ -127,7 +127,7 @@ public final class WFontConfiguration extends FontConfiguration { @Override protected String getEncoding(String awtFontName, String characterSubsetName) { - String encoding = (String) subsetEncodingMap.get(characterSubsetName); + String encoding = subsetEncodingMap.get(characterSubsetName); if (encoding == null) { encoding = "default"; } @@ -174,8 +174,8 @@ public final class WFontConfiguration extends FontConfiguration { return fontName; } - private static HashMap subsetCharsetMap = new HashMap(); - private static HashMap subsetEncodingMap = new HashMap(); + private static HashMap subsetCharsetMap = new HashMap<>(); + private static HashMap subsetEncodingMap = new HashMap<>(); private static String textInputCharset; private void initTables(String defaultEncoding) { diff --git a/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java b/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java index 01dae69c91a..8d8a9515df7 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java +++ b/jdk/src/windows/classes/sun/awt/windows/WFontMetrics.java @@ -199,10 +199,10 @@ final class WFontMetrics extends FontMetrics { native void init(); - static Hashtable table = new Hashtable(); + static Hashtable table = new Hashtable<>(); static FontMetrics getFontMetrics(Font font) { - FontMetrics fm = (FontMetrics)table.get(font); + FontMetrics fm = table.get(font); if (fm == null) { table.put(font, fm = new WFontMetrics(font)); } diff --git a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java index de7c478c087..1d3c413dfc3 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java +++ b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java @@ -86,26 +86,27 @@ final class WInputMethod extends InputMethodAdapter // Initialize highlight mapping table static { + @SuppressWarnings({"rawtypes", "unchecked"}) Map styles[] = new Map[4]; HashMap map; // UNSELECTED_RAW_TEXT_HIGHLIGHT - map = new HashMap(1); + map = new HashMap<>(1); map.put(TextAttribute.INPUT_METHOD_UNDERLINE, TextAttribute.UNDERLINE_LOW_DOTTED); styles[0] = Collections.unmodifiableMap(map); // SELECTED_RAW_TEXT_HIGHLIGHT - map = new HashMap(1); + map = new HashMap<>(1); map.put(TextAttribute.INPUT_METHOD_UNDERLINE, TextAttribute.UNDERLINE_LOW_GRAY); styles[1] = Collections.unmodifiableMap(map); // UNSELECTED_CONVERTED_TEXT_HIGHLIGHT - map = new HashMap(1); + map = new HashMap<>(1); map.put(TextAttribute.INPUT_METHOD_UNDERLINE, TextAttribute.UNDERLINE_LOW_DOTTED); styles[2] = Collections.unmodifiableMap(map); // SELECTED_CONVERTED_TEXT_HIGHLIGHT - map = new HashMap(4); + map = new HashMap<>(4); Color navyBlue = new Color(0, 0, 128); map.put(TextAttribute.FOREGROUND, navyBlue); map.put(TextAttribute.BACKGROUND, Color.white); diff --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java index 2a27c2df9cc..d33b991d7f8 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java +++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java @@ -843,6 +843,7 @@ public final class WToolkit extends SunToolkit implements Runnable { } @Override + @SuppressWarnings("unchecked") public T createDragGestureRecognizer(Class abstractRecognizerClass, DragSource ds, Component c, int srcActions, diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java b/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java index b7b09e7b6dd..94495da083e 100644 --- a/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java +++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java @@ -717,7 +717,7 @@ class D3DTextureToSurfaceTransform extends TransformBlit { class D3DGeneralBlit extends Blit { private Blit performop; - private WeakReference srcTmp; + private WeakReference srcTmp; D3DGeneralBlit(SurfaceType dstType, CompositeType compType, @@ -739,7 +739,7 @@ class D3DGeneralBlit extends Blit { SurfaceData cachedSrc = null; if (srcTmp != null) { // use cached intermediate surface, if available - cachedSrc = (SurfaceData)srcTmp.get(); + cachedSrc = srcTmp.get(); } // convert source to IntArgbPre @@ -752,7 +752,7 @@ class D3DGeneralBlit extends Blit { if (src != cachedSrc) { // cache the intermediate surface - srcTmp = new WeakReference(src); + srcTmp = new WeakReference<>(src); } } } diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java index bf6134648c3..d30f1720bfc 100644 --- a/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java +++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java @@ -41,7 +41,6 @@ import sun.awt.Win32GraphicsDevice; import sun.awt.windows.WWindowPeer; import sun.java2d.pipe.hw.ContextCapabilities; import sun.java2d.windows.WindowsFlags; -import static sun.java2d.pipe.BufferedOpCodes.*; import static sun.java2d.d3d.D3DContext.D3DContextCaps.*; import sun.java2d.d3d.D3DContext.D3DContextCaps; @@ -383,9 +382,9 @@ public class D3DGraphicsDevice extends Win32GraphicsDevice { } private static native void enumDisplayModesNative(int screen, - ArrayList modes); + ArrayList modes); @Override - protected void enumDisplayModes(final int screen, final ArrayList modes) { + protected void enumDisplayModes(final int screen, final ArrayList modes) { D3DRenderQueue rq = D3DRenderQueue.getInstance(); rq.lock(); try { diff --git a/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java index 49d9261bbd3..04ba1464001 100644 --- a/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java +++ b/jdk/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java @@ -75,7 +75,7 @@ public class GDIWindowSurfaceData extends SurfaceData { public static final SurfaceType ThreeByteBgrGdi = SurfaceType.ThreeByteBgr.deriveSubType(DESC_GDI); - private static native void initIDs(Class xorComp); + private static native void initIDs(Class xorComp); static { initIDs(XORComposite.class); diff --git a/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java b/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java index a6d265fd3f8..b8fc7510471 100644 --- a/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java +++ b/jdk/src/windows/classes/sun/java2d/windows/WindowsFlags.java @@ -201,7 +201,7 @@ public class WindowsFlags { private static void initJavaFlags() { java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() + new java.security.PrivilegedAction() { public Object run() { magPresent = getBooleanProp(