--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java 2014-01-16 21:31:00.000000000 -0800 +++ new/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java 2014-01-16 21:31:00.000000000 -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; } --- old/src/share/classes/com/sun/java/browser/dom/DOMService.java 2014-01-16 21:31:01.000000000 -0800 +++ new/src/share/classes/com/sun/java/browser/dom/DOMService.java 2014-01-16 21:31:01.000000000 -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(); } --- old/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java 2014-01-16 21:31:01.000000000 -0800 +++ new/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java 2014-01-16 21:31:01.000000000 -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); --- old/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java 2014-01-16 21:31:02.000000000 -0800 +++ new/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java 2014-01-16 21:31:02.000000000 -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(); --- old/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java 2014-01-16 21:31:02.000000000 -0800 +++ new/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java 2014-01-16 21:31:02.000000000 -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 --- old/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java 2014-01-16 21:31:03.000000000 -0800 +++ new/src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java 2014-01-16 21:31:02.000000000 -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 --- old/src/share/classes/java/awt/image/AffineTransformOp.java 2014-01-16 21:31:03.000000000 -0800 +++ new/src/share/classes/java/awt/image/AffineTransformOp.java 2014-01-16 21:31:03.000000000 -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,10 @@ { 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); --- old/src/share/classes/java/awt/image/LookupOp.java 2014-01-16 21:31:03.000000000 -0800 +++ new/src/share/classes/java/awt/image/LookupOp.java 2014-01-16 21:31:03.000000000 -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 { --- old/src/share/classes/javax/swing/AbstractButton.java 2014-01-16 21:31:04.000000000 -0800 +++ new/src/share/classes/javax/swing/AbstractButton.java 2014-01-16 21:31:04.000000000 -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); --- old/src/share/classes/javax/swing/DefaultDesktopManager.java 2014-01-16 21:31:04.000000000 -0800 +++ new/src/share/classes/javax/swing/DefaultDesktopManager.java 2014-01-16 21:31:04.000000000 -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 --- old/src/share/classes/javax/swing/JFormattedTextField.java 2014-01-16 21:31:05.000000000 -0800 +++ new/src/share/classes/javax/swing/JFormattedTextField.java 2014-01-16 21:31:05.000000000 -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); } --- old/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java 2014-01-16 21:31:05.000000000 -0800 +++ new/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java 2014-01-16 21:31:05.000000000 -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() { --- old/src/share/classes/javax/swing/text/StyledEditorKit.java 2014-01-16 21:31:06.000000000 -0800 +++ new/src/share/classes/javax/swing/text/StyledEditorKit.java 2014-01-16 21:31:06.000000000 -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(), StyledEditorKit.defaultActions); } /** --- old/src/share/classes/javax/swing/text/html/HTMLEditorKit.java 2014-01-16 21:31:06.000000000 -0800 +++ new/src/share/classes/javax/swing/text/html/HTMLEditorKit.java 2014-01-16 21:31:06.000000000 -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(), HTMLEditorKit.defaultActions); } /** --- old/src/share/classes/javax/swing/text/html/StyleSheet.java 2014-01-16 21:31:07.000000000 -0800 +++ new/src/share/classes/javax/swing/text/html/StyleSheet.java 2014-01-16 21:31:07.000000000 -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. --- old/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java 2014-01-16 21:31:07.000000000 -0800 +++ new/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java 2014-01-16 21:31:07.000000000 -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); --- old/src/share/classes/javax/swing/text/rtf/RTFReader.java 2014-01-16 21:31:08.000000000 -0800 +++ new/src/share/classes/javax/swing/text/rtf/RTFReader.java 2014-01-16 21:31:08.000000000 -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; --- old/src/share/classes/sun/awt/PlatformFont.java 2014-01-16 21:31:08.000000000 -0800 +++ new/src/share/classes/sun/awt/PlatformFont.java 2014-01-16 21:31:08.000000000 -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; --- old/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2014-01-16 21:31:09.000000000 -0800 +++ new/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2014-01-16 21:31:09.000000000 -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 @@ -73,6 +73,7 @@ } } + @SuppressWarnings("static") public ClipboardTransferable(SunClipboard clipboard) { clipboard.openClipboard(null); --- old/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java 2014-01-16 21:31:10.000000000 -0800 +++ new/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java 2014-01-16 21:31:09.000000000 -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 @@ -110,7 +110,7 @@ /** * initiate a DnD operation ... */ - + @SuppressWarnings("static") public void startDrag(DragSourceContext dsc, Cursor c, Image di, Point p) throws InvalidDnDOperationException { --- old/src/share/classes/sun/awt/geom/Crossings.java 2014-01-16 21:31:10.000000000 -0800 +++ new/src/share/classes/sun/awt/geom/Crossings.java 2014-01-16 21:31:10.000000000 -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); --- old/src/share/classes/sun/awt/image/ImageFetcher.java 2014-01-16 21:31:11.000000000 -0800 +++ new/src/share/classes/sun/awt/image/ImageFetcher.java 2014-01-16 21:31:10.000000000 -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) { --- old/src/share/classes/sun/awt/image/ImageRepresentation.java 2014-01-16 21:31:11.000000000 -0800 +++ new/src/share/classes/sun/awt/image/ImageRepresentation.java 2014-01-16 21:31:11.000000000 -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(); } --- old/src/share/classes/sun/font/ExtendedTextSourceLabel.java 2014-01-16 21:31:12.000000000 -0800 +++ new/src/share/classes/sun/font/ExtendedTextSourceLabel.java 2014-01-16 21:31:11.000000000 -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:"); --- old/src/share/classes/sun/font/StrikeCache.java 2014-01-16 21:31:12.000000000 -0800 +++ new/src/share/classes/sun/font/StrikeCache.java 2014-01-16 21:31:12.000000000 -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) { --- old/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-01-16 21:31:12.000000000 -0800 +++ new/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-01-16 21:31:12.000000000 -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) { --- old/src/solaris/classes/sun/font/X11TextRenderer.java 2014-01-16 21:31:13.000000000 -0800 +++ new/src/solaris/classes/sun/font/X11TextRenderer.java 2014-01-16 21:31:13.000000000 -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: } --- old/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java 2014-01-16 21:31:13.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java 2014-01-16 21:31:13.000000000 -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; --- old/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java 2014-01-16 21:31:14.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java 2014-01-16 21:31:14.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, 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); --- old/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java 2014-01-16 21:31:14.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java 2014-01-16 21:31:14.000000000 -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(); } --- old/src/windows/classes/sun/java2d/d3d/D3DPaints.java 2014-01-16 21:31:15.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DPaints.java 2014-01-16 21:31:14.000000000 -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; --- old/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java 2014-01-16 21:31:15.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java 2014-01-16 21:31:15.000000000 -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; --- old/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java 2014-01-16 21:31:16.000000000 -0800 +++ new/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java 2014-01-16 21:31:15.000000000 -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 @@ -64,6 +64,7 @@ } @Override + @SuppressWarnings("static") public SurfaceData validateSurfaceData(SurfaceData srcData, SurfaceData cachedData, int w, int h) --- old/src/windows/classes/sun/java2d/windows/GDIRenderer.java 2014-01-16 21:31:16.000000000 -0800 +++ new/src/windows/classes/sun/java2d/windows/GDIRenderer.java 2014-01-16 21:31:16.000000000 -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); --- old/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java 2014-01-16 21:31:16.000000000 -0800 +++ new/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java 2014-01-16 21:31:16.000000000 -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))) {