--- a/src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java Fri Dec 14 11:00:07 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1999, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.awt.Color;
-
-
-public interface Graphics2Delegate {
- void setBackground(Color color);
-}
--- a/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java Fri Dec 14 11:00:07 2018 +0530
+++ b/src/java.desktop/share/classes/sun/awt/SunGraphicsCallback.java Sat Dec 15 10:35:45 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -71,9 +71,6 @@
cg.setColor(comp.getForeground());
if (cg instanceof Graphics2D) {
((Graphics2D)cg).setBackground(comp.getBackground());
- } else if (cg instanceof Graphics2Delegate) {
- ((Graphics2Delegate)cg).setBackground(
- comp.getBackground());
}
run(comp, cg);
} finally {
--- a/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java Fri Dec 14 11:00:07 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1997, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * An EventQueue subclass which adds selective tracing of events as they
- * are posted to an EventQueue. Tracing is globally enabled and disabled
- * by the AWT.TraceEventPosting property in awt.properties. <P>
- *
- * The optional AWT.NoTraceIDs property defines a list of AWTEvent IDs
- * which should not be traced, such as MouseEvent.MOUSE_MOVED or PaintEvents.
- * This list is declared by specifying the decimal value of each event's ID,
- * separated by commas.
- *
- * @author Thomas Ball
- */
-
-package sun.awt;
-
-import java.awt.EventQueue;
-import java.awt.AWTEvent;
-import java.awt.Toolkit;
-import java.util.StringTokenizer;
-
-public class TracedEventQueue extends EventQueue {
-
- // Determines whether any event tracing is enabled.
- static boolean trace = false;
-
- // The list of event IDs to ignore when tracing.
- static int[] suppressedIDs = null;
-
- static {
- String s = Toolkit.getProperty("AWT.IgnoreEventIDs", "");
- if (s.length() > 0) {
- StringTokenizer st = new StringTokenizer(s, ",");
- int nIDs = st.countTokens();
- suppressedIDs = new int[nIDs];
- for (int i = 0; i < nIDs; i++) {
- String idString = st.nextToken();
- try {
- suppressedIDs[i] = Integer.parseInt(idString);
- } catch (NumberFormatException e) {
- System.err.println("Bad ID listed in AWT.IgnoreEventIDs " +
- "in awt.properties: \"" +
- idString + "\" -- skipped");
- suppressedIDs[i] = 0;
- }
- }
- } else {
- suppressedIDs = new int[0];
- }
- }
-
- public void postEvent(AWTEvent theEvent) {
- boolean printEvent = true;
- int id = theEvent.getID();
- for (int i = 0; i < suppressedIDs.length; i++) {
- if (id == suppressedIDs[i]) {
- printEvent = false;
- break;
- }
- }
- if (printEvent) {
- System.out.println(Thread.currentThread().getName() +
- ": " + theEvent);
- }
- super.postEvent(theEvent);
- }
-}
--- a/src/java.desktop/share/classes/sun/awt/image/BadDepthException.java Fri Dec 14 11:00:07 2018 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-
-@SuppressWarnings("serial") // JDK-implementation class
-public class BadDepthException extends Exception {
- public BadDepthException() {
- }
-}
--- a/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java Fri Dec 14 11:00:07 2018 +0530
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WCanvasPeer.java Sat Dec 15 10:35:45 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -69,8 +69,7 @@
@Override
public void paint(Graphics g) {
Dimension d = ((Component)target).getSize();
- if (g instanceof Graphics2D ||
- g instanceof sun.awt.Graphics2Delegate) {
+ if (g instanceof Graphics2D) {
// background color is setup correctly, so just use clearRect
g.clearRect(0, 0, d.width, d.height);
} else {