changeset 9157:1aa2dbdbacee

8032047: Fix static lint warnings in client libraries 8032048: Add static lint warning to build of jdk repository Reviewed-by: pchelko, serb, erikj
author darcy
date Wed, 22 Jan 2014 23:20:58 -0800
parents 0312741183c9
children 590f3b58e7e3
files make/Setup.gmk src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java src/share/classes/com/sun/java/browser/dom/DOMService.java src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java src/share/classes/java/awt/image/AffineTransformOp.java src/share/classes/java/awt/image/LookupOp.java src/share/classes/javax/swing/AbstractButton.java src/share/classes/javax/swing/DefaultDesktopManager.java src/share/classes/javax/swing/JFormattedTextField.java src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java src/share/classes/javax/swing/text/StyledEditorKit.java src/share/classes/javax/swing/text/html/HTMLEditorKit.java src/share/classes/javax/swing/text/html/StyleSheet.java src/share/classes/javax/swing/text/html/parser/ParserDelegator.java src/share/classes/javax/swing/text/rtf/RTFReader.java src/share/classes/sun/awt/PlatformFont.java src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java src/share/classes/sun/awt/geom/Crossings.java src/share/classes/sun/awt/image/ImageFetcher.java src/share/classes/sun/awt/image/ImageRepresentation.java src/share/classes/sun/font/ExtendedTextSourceLabel.java src/share/classes/sun/font/StrikeCache.java src/share/classes/sun/tools/tree/FinallyStatement.java src/share/classes/sun/tools/tree/SynchronizedStatement.java src/share/classes/sun/tools/util/CommandLine.java src/solaris/classes/sun/awt/X11/XComponentPeer.java src/solaris/classes/sun/awt/X11/XDialogPeer.java src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java src/solaris/classes/sun/awt/X11/XEmbedServerTester.java src/solaris/classes/sun/awt/X11/XFramePeer.java src/solaris/classes/sun/awt/X11/XToolkit.java src/solaris/classes/sun/font/FcFontConfiguration.java src/solaris/classes/sun/font/X11TextRenderer.java src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java src/windows/classes/sun/java2d/d3d/D3DDrawImage.java src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java src/windows/classes/sun/java2d/d3d/D3DPaints.java src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java src/windows/classes/sun/java2d/windows/GDIRenderer.java src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
diffstat 46 files changed, 156 insertions(+), 152 deletions(-) [+]
line wrap: on
line diff
--- a/make/Setup.gmk	Wed Jan 22 17:40:58 2014 -0500
+++ b/make/Setup.gmk	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -27,7 +27,7 @@
 
 # To build with all warnings enabled, do the following:
 # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
-JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,classfile,dep-ann,divzero,empty,overloads,try,varargs -Werror
+JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,classfile,dep-ann,divzero,empty,overloads,static,try,varargs -Werror
 
 # Any java code executed during a JDK build to build other parts of the JDK must be 
 # executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this 
--- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -357,7 +357,7 @@
         // Undo change to interlace flag if not MODE_COPY_FROM_METADATA.
 
         if (param != null && param.canWriteProgressive() &&
-            param.getProgressiveMode() != param.MODE_COPY_FROM_METADATA) {
+            param.getProgressiveMode() != ImageWriteParam.MODE_COPY_FROM_METADATA) {
             im.interlaceFlag = isProgressive;
         }
 
--- a/src/share/classes/com/sun/java/browser/dom/DOMService.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/java/browser/dom/DOMService.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -46,7 +46,7 @@
             String provider = (String) java.security.AccessController.doPrivileged(
                    new sun.security.action.GetPropertyAction("com.sun.java.browser.dom.DOMServiceProvider"));
 
-            Class clazz = DOMService.class.forName("sun.plugin.dom.DOMService");
+            Class clazz = Class.forName("sun.plugin.dom.DOMService");
 
             return (DOMService) clazz.newInstance();
         }
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -433,7 +433,7 @@
                         if (objects.length == 1
                             && ((File)objects[0]).isDirectory()
                             && chooser.isTraversable(((File)objects[0]))
-                            && (chooser.getFileSelectionMode() != chooser.DIRECTORIES_ONLY
+                            && (chooser.getFileSelectionMode() != JFileChooser.DIRECTORIES_ONLY
                                 || !chooser.getFileSystemView().isFileSystem(((File)objects[0])))) {
                             setDirectorySelected(true);
                             setDirectory(((File)objects[0]));
@@ -458,7 +458,7 @@
                     if (file != null
                         && file.isDirectory()
                         && chooser.isTraversable(file)
-                        && (chooser.getFileSelectionMode() == chooser.FILES_ONLY
+                        && (chooser.getFileSelectionMode() == JFileChooser.FILES_ONLY
                             || !chooser.getFileSystemView().isFileSystem(file))) {
 
                         setDirectorySelected(true);
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -61,7 +61,7 @@
         GraphicsEnvironment ge =
            GraphicsEnvironment.getLocalGraphicsEnvironment();
 
-        if (!ge.isHeadless()) {
+        if (!GraphicsEnvironment.isHeadless()) {
             GraphicsConfiguration gc =
                 ge.getDefaultScreenDevice().getDefaultConfiguration();
             AffineTransform at = gc.getNormalizingTransform();
--- a/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -88,9 +88,9 @@
     }
 
     MidiDevice[] getDeviceCache() { return devices; }
-    void setDeviceCache(MidiDevice[] devices) { this.devices = devices; }
+    void setDeviceCache(MidiDevice[] devices) { MidiInDeviceProvider.devices = devices; }
     Info[] getInfoCache() { return infos; }
-    void setInfoCache(Info[] infos) { this.infos = infos; }
+    void setInfoCache(Info[] infos) { MidiInDeviceProvider.infos = infos; }
 
 
     // INNER CLASSES
--- a/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -86,9 +86,9 @@
     }
 
     MidiDevice[] getDeviceCache() { return devices; }
-    void setDeviceCache(MidiDevice[] devices) { this.devices = devices; }
+    void setDeviceCache(MidiDevice[] devices) { MidiOutDeviceProvider.devices = devices; }
     Info[] getInfoCache() { return infos; }
-    void setInfoCache(Info[] infos) { this.infos = infos; }
+    void setInfoCache(Info[] infos) { MidiOutDeviceProvider.infos = infos; }
 
 
     // INNER CLASSES
--- a/src/share/classes/java/awt/image/AffineTransformOp.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/java/awt/image/AffineTransformOp.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -110,23 +110,23 @@
         this.hints = hints;
 
         if (hints != null) {
-            Object value = hints.get(hints.KEY_INTERPOLATION);
+            Object value = hints.get(RenderingHints.KEY_INTERPOLATION);
             if (value == null) {
-                value = hints.get(hints.KEY_RENDERING);
-                if (value == hints.VALUE_RENDER_SPEED) {
+                value = hints.get(RenderingHints.KEY_RENDERING);
+                if (value == RenderingHints.VALUE_RENDER_SPEED) {
                     interpolationType = TYPE_NEAREST_NEIGHBOR;
                 }
-                else if (value == hints.VALUE_RENDER_QUALITY) {
+                else if (value == RenderingHints.VALUE_RENDER_QUALITY) {
                     interpolationType = TYPE_BILINEAR;
                 }
             }
-            else if (value == hints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR) {
+            else if (value == RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR) {
                 interpolationType = TYPE_NEAREST_NEIGHBOR;
             }
-            else if (value == hints.VALUE_INTERPOLATION_BILINEAR) {
+            else if (value == RenderingHints.VALUE_INTERPOLATION_BILINEAR) {
                 interpolationType = TYPE_BILINEAR;
             }
-            else if (value == hints.VALUE_INTERPOLATION_BICUBIC) {
+            else if (value == RenderingHints.VALUE_INTERPOLATION_BICUBIC) {
                 interpolationType = TYPE_BICUBIC;
             }
         }
@@ -235,10 +235,12 @@
             {
                 int type = xform.getType();
                 boolean needTrans = ((type&
-                                      (xform.TYPE_MASK_ROTATION|
-                                       xform.TYPE_GENERAL_TRANSFORM))
+                                      (AffineTransform.TYPE_MASK_ROTATION|
+                                       AffineTransform.TYPE_GENERAL_TRANSFORM))
                                      != 0);
-                if (! needTrans && type != xform.TYPE_TRANSLATION && type != xform.TYPE_IDENTITY)
+                if (! needTrans &&
+                    type != AffineTransform.TYPE_TRANSLATION &&
+                    type != AffineTransform.TYPE_IDENTITY)
                 {
                     double[] mtx = new double[4];
                     xform.getMatrix(mtx);
--- a/src/share/classes/java/awt/image/LookupOp.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/java/awt/image/LookupOp.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,6 @@
+
 /*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -373,11 +374,11 @@
                 int trans        = cm.getTransparency();
                 int[] nbits = null;
                 if (ltable instanceof ByteLookupTable) {
-                    if (db.getDataType() == db.TYPE_USHORT) {
+                    if (db.getDataType() == DataBuffer.TYPE_USHORT) {
                         // Dst raster should be of type byte
                         if (hasAlpha) {
                             nbits = new int[2];
-                            if (trans == cm.BITMASK) {
+                            if (trans == java.awt.Transparency.BITMASK) {
                                 nbits[1] = 1;
                             }
                             else {
@@ -393,10 +394,10 @@
                 }
                 else if (ltable instanceof ShortLookupTable) {
                     transferType = DataBuffer.TYPE_USHORT;
-                    if (db.getDataType() == db.TYPE_BYTE) {
+                    if (db.getDataType() == DataBuffer.TYPE_BYTE) {
                         if (hasAlpha) {
                             nbits = new int[2];
-                            if (trans == cm.BITMASK) {
+                            if (trans == java.awt.Transparency.BITMASK) {
                                 nbits[1] = 1;
                             }
                             else {
--- a/src/share/classes/javax/swing/AbstractButton.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/AbstractButton.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -370,7 +370,7 @@
         model.setPressed(true);
         paintImmediately(new Rectangle(0,0, size.width, size.height));
         try {
-            Thread.currentThread().sleep(pressTime);
+            Thread.sleep(pressTime);
         } catch(InterruptedException ie) {
         }
         model.setPressed(false);
--- a/src/share/classes/javax/swing/DefaultDesktopManager.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/DefaultDesktopManager.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -185,8 +185,8 @@
 
         if (c instanceof JLayeredPane) {
             JLayeredPane lp = (JLayeredPane)c;
-            int layer = lp.getLayer(f);
-            lp.putLayer(desktopIcon, layer);
+            int layer = JLayeredPane.getLayer(f);
+            JLayeredPane.putLayer(desktopIcon, layer);
         }
 
         // If we are maximized we already have the normal bounds recorded
--- a/src/share/classes/javax/swing/JFormattedTextField.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/JFormattedTextField.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -651,7 +651,7 @@
                     JFormattedTextField.this.setValue(
                         JFormattedTextField.this.getValue(), true, true);
                 } catch (ParseException pe) {
-                    if (fb == JFormattedTextField.this.COMMIT_OR_REVERT) {
+                    if (fb == JFormattedTextField.COMMIT_OR_REVERT) {
                         JFormattedTextField.this.setValue(
                             JFormattedTextField.this.getValue(), true, true);
                     }
--- a/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -391,11 +391,11 @@
      */
 
     int getOneTouchSizeFromSuper() {
-        return super.ONE_TOUCH_SIZE;
+        return BasicSplitPaneDivider.ONE_TOUCH_SIZE;
     }
 
     int getOneTouchOffsetFromSuper() {
-        return super.ONE_TOUCH_OFFSET;
+        return BasicSplitPaneDivider.ONE_TOUCH_OFFSET;
     }
 
     int getOrientationFromSuper() {
--- a/src/share/classes/javax/swing/text/StyledEditorKit.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/text/StyledEditorKit.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -90,7 +90,7 @@
      * @return the command list
      */
     public Action[] getActions() {
-        return TextAction.augmentList(super.getActions(), this.defaultActions);
+        return TextAction.augmentList(super.getActions(), defaultActions);
     }
 
     /**
--- a/src/share/classes/javax/swing/text/html/HTMLEditorKit.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/text/html/HTMLEditorKit.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -433,7 +433,7 @@
      * @return the command list
      */
     public Action[] getActions() {
-        return TextAction.augmentList(super.getActions(), this.defaultActions);
+        return TextAction.augmentList(super.getActions(), defaultActions);
     }
 
     /**
--- a/src/share/classes/javax/swing/text/html/StyleSheet.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/text/html/StyleSheet.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -2079,8 +2079,8 @@
                     // Parent view.
                     View v = childView.getParent();
                     HTMLDocument doc = (HTMLDocument)v.getDocument();
-                    if (doc.matchNameAttribute(v.getElement().getAttributes(),
-                                               HTML.Tag.OL)) {
+                    if (HTMLDocument.matchNameAttribute(v.getElement().getAttributes(),
+                                                        HTML.Tag.OL)) {
                         childtype = CSS.Value.DECIMAL;
                     } else {
                         childtype = CSS.Value.DISC;
@@ -2473,13 +2473,13 @@
                     flags |= 4;
                 }
                 else if (pos.isHorizontalPositionRelativeToSize()) {
-                    hPosition *= css.getFontSize(a, 12, ss);
+                    hPosition *= CSS.getFontSize(a, 12, ss);
                 }
                 if (pos.isVerticalPositionRelativeToSize()) {
                     flags |= 8;
                 }
                 else if (pos.isVerticalPositionRelativeToFontSize()) {
-                    vPosition *= css.getFontSize(a, 12, ss);
+                    vPosition *= CSS.getFontSize(a, 12, ss);
                 }
             }
             // Determine any repeating values.
--- a/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -84,7 +84,7 @@
             in = getResourceAsStream(path);
             if (in != null) {
                 dtd.read(new DataInputStream(new BufferedInputStream(in)));
-                dtd.putDTDHash(name, dtd);
+                DTD.putDTDHash(name, dtd);
             }
         } catch (Exception e) {
             System.out.println(e);
--- a/src/share/classes/javax/swing/text/rtf/RTFReader.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/javax/swing/text/rtf/RTFReader.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -599,7 +599,7 @@
         } catch (Exception e) {
             throw new IOException("Unable to read from character set file (" + e + ")");
         }
-        if (ttype != in.TT_NUMBER) {
+        if (ttype != StreamTokenizer.TT_NUMBER) {
 //          System.out.println("Bad token: type=" + ttype + " tok=" + in.sval);
             throw new IOException("Unexpected token in character set file");
 //          continue;
--- a/src/share/classes/sun/awt/PlatformFont.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/PlatformFont.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, 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
@@ -270,7 +270,7 @@
             currentDefaultChar = data[stringIndex];
 
             // Note that cache sizes must be a power of two!
-            cacheIndex = (int)(currentDefaultChar & this.FONTCACHEMASK);
+            cacheIndex = (int)(currentDefaultChar & PlatformFont.FONTCACHEMASK);
 
             theChar = (PlatformFontCache)getFontCache()[cacheIndex];
 
@@ -309,7 +309,7 @@
                                                                     theChar.bb,
                                                                     true);
                         */
-                        if (currentFontDescriptor.isLE) {
+                        if (FontDescriptor.isLE) {
                             theChar.bb.put((byte)(input[0] & 0xff));
                             theChar.bb.put((byte)(input[0] >>8));
                         } else {
@@ -420,7 +420,7 @@
         // twice or return an array which will be dereferenced and gced
         // right away.
         if (fontCache == null) {
-            fontCache = new Object[this.FONTCACHESIZE];
+            fontCache = new Object[PlatformFont.FONTCACHESIZE];
         }
 
         return fontCache;
--- a/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -97,8 +97,7 @@
                     fetchOneFlavor(clipboard, flavor, lFormat, cached_data);
                 }
 
-                flavors = DataTransferer.getInstance().
-                    setToSortedDataFlavorArray(flavorsToData.keySet());
+                flavors = DataTransferer.setToSortedDataFlavorArray(flavorsToData.keySet());
             }
         } finally {
             clipboard.closeClipboard();
--- a/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -130,8 +130,7 @@
         SortedMap<Long,DataFlavor> formatMap = DataTransferer.getInstance().
             getFormatsForTransferable(transferable, DataTransferer.adaptFlavorMap
                 (getTrigger().getDragSource().getFlavorMap()));
-        long[] formats = DataTransferer.getInstance().
-            keysToLongArray(formatMap);
+        long[] formats = DataTransferer.keysToLongArray(formatMap);
         startDrag(transferable, formats, formatMap);
 
         /*
--- a/src/share/classes/sun/awt/geom/Crossings.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/geom/Crossings.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -100,7 +100,7 @@
                                           double xhi, double yhi)
     {
         Crossings cross;
-        if (pi.getWindingRule() == pi.WIND_EVEN_ODD) {
+        if (pi.getWindingRule() == PathIterator.WIND_EVEN_ODD) {
             cross = new EvenOdd(xlo, ylo, xhi, yhi);
         } else {
             cross = new NonZero(xlo, ylo, xhi, yhi);
--- a/src/share/classes/sun/awt/image/ImageFetcher.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/image/ImageFetcher.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2014, 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
@@ -195,7 +195,7 @@
             // the fetcher was interrupted, as we used to,
             // because there may be other images waiting
             // to be fetched (see 4789067)
-            me.interrupted();
+            Thread.interrupted();
             me.setPriority(HIGH_PRIORITY);
             ImageFetchable src = nextImage();
             if (src == null) {
--- a/src/share/classes/sun/awt/image/ImageRepresentation.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/awt/image/ImageRepresentation.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2014, 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
@@ -209,7 +209,7 @@
 
         // Check to see if model is INT_RGB
         if (model instanceof IndexColorModel) {
-            if (model.getTransparency() == model.TRANSLUCENT) {
+            if (model.getTransparency() == Transparency.TRANSLUCENT) {
                 // REMIND:
                 // Probably need to composite anyway so force ARGB
                 cmodel = ColorModel.getRGBdefault();
@@ -586,8 +586,8 @@
                 }
             }
             else {
-                if (model.getTransparency() != model.OPAQUE &&
-                    cmodel.getTransparency() == cmodel.OPAQUE) {
+                if (model.getTransparency() != Transparency.OPAQUE &&
+                    cmodel.getTransparency() == Transparency.OPAQUE) {
                     convertToRGB();
                 }
 
--- a/src/share/classes/sun/font/ExtendedTextSourceLabel.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/font/ExtendedTextSourceLabel.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -894,12 +894,12 @@
 
   public String toString() {
     if (true) {
-        return source.toString(source.WITHOUT_CONTEXT);
+        return source.toString(TextSource.WITHOUT_CONTEXT);
     }
     StringBuffer buf = new StringBuffer();
     buf.append(super.toString());
     buf.append("[source:");
-    buf.append(source.toString(source.WITHOUT_CONTEXT));
+    buf.append(source.toString(TextSource.WITHOUT_CONTEXT));
     buf.append(", lb:");
     buf.append(lb);
     buf.append(", ab:");
--- a/src/share/classes/sun/font/StrikeCache.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/font/StrikeCache.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -280,7 +280,7 @@
         RenderQueue rq = null;
         GraphicsEnvironment ge =
             GraphicsEnvironment.getLocalGraphicsEnvironment();
-        if (!ge.isHeadless()) {
+        if (!GraphicsEnvironment.isHeadless()) {
             GraphicsConfiguration gc =
                 ge.getDefaultScreenDevice().getDefaultConfiguration();
             if (gc instanceof AccelGraphicsConfig) {
--- a/src/share/classes/sun/tools/tree/FinallyStatement.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/tools/tree/FinallyStatement.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2014, 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
@@ -281,7 +281,7 @@
                                                        returnType,
                                                        idFinallyReturnValue);
                 ctx.declare(env, localfield);
-                env.debugOutput("Assigning return slot to " + localfield.number);
+                Environment.debugOutput("Assigning return slot to " + localfield.number);
             }
 
             // allocate space for the exception and return address
--- a/src/share/classes/sun/tools/tree/SynchronizedStatement.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/tools/tree/SynchronizedStatement.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2014, 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
@@ -120,7 +120,7 @@
             LocalMember localfield = new LocalMember(0, clazz, 0, returnType,
                                                    idFinallyReturnValue);
             ctx.declare(env, localfield);
-            env.debugOutput("Assigning return slot to " + localfield.number);
+            Environment.debugOutput("Assigning return slot to " + localfield.number);
         }
 
         LocalMember f1 = new LocalMember(where, clazz, 0, Type.tObject, null);
--- a/src/share/classes/sun/tools/util/CommandLine.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/share/classes/sun/tools/util/CommandLine.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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
@@ -82,7 +82,7 @@
         st.commentChar('#');
         st.quoteChar('"');
         st.quoteChar('\'');
-        while (st.nextToken() != st.TT_EOF) {
+        while (st.nextToken() != StreamTokenizer.TT_EOF) {
             args.add(st.sval);
         }
         r.close();
--- a/src/solaris/classes/sun/awt/X11/XComponentPeer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XComponentPeer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -184,7 +184,7 @@
             XWindowPeer wpeer = (XWindowPeer)(container.getPeer());
             if (wpeer != null) {
                 return (wpeer.winAttr.visibilityState !=
-                        wpeer.winAttr.AWT_UNOBSCURED);
+                        XWindowAttributesData.AWT_UNOBSCURED);
             }
         }
         return true;
--- a/src/solaris/classes/sun/awt/X11/XDialogPeer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XDialogPeer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -47,9 +47,9 @@
         undecorated = Boolean.valueOf(target.isUndecorated());
         winAttr.nativeDecor = !target.isUndecorated();
         if (winAttr.nativeDecor) {
-            winAttr.decorations = winAttr.AWT_DECOR_ALL;
+            winAttr.decorations = XWindowAttributesData.AWT_DECOR_ALL;
         } else {
-            winAttr.decorations = winAttr.AWT_DECOR_NONE;
+            winAttr.decorations = XWindowAttributesData.AWT_DECOR_NONE;
         }
         winAttr.functions = MWMConstants.MWM_FUNC_ALL;
         winAttr.isResizable =  true; //target.isResizable();
--- a/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -1005,6 +1005,7 @@
         }
     }
 
+    @SuppressWarnings("static")
     private void notifyProtocolListener(XWindow xwindow, int x, int y,
                                         int dropAction,
                                         XClientMessageEvent xclient,
@@ -1147,7 +1148,7 @@
                event while it still can be referenced from other Java events. */
             {
                 XClientMessageEvent copy = new XClientMessageEvent();
-                unsafe.copyMemory(xclient.pData, copy.pData, copy.getSize());
+                unsafe.copyMemory(xclient.pData, copy.pData, XClientMessageEvent.getSize());
 
                 copy.set_data(0, xclient.get_window());
 
--- a/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -654,9 +654,9 @@
         if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
             xembedLog.finer("Client message to embedder: " + msg);
         }
-        if (msg.get_message_type() == xembed.XEmbed.getAtom()) {
+        if (msg.get_message_type() == XEmbedHelper.XEmbed.getAtom()) {
             if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
-                xembedLog.fine(xembed.XEmbedMessageToString(msg));
+                xembedLog.fine(XEmbedHelper.XEmbedMessageToString(msg));
             }
         }
         if (isXEmbedActive()) {
--- a/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -647,7 +647,7 @@
     public void dispatchEvent(XEvent ev) {
         if (ev.get_type() == ClientMessage) {
             XClientMessageEvent msg = ev.get_xclient();
-            if (msg.get_message_type() == xembed.XEmbed.getAtom()) {
+            if (msg.get_message_type() == XEmbedHelper.XEmbed.getAtom()) {
                 if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
                     xembedLog.fine("Embedded message: " + XEmbedHelper.msgidToString((int)msg.get_data(1)));
                 }
--- a/src/solaris/classes/sun/awt/X11/XFramePeer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XFramePeer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -67,9 +67,9 @@
         undecorated = Boolean.valueOf(target.isUndecorated());
         winAttr.nativeDecor = !target.isUndecorated();
         if (winAttr.nativeDecor) {
-            winAttr.decorations = winAttr.AWT_DECOR_ALL;
+            winAttr.decorations = XWindowAttributesData.AWT_DECOR_ALL;
         } else {
-            winAttr.decorations = winAttr.AWT_DECOR_NONE;
+            winAttr.decorations = XWindowAttributesData.AWT_DECOR_NONE;
         }
         winAttr.functions = MWMConstants.MWM_FUNC_ALL;
         winAttr.isResizable = true; // target.isResizable();
--- a/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -1542,7 +1542,7 @@
                  */
                 if (desktopProperties.get(SunToolkit.DESKTOPFONTHINTS) == null) {
                     if (XWM.isKDE2()) {
-                        Object hint = fcManager.getFontConfigAAHint();
+                        Object hint = FontConfigManager.getFontConfigAAHint();
                         if (hint != null) {
                             /* set the fontconfig/KDE property so that
                              * getDesktopHints() below will see it
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/font/FcFontConfiguration.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, 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
@@ -441,7 +441,7 @@
             try {
                 fcVersion = Integer.parseInt(fcVersionStr);
                 if (fcVersion != 0 &&
-                    fcVersion != fcm.getFontConfigVersion()) {
+                    fcVersion != FontConfigManager.getFontConfigVersion()) {
                     return;
                 }
             } catch (Exception e) {
--- a/src/solaris/classes/sun/font/X11TextRenderer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/solaris/classes/sun/font/X11TextRenderer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, 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
@@ -57,11 +57,11 @@
             super.drawGlyphVector(sg2d, g, x, y);
             return;
         case SunHints.INTVAL_TEXT_ANTIALIAS_ON:
-             sg2d.surfaceData.aaTextRenderer.drawGlyphVector(sg2d, g, x, y);
+             SurfaceData.aaTextRenderer.drawGlyphVector(sg2d, g, x, y);
             return;
         case SunHints.INTVAL_TEXT_ANTIALIAS_LCD_HRGB:
         case SunHints.INTVAL_TEXT_ANTIALIAS_LCD_VRGB:
-             sg2d.surfaceData.lcdTextRenderer.drawGlyphVector(sg2d, g, x, y);
+             SurfaceData.lcdTextRenderer.drawGlyphVector(sg2d, g, x, y);
             return;
         default:
         }
--- a/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -78,12 +78,12 @@
         }
 
         SurfaceData srcData =
-            dstData.getSourceSurfaceData(img, sg.TRANSFORM_ISIDENT,
+            dstData.getSourceSurfaceData(img, SunGraphics2D.TRANSFORM_ISIDENT,
                                          CompositeType.SrcOver, null);
         if (!(srcData instanceof D3DSurfaceData)) {
             // REMIND: this hack tries to ensure that we have a cached texture
             srcData =
-                dstData.getSourceSurfaceData(img, sg.TRANSFORM_ISIDENT,
+                dstData.getSourceSurfaceData(img, SunGraphics2D.TRANSFORM_ISIDENT,
                                              CompositeType.SrcOver, null);
             if (!(srcData instanceof D3DSurfaceData)) {
                 return false;
--- a/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -53,7 +53,7 @@
             SurfaceData dstData = sg.surfaceData;
             SurfaceData srcData =
                 dstData.getSourceSurfaceData(img,
-                                             sg.TRANSFORM_GENERIC,
+                                             SunGraphics2D.TRANSFORM_GENERIC,
                                              sg.imageComp,
                                              bgColor);
 
--- a/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -235,10 +235,12 @@
      */
     private static class D3DFSWindowAdapter extends WindowAdapter {
         @Override
+        @SuppressWarnings("static")
         public void windowDeactivated(WindowEvent e) {
             D3DRenderQueue.getInstance().restoreDevices();
         }
         @Override
+        @SuppressWarnings("static")
         public void windowActivated(WindowEvent e) {
             D3DRenderQueue.getInstance().restoreDevices();
         }
--- a/src/windows/classes/sun/java2d/d3d/D3DPaints.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DPaints.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -132,14 +132,14 @@
             }
 
             SurfaceData srcData =
-                dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT,
+                dstData.getSourceSurfaceData(bi, SunGraphics2D.TRANSFORM_ISIDENT,
                                              CompositeType.SrcOver, null);
             if (!(srcData instanceof D3DSurfaceData)) {
                 // REMIND: this is a hack that attempts to cache the system
                 //         memory image from the TexturePaint instance into a
                 //         D3D texture...
                 srcData =
-                    dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT,
+                    dstData.getSourceSurfaceData(bi, SunGraphics2D.TRANSFORM_ISIDENT,
                                                  CompositeType.SrcOver, null);
                 if (!(srcData instanceof D3DSurfaceData)) {
                     return false;
--- a/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -542,7 +542,7 @@
         // REMIND: the D3D pipeline doesn't support XOR!, more
         // fixes will be needed below. For now we disable D3D rendering
         // for the surface which had any XOR rendering done to.
-        if (sg2d.compositeState >= sg2d.COMP_XOR) {
+        if (sg2d.compositeState >= SunGraphics2D.COMP_XOR) {
             super.validatePipe(sg2d);
             sg2d.imagepipe = d3dImagePipe;
             disableAccelerationForSurface();
@@ -557,18 +557,18 @@
         // by the CompositeType.SrcNoEa (any color) test below.)
 
         if (/* CompositeType.SrcNoEa (any color) */
-            (sg2d.compositeState <= sg2d.COMP_ISCOPY &&
-             sg2d.paintState <= sg2d.PAINT_ALPHACOLOR)        ||
+            (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY &&
+             sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR)        ||
 
             /* CompositeType.SrcOver (any color) */
-            (sg2d.compositeState == sg2d.COMP_ALPHA    &&
-             sg2d.paintState <= sg2d.PAINT_ALPHACOLOR &&
+            (sg2d.compositeState == SunGraphics2D.COMP_ALPHA    &&
+             sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
              (((AlphaComposite)sg2d.composite).getRule() ==
               AlphaComposite.SRC_OVER))                       ||
 
             /* CompositeType.Xor (any color) */
-            (sg2d.compositeState == sg2d.COMP_XOR &&
-             sg2d.paintState <= sg2d.PAINT_ALPHACOLOR))
+            (sg2d.compositeState == SunGraphics2D.COMP_XOR &&
+             sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR))
         {
             textpipe = d3dTextPipe;
         } else {
@@ -583,12 +583,12 @@
         D3DRenderer nonTxPipe = null;
 
         if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON) {
-            if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) {
-                if (sg2d.compositeState <= sg2d.COMP_XOR) {
+            if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) {
+                if (sg2d.compositeState <= SunGraphics2D.COMP_XOR) {
                     txPipe = d3dTxRenderPipe;
                     nonTxPipe = d3dRenderPipe;
                 }
-            } else if (sg2d.compositeState <= sg2d.COMP_ALPHA) {
+            } else if (sg2d.compositeState <= SunGraphics2D.COMP_ALPHA) {
                 if (D3DPaints.isValid(sg2d)) {
                     txPipe = d3dTxRenderPipe;
                     nonTxPipe = d3dRenderPipe;
@@ -596,7 +596,7 @@
                 // custom paints handled by super.validatePipe() below
             }
         } else {
-            if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR) {
+            if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR) {
                 if (graphicsDevice.isCapPresent(CAPS_AA_SHADER) &&
                     (sg2d.imageComp == CompositeType.SrcOverNoEa ||
                      sg2d.imageComp == CompositeType.SrcOver))
@@ -613,7 +613,7 @@
                     sg2d.drawpipe = aaConverter;
                     sg2d.fillpipe = aaConverter;
                     sg2d.shapepipe = aaConverter;
-                } else if (sg2d.compositeState == sg2d.COMP_XOR) {
+                } else if (sg2d.compositeState == SunGraphics2D.COMP_XOR) {
                     // install the solid pipes when AA and XOR are both enabled
                     txPipe = d3dTxRenderPipe;
                     nonTxPipe = d3dRenderPipe;
@@ -623,10 +623,10 @@
         }
 
         if (txPipe != null) {
-            if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) {
+            if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
                 sg2d.drawpipe = txPipe;
                 sg2d.fillpipe = txPipe;
-            } else if (sg2d.strokeState != sg2d.STROKE_THIN) {
+            } else if (sg2d.strokeState != SunGraphics2D.STROKE_THIN) {
                 sg2d.drawpipe = txPipe;
                 sg2d.fillpipe = nonTxPipe;
             } else {
@@ -653,7 +653,7 @@
 
     @Override
     protected MaskFill getMaskFill(SunGraphics2D sg2d) {
-        if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR) {
+        if (sg2d.paintState > SunGraphics2D.PAINT_ALPHACOLOR) {
             /*
              * We can only accelerate non-Color MaskFill operations if
              * all of the following conditions hold true:
@@ -678,8 +678,8 @@
     public boolean copyArea(SunGraphics2D sg2d,
                             int x, int y, int w, int h, int dx, int dy)
     {
-        if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE &&
-            sg2d.compositeState < sg2d.COMP_XOR)
+        if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE &&
+            sg2d.compositeState < SunGraphics2D.COMP_XOR)
         {
             x += sg2d.transX;
             y += sg2d.transY;
@@ -738,7 +738,7 @@
         D3DRenderQueue rq = D3DRenderQueue.getInstance();
         // swapBuffers can be called from the toolkit thread by swing, we
         // should detect this and prevent the deadlocks
-        if (rq.isRenderQueueThread()) {
+        if (D3DRenderQueue.isRenderQueueThread()) {
             if (!rq.tryLock()) {
                 // if we could not obtain the lock, repaint the area
                 // that was supposed to be swapped, and no-op this swap
--- a/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, 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
@@ -72,7 +72,7 @@
             try {
                 cachedData = d3dgc.createManagedSurface(w, h, transparency);
             } catch (InvalidPipeException e) {
-                if (!d3dgc.getD3DDevice().isD3DAvailable()) {
+                if (!D3DGraphicsDevice.isD3DAvailable()) {
                     invalidate();
                     flush();
                     return null;
--- a/src/windows/classes/sun/java2d/windows/GDIRenderer.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/windows/GDIRenderer.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -264,7 +264,7 @@
         Path2D.Float p2df;
         int transX;
         int transY;
-        if (sg2d.transformState <= sg2d.TRANSFORM_INT_TRANSLATE) {
+        if (sg2d.transformState <= SunGraphics2D.TRANSFORM_INT_TRANSLATE) {
             if (s instanceof Path2D.Float) {
                 p2df = (Path2D.Float)s;
             } else {
@@ -308,9 +308,9 @@
     }
 
     public void draw(SunGraphics2D sg2d, Shape s) {
-        if (sg2d.strokeState == sg2d.STROKE_THIN) {
+        if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) {
             doShape(sg2d, s, false);
-        } else if (sg2d.strokeState < sg2d.STROKE_CUSTOM) {
+        } else if (sg2d.strokeState < SunGraphics2D.STROKE_CUSTOM) {
             ShapeSpanIterator si = LoopPipe.getStrokeSpans(sg2d, s);
             try {
                 doFillSpans(sg2d, si);
--- a/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java	Wed Jan 22 17:40:58 2014 -0500
+++ b/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java	Wed Jan 22 23:20:58 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -153,11 +153,11 @@
 
     public void validatePipe(SunGraphics2D sg2d) {
         if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON &&
-            sg2d.paintState <= sg2d.PAINT_ALPHACOLOR &&
-            (sg2d.compositeState <= sg2d.COMP_ISCOPY ||
-             sg2d.compositeState == sg2d.COMP_XOR))
+            sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
+            (sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY ||
+             sg2d.compositeState == SunGraphics2D.COMP_XOR))
         {
-            if (sg2d.clipState == sg2d.CLIP_SHAPE) {
+            if (sg2d.clipState == SunGraphics2D.CLIP_SHAPE) {
                 // Do this to init textpipe correctly; we will override the
                 // other non-text pipes below
                 // REMIND: we should clean this up eventually instead of
@@ -194,10 +194,10 @@
                 }
             }
             sg2d.imagepipe = imagepipe;
-            if (sg2d.transformState >= sg2d.TRANSFORM_TRANSLATESCALE) {
+            if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
                 sg2d.drawpipe = gdiTxPipe;
                 sg2d.fillpipe = gdiTxPipe;
-            } else if (sg2d.strokeState != sg2d.STROKE_THIN){
+            } else if (sg2d.strokeState != SunGraphics2D.STROKE_THIN){
                 sg2d.drawpipe = gdiTxPipe;
                 sg2d.fillpipe = gdiPipe;
             } else {
@@ -220,8 +220,8 @@
     }
 
     public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
-        if (sg2d.paintState <= sg2d.PAINT_ALPHACOLOR &&
-            sg2d.compositeState <= sg2d.COMP_ISCOPY)
+        if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
+            sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY)
         {
             return solidloops;
         }
@@ -295,8 +295,8 @@
                             int x, int y, int w, int h, int dx, int dy)
     {
         CompositeType comptype = sg2d.imageComp;
-        if (sg2d.transformState < sg2d.TRANSFORM_TRANSLATESCALE &&
-            sg2d.clipState != sg2d.CLIP_SHAPE &&
+        if (sg2d.transformState < SunGraphics2D.TRANSFORM_TRANSLATESCALE &&
+            sg2d.clipState != SunGraphics2D.CLIP_SHAPE &&
             (CompositeType.SrcOverNoEa.equals(comptype) ||
              CompositeType.SrcNoEa.equals(comptype)))
         {