--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Tue Dec 16 09:58:02 2014 -0800
@@ -104,6 +104,67 @@
@implementation AWTWindow_Normal
AWT_NS_WINDOW_IMPLEMENTATION
+
+// Gesture support
+- (void)postGesture:(NSEvent *)event as:(jint)type a:(jdouble)a b:(jdouble)b {
+ AWT_ASSERT_APPKIT_THREAD;
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ jobject platformWindow = [((AWTWindow *)self.delegate).javaPlatformWindow jObjectWithEnv:env];
+ if (platformWindow != NULL) {
+ // extract the target AWT Window object out of the CPlatformWindow
+ static JNF_MEMBER_CACHE(jf_target, jc_CPlatformWindow, "target", "Ljava/awt/Window;");
+ jobject awtWindow = JNFGetObjectField(env, platformWindow, jf_target);
+ if (awtWindow != NULL) {
+ // translate the point into Java coordinates
+ NSPoint loc = [event locationInWindow];
+ loc.y = [self frame].size.height - loc.y;
+
+ // send up to the GestureHandler to recursively dispatch on the AWT event thread
+ static JNF_CLASS_CACHE(jc_GestureHandler, "com/apple/eawt/event/GestureHandler");
+ static JNF_STATIC_MEMBER_CACHE(sjm_handleGestureFromNative, jc_GestureHandler, "handleGestureFromNative", "(Ljava/awt/Window;IDDDD)V");
+ JNFCallStaticVoidMethod(env, sjm_handleGestureFromNative, awtWindow, type, (jdouble)loc.x, (jdouble)loc.y, (jdouble)a, (jdouble)b);
+ (*env)->DeleteLocalRef(env, awtWindow);
+ }
+ (*env)->DeleteLocalRef(env, platformWindow);
+ }
+}
+
+- (void)beginGestureWithEvent:(NSEvent *)event {
+ [self postGesture:event
+ as:com_apple_eawt_event_GestureHandler_PHASE
+ a:-1.0
+ b:0.0];
+}
+
+- (void)endGestureWithEvent:(NSEvent *)event {
+ [self postGesture:event
+ as:com_apple_eawt_event_GestureHandler_PHASE
+ a:1.0
+ b:0.0];
+}
+
+- (void)magnifyWithEvent:(NSEvent *)event {
+ [self postGesture:event
+ as:com_apple_eawt_event_GestureHandler_MAGNIFY
+ a:[event magnification]
+ b:0.0];
+}
+
+- (void)rotateWithEvent:(NSEvent *)event {
+ [self postGesture:event
+ as:com_apple_eawt_event_GestureHandler_ROTATE
+ a:[event rotation]
+ b:0.0];
+}
+
+- (void)swipeWithEvent:(NSEvent *)event {
+ [self postGesture:event
+ as:com_apple_eawt_event_GestureHandler_SWIPE
+ a:[event deltaX]
+ b:[event deltaY]];
+}
+
@end
@implementation AWTWindow_Panel
AWT_NS_WINDOW_IMPLEMENTATION
@@ -399,67 +460,6 @@
}
-// Gesture support
-- (void)postGesture:(NSEvent *)event as:(jint)type a:(jdouble)a b:(jdouble)b {
-AWT_ASSERT_APPKIT_THREAD;
-
- JNIEnv *env = [ThreadUtilities getJNIEnv];
- jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
- if (platformWindow != NULL) {
- // extract the target AWT Window object out of the CPlatformWindow
- static JNF_MEMBER_CACHE(jf_target, jc_CPlatformWindow, "target", "Ljava/awt/Window;");
- jobject awtWindow = JNFGetObjectField(env, platformWindow, jf_target);
- if (awtWindow != NULL) {
- // translate the point into Java coordinates
- NSPoint loc = [event locationInWindow];
- loc.y = [self.nsWindow frame].size.height - loc.y;
-
- // send up to the GestureHandler to recursively dispatch on the AWT event thread
- static JNF_CLASS_CACHE(jc_GestureHandler, "com/apple/eawt/event/GestureHandler");
- static JNF_STATIC_MEMBER_CACHE(sjm_handleGestureFromNative, jc_GestureHandler, "handleGestureFromNative", "(Ljava/awt/Window;IDDDD)V");
- JNFCallStaticVoidMethod(env, sjm_handleGestureFromNative, awtWindow, type, (jdouble)loc.x, (jdouble)loc.y, (jdouble)a, (jdouble)b);
- (*env)->DeleteLocalRef(env, awtWindow);
- }
- (*env)->DeleteLocalRef(env, platformWindow);
- }
-}
-
-- (void)beginGestureWithEvent:(NSEvent *)event {
- [self postGesture:event
- as:com_apple_eawt_event_GestureHandler_PHASE
- a:-1.0
- b:0.0];
-}
-
-- (void)endGestureWithEvent:(NSEvent *)event {
- [self postGesture:event
- as:com_apple_eawt_event_GestureHandler_PHASE
- a:1.0
- b:0.0];
-}
-
-- (void)magnifyWithEvent:(NSEvent *)event {
- [self postGesture:event
- as:com_apple_eawt_event_GestureHandler_MAGNIFY
- a:[event magnification]
- b:0.0];
-}
-
-- (void)rotateWithEvent:(NSEvent *)event {
- [self postGesture:event
- as:com_apple_eawt_event_GestureHandler_ROTATE
- a:[event rotation]
- b:0.0];
-}
-
-- (void)swipeWithEvent:(NSEvent *)event {
- [self postGesture:event
- as:com_apple_eawt_event_GestureHandler_SWIPE
- a:[event deltaX]
- b:[event deltaY]];
-}
-
-
// NSWindowDelegate methods
- (void) _deliverMoveResizeEvent {
--- a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, 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
@@ -31,6 +31,7 @@
public class ColorEditor extends Panel implements PropertyEditor {
private static final long serialVersionUID = 1781257185164716054L;
+ @SuppressWarnings("deprecation")
public ColorEditor() {
setLayout(null);
@@ -69,10 +70,12 @@
changeColor(c);
}
+ @SuppressWarnings("deprecation")
public Dimension preferredSize() {
return new Dimension(ourWidth, 40);
}
+ @SuppressWarnings("deprecation")
public boolean keyUp(Event e, int key) {
if (e.target == text) {
try {
@@ -107,6 +110,7 @@
}
+ @SuppressWarnings("deprecation")
public boolean action(Event e, Object arg) {
if (e.target == choser) {
changeColor(colors[choser.getSelectedIndex()]);
--- a/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, 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
@@ -31,6 +31,7 @@
public class FontEditor extends Panel implements java.beans.PropertyEditor {
private static final long serialVersionUID = 6732704486002715933L;
+ @SuppressWarnings("deprecation")
public FontEditor() {
setLayout(null);
@@ -62,6 +63,7 @@
}
+ @SuppressWarnings("deprecation")
public Dimension preferredSize() {
return new Dimension(300, 40);
}
@@ -93,6 +95,7 @@
}
}
+ @SuppressWarnings("deprecation")
private void changeFont(Font f) {
font = f;
if (sample != null) {
@@ -124,6 +127,7 @@
font.getStyle() + ", " + font.getSize() + ")";
}
+ @SuppressWarnings("deprecation")
public boolean action(Event e, Object arg) {
String family = familyChoser.getSelectedItem();
int style = styles[styleChoser.getSelectedIndex()];
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -143,6 +143,7 @@
return map;
}
+ @SuppressWarnings("deprecation")
public String getFileName() {
JFileChooser fc = getFileChooser();
String typedInName = fileNameTextField != null ?
@@ -419,6 +420,7 @@
+ @SuppressWarnings("deprecation")
protected class SelectionListener implements ListSelectionListener {
public void valueChanged(ListSelectionEvent e) {
if (!e.getValueIsAdjusting()) {
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -245,6 +245,7 @@
e.isPopupTrigger(), MouseEvent.NOBUTTON));
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
@@ -336,6 +337,7 @@
e.getClickCount(), e.isPopupTrigger(), MouseEvent.NOBUTTON ));
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java Tue Dec 16 09:58:02 2014 -0800
@@ -242,6 +242,7 @@
setBorderPainted(false);
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, 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
@@ -60,6 +60,7 @@
super.installDefaults();
}
+ @SuppressWarnings("deprecation")
protected void installKeyboardActions() {
super.installKeyboardActions();
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Tue Dec 16 09:58:02 2014 -0800
@@ -2487,6 +2487,7 @@
/**
* Calculates the dialog unit mapping.
*/
+ @SuppressWarnings("deprecation")
private void calculateBaseUnits() {
// This calculation comes from:
// http://support.microsoft.com/default.aspx?scid=kb;EN-US;125681
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java Tue Dec 16 09:58:02 2014 -0800
@@ -78,6 +78,7 @@
paint(g);
}
+ @SuppressWarnings("deprecation")
public void hide() {
super.hide();
/** We need to call removeNotify() here because hide() does
@@ -89,6 +90,7 @@
removeNotify();
}
+ @SuppressWarnings("deprecation")
public void show() {
super.show();
this.pack();
--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java Tue Dec 16 09:58:02 2014 -0800
@@ -700,6 +700,7 @@
setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Tue Dec 16 09:58:02 2014 -0800
@@ -167,9 +167,9 @@
for (int i = 0; i < allchannelnames.length; i++) {
if ((channelmask & m) != 0L) {
if (i < channelnames.length) {
- sb.append(channelnames[i] + " ");
+ sb.append(channelnames[i]).append(' ');
} else {
- sb.append(allchannelnames[i] + " ");
+ sb.append(allchannelnames[i]).append(' ');
}
}
m *= 2L;
--- a/jdk/src/java.desktop/share/classes/java/awt/Canvas.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/Canvas.java Tue Dec 16 09:58:02 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
@@ -70,6 +70,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
void setGraphicsConfiguration(GraphicsConfiguration gc) {
synchronized(getTreeLock()) {
CanvasPeer peer = (CanvasPeer)getPeer();
--- a/jdk/src/java.desktop/share/classes/java/awt/Container.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/Container.java Tue Dec 16 09:58:02 2014 -0800
@@ -805,6 +805,7 @@
* to new heavyweight parent.
* @since 1.5
*/
+ @SuppressWarnings("deprecation")
private void reparentTraverse(ContainerPeer parentPeer, Container child) {
checkTreeLock();
@@ -828,6 +829,7 @@
* Container must be heavyweight.
* @since 1.5
*/
+ @SuppressWarnings("deprecation")
private void reparentChild(Component comp) {
checkTreeLock();
if (comp == null) {
@@ -4189,6 +4191,7 @@
}
}
+ @SuppressWarnings("deprecation")
private void recursiveShowHeavyweightChildren() {
if (!hasHeavyweightDescendants() || !isVisible()) {
return;
@@ -4210,6 +4213,7 @@
}
}
+ @SuppressWarnings("deprecation")
private void recursiveHideHeavyweightChildren() {
if (!hasHeavyweightDescendants()) {
return;
@@ -4231,6 +4235,7 @@
}
}
+ @SuppressWarnings("deprecation")
private void recursiveRelocateHeavyweightChildren(Point origin) {
for (int index = 0; index < getComponentCount(); index++) {
Component comp = getComponent(index);
--- a/jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/DefaultFocusTraversalPolicy.java Tue Dec 16 09:58:02 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
@@ -93,6 +93,7 @@
* @return <code>true</code> if aComponent meets the above requirements;
* <code>false</code> otherwise
*/
+ @SuppressWarnings("deprecation")
protected boolean accept(Component aComponent) {
if (!(aComponent.isVisible() && aComponent.isDisplayable() &&
aComponent.isEnabled()))
--- a/jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -796,6 +796,7 @@
* @return <code>true</code>
* @see Component#dispatchEvent
*/
+ @SuppressWarnings("deprecation")
public boolean dispatchKeyEvent(KeyEvent e) {
Component focusOwner = (((AWTEvent)e).isPosted) ? getFocusOwner() : e.getComponent();
@@ -1021,6 +1022,7 @@
}
}
+ @SuppressWarnings("deprecation")
private boolean preDispatchKeyEvent(KeyEvent ke) {
if (((AWTEvent) ke).isPosted) {
Component focusOwner = getFocusOwner();
--- a/jdk/src/java.desktop/share/classes/java/awt/Dialog.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/Dialog.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, 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
@@ -749,6 +749,7 @@
* @see Component#isDisplayable
* @see #removeNotify
*/
+ @SuppressWarnings("deprecation")
public void addNotify() {
synchronized (getTreeLock()) {
if (parent != null && parent.getPeer() == null) {
@@ -897,6 +898,7 @@
/**
* @return true if we actually showed, false if we just called toFront()
*/
+ @SuppressWarnings("deprecation")
private boolean conditionalShow(Component toFocus, AtomicLong time) {
boolean retval;
--- a/jdk/src/java.desktop/share/classes/java/awt/FileDialog.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/FileDialog.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, 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
@@ -314,6 +314,7 @@
* Creates the file dialog's peer. The peer allows us to change the look
* of the file dialog without changing its functionality.
*/
+ @SuppressWarnings("deprecation")
public void addNotify() {
synchronized(getTreeLock()) {
if (parent != null && parent.getPeer() == null) {
--- a/jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/FontMetrics.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, 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
@@ -409,6 +409,7 @@
* @see #charsWidth(char[], int, int)
* @see #stringWidth(String)
*/
+ @SuppressWarnings("deprecation")
public int bytesWidth(byte data[], int off, int len) {
return stringWidth(new String(data, 0, off, len));
}
--- a/jdk/src/java.desktop/share/classes/java/awt/Graphics.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/Graphics.java Tue Dec 16 09:58:02 2014 -0800
@@ -843,6 +843,7 @@
* @see java.awt.Graphics#drawChars
* @see java.awt.Graphics#drawString
*/
+ @SuppressWarnings("deprecation")
public void drawBytes(byte data[], int offset, int length, int x, int y) {
drawString(new String(data, 0, offset, length), x, y);
}
--- a/jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java Tue Dec 16 09:58:02 2014 -0800
@@ -28,6 +28,7 @@
import java.awt.image.BufferedImage;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Locale;
import sun.font.FontManager;
@@ -161,43 +162,38 @@
*/
private static boolean getHeadlessProperty() {
if (headless == null) {
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Object>() {
- public Object run() {
- String nm = System.getProperty("java.awt.headless");
+ AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+ String nm = System.getProperty("java.awt.headless");
- if (nm == null) {
- /* No need to ask for DISPLAY when run in a browser */
- if (System.getProperty("javaplugin.version") != null) {
- headless = defaultHeadless = Boolean.FALSE;
+ if (nm == null) {
+ /* No need to ask for DISPLAY when run in a browser */
+ if (System.getProperty("javaplugin.version") != null) {
+ headless = defaultHeadless = Boolean.FALSE;
+ } else {
+ String osName = System.getProperty("os.name");
+ if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
+ System.getProperty("awt.toolkit")))
+ {
+ headless = defaultHeadless = Boolean.TRUE;
} else {
- String osName = System.getProperty("os.name");
- if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
- System.getProperty("awt.toolkit")))
- {
- headless = defaultHeadless = Boolean.TRUE;
- } else {
- headless = defaultHeadless =
- Boolean.valueOf(("Linux".equals(osName) ||
- "SunOS".equals(osName) ||
- "FreeBSD".equals(osName) ||
- "NetBSD".equals(osName) ||
- "OpenBSD".equals(osName) ||
- "AIX".equals(osName)) &&
- (System.getenv("DISPLAY") == null));
- }
+ final String display = System.getenv("DISPLAY");
+ headless = defaultHeadless =
+ ("Linux".equals(osName) ||
+ "SunOS".equals(osName) ||
+ "FreeBSD".equals(osName) ||
+ "NetBSD".equals(osName) ||
+ "OpenBSD".equals(osName) ||
+ "AIX".equals(osName)) &&
+ (display == null || display.trim().isEmpty());
}
- } else if (nm.equals("true")) {
- headless = Boolean.TRUE;
- } else {
- headless = Boolean.FALSE;
}
- return null;
- }
+ } else {
+ headless = Boolean.valueOf(nm);
}
- );
+ return null;
+ });
}
- return headless.booleanValue();
+ return headless;
}
/**
--- a/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -3054,6 +3054,7 @@
return (wto != wfrom);
}
+ @SuppressWarnings("deprecation")
static Component getHeavyweight(Component comp) {
if (comp == null || comp.getPeer() == null) {
return null;
--- a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, 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
@@ -153,6 +153,7 @@
* parent's hierarchy
* @exception RuntimeException if the parent is not showing on screen
*/
+ @SuppressWarnings("deprecation")
public void show(Component origin, int x, int y) {
// Use localParent for thread safety.
MenuContainer localParent = parent;
--- a/jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/ScrollPane.java Tue Dec 16 09:58:02 2014 -0800
@@ -732,6 +732,7 @@
/**
* Invoked when the value of the adjustable has changed.
*/
+ @SuppressWarnings("deprecation")
public void adjustmentValueChanged(AdjustmentEvent e) {
Adjustable adj = e.getAdjustable();
int value = e.getValue();
@@ -831,6 +832,7 @@
/**
* Invoked when the value of the adjustable has changed.
*/
+ @SuppressWarnings("deprecation")
public void adjustmentValueChanged(AdjustmentEvent e) {
Adjustable adj = e.getAdjustable();
int value = e.getValue();
--- a/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/SplashScreen.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, 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
@@ -203,6 +203,7 @@
* @return URL for the current splash screen image file
* @throws IllegalStateException if the splash screen has already been closed
*/
+ @SuppressWarnings("deprecation")
public URL getImageURL() throws IllegalStateException {
synchronized (SplashScreen.class) {
checkVisible();
--- a/jdk/src/java.desktop/share/classes/java/awt/Window.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/Window.java Tue Dec 16 09:58:02 2014 -0800
@@ -755,6 +755,7 @@
* @see Container#removeNotify
* @since 1.0
*/
+ @SuppressWarnings("deprecation")
public void addNotify() {
synchronized (getTreeLock()) {
Container parent = this.parent;
@@ -798,6 +799,7 @@
* @see Component#isDisplayable
* @see #setMinimumSize
*/
+ @SuppressWarnings("deprecation")
public void pack() {
Container parent = this.parent;
if (parent != null && parent.getPeer() == null) {
@@ -1070,6 +1072,7 @@
}
}
+ @SuppressWarnings("deprecation")
static void updateChildFocusableWindowState(Window w) {
if (w.getPeer() != null && w.isShowing()) {
((WindowPeer)w.getPeer()).updateFocusableWindowState();
@@ -1157,6 +1160,7 @@
* as reported in javadoc. So we need to implement this functionality even if a
* child overrides dispose() in a wrong way without calling super.dispose().
*/
+ @SuppressWarnings("deprecation")
void disposeImpl() {
dispose();
if (getPeer() != null) {
@@ -3623,6 +3627,7 @@
*
* @since 1.7
*/
+ @SuppressWarnings("deprecation")
public void setOpacity(float opacity) {
synchronized (getTreeLock()) {
if (opacity < 0.0f || opacity > 1.0f) {
@@ -3721,6 +3726,7 @@
*
* @since 1.7
*/
+ @SuppressWarnings("deprecation")
public void setShape(Shape shape) {
synchronized (getTreeLock()) {
if (shape != null) {
@@ -3838,6 +3844,7 @@
* @see GraphicsConfiguration#isTranslucencyCapable()
*/
@Override
+ @SuppressWarnings("deprecation")
public void setBackground(Color bgColor) {
Color oldBg = getBackground();
super.setBackground(bgColor);
@@ -3890,6 +3897,7 @@
return bg != null ? bg.getAlpha() == 255 : true;
}
+ @SuppressWarnings("deprecation")
private void updateWindow() {
synchronized (getTreeLock()) {
WindowPeer peer = (WindowPeer)getPeer();
@@ -4080,6 +4088,7 @@
window.securityWarningHeight = height;
}
+ @SuppressWarnings("deprecation")
public void setSecurityWarningPosition(Window window,
Point2D point, float alignmentX, float alignmentY)
{
--- a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/StringSelection.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/StringSelection.java Tue Dec 16 09:58:02 2014 -0800
@@ -47,6 +47,7 @@
private static final int STRING = 0;
private static final int PLAIN_TEXT = 1;
+ @SuppressWarnings("deprecation")
private static final DataFlavor[] flavors = {
DataFlavor.stringFlavor,
DataFlavor.plainTextFlavor // deprecated
--- a/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/datatransfer/SystemFlavorMap.java Tue Dec 16 09:58:02 2014 -0800
@@ -624,6 +624,7 @@
return new ArrayList<>(returnValue);
}
+ @SuppressWarnings("deprecation")
private static Set<DataFlavor> convertMimeTypeToDataFlavors(
final String baseType) {
--- a/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java Tue Dec 16 09:58:02 2014 -0800
@@ -499,6 +499,7 @@
*
*/
+ @SuppressWarnings("deprecation")
public void addNotify(ComponentPeer peer) {
if (peer == componentPeer) return;
@@ -690,6 +691,7 @@
* update the geometry of the autoscroll region
*/
+ @SuppressWarnings("deprecation")
private void updateRegion() {
Insets i = autoScroll.getAutoscrollInsets();
Dimension size = component.getSize();
--- a/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -149,6 +149,7 @@
* or attributes is null, or the initial PrintService is not in the
* list of browsable services.
*/
+ @SuppressWarnings("deprecation")
public static PrintService printDialog(GraphicsConfiguration gc,
int x, int y,
PrintService[] services,
--- a/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/DebugGraphics.java Tue Dec 16 09:58:02 2014 -0800
@@ -1453,6 +1453,7 @@
/** Returns a DebugGraphics for use in buffering window.
*/
+ @SuppressWarnings("deprecation")
private Graphics debugGraphics() {
DebugGraphics debugGraphics;
DebugGraphicsInfo info = info();
--- a/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/GroupLayout.java Tue Dec 16 09:58:02 2014 -0800
@@ -1213,15 +1213,15 @@
registerComponents(horizontalGroup, HORIZONTAL);
registerComponents(verticalGroup, VERTICAL);
}
- StringBuffer buffer = new StringBuffer();
- buffer.append("HORIZONTAL\n");
- createSpringDescription(buffer, horizontalGroup, " ", HORIZONTAL);
- buffer.append("\nVERTICAL\n");
- createSpringDescription(buffer, verticalGroup, " ", VERTICAL);
- return buffer.toString();
+ StringBuilder sb = new StringBuilder();
+ sb.append("HORIZONTAL\n");
+ createSpringDescription(sb, horizontalGroup, " ", HORIZONTAL);
+ sb.append("\nVERTICAL\n");
+ createSpringDescription(sb, verticalGroup, " ", VERTICAL);
+ return sb.toString();
}
- private void createSpringDescription(StringBuffer buffer, Spring spring,
+ private void createSpringDescription(StringBuilder sb, Spring spring,
String indent, int axis) {
String origin = "";
String padding = "";
@@ -1239,20 +1239,19 @@
padding = ", userCreated=" + paddingSpring.getUserCreated() +
", matches=" + paddingSpring.getMatchDescription();
}
- buffer.append(indent + spring.getClass().getName() + " " +
- Integer.toHexString(spring.hashCode()) + " " +
- origin +
- ", size=" + spring.getSize() +
- ", alignment=" + spring.getAlignment() +
- " prefs=[" + spring.getMinimumSize(axis) +
- " " + spring.getPreferredSize(axis) +
- " " + spring.getMaximumSize(axis) +
- padding + "]\n");
+ sb.append(indent).append(spring.getClass().getName()).append(' ')
+ .append(Integer.toHexString(spring.hashCode())).append(' ')
+ .append(origin).append(", size=").append(spring.getSize())
+ .append(", alignment=").append(spring.getAlignment())
+ .append(" prefs=[").append(spring.getMinimumSize(axis))
+ .append(' ').append(spring.getPreferredSize(axis)).append(' ')
+ .append(spring.getMaximumSize(axis)).append(padding)
+ .append("]\n");
if (spring instanceof Group) {
List<Spring> springs = ((Group)spring).springs;
indent += " ";
for (int counter = 0; counter < springs.size(); counter++) {
- createSpringDescription(buffer, springs.get(counter), indent,
+ createSpringDescription(sb, springs.get(counter), indent,
axis);
}
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/JApplet.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JApplet.java Tue Dec 16 09:58:02 2014 -0800
@@ -243,6 +243,7 @@
* hidden: true
* description: The menubar for accessing pulldown menus from this applet.
*/
+ @SuppressWarnings("deprecation")
public void setJMenuBar(JMenuBar menuBar) {
getRootPane().setMenuBar(menuBar);
}
@@ -253,6 +254,7 @@
* @return the menubar set on this applet
* @see #setJMenuBar
*/
+ @SuppressWarnings("deprecation")
public JMenuBar getJMenuBar() {
return getRootPane().getMenuBar();
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JColorChooser.java Tue Dec 16 09:58:02 2014 -0800
@@ -133,6 +133,7 @@
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
+ @SuppressWarnings("deprecation")
public static Color showDialog(Component component,
String title, Color initialColor) throws HeadlessException {
@@ -543,17 +544,17 @@
* @return a string representation of this <code>JColorChooser</code>
*/
protected String paramString() {
- StringBuilder chooserPanelsString = new StringBuilder("");
- for (int i=0; i<chooserPanels.length; i++) {
- chooserPanelsString.append("[" + chooserPanels[i].toString()
- + "]");
+ StringBuilder chooserPanelsString = new StringBuilder();
+ for (AbstractColorChooserPanel panel : chooserPanels) {
+ chooserPanelsString.append('[').append(panel)
+ .append(']');
}
- String previewPanelString = (previewPanel != null ?
- previewPanel.toString() : "");
+ String previewPanelString = (previewPanel != null ? previewPanel
+ .toString() : "");
- return super.paramString() +
- ",chooserPanels=" + chooserPanelsString.toString() +
- ",previewPanel=" + previewPanelString;
+ return super.paramString() + ",chooserPanels="
+ + chooserPanelsString.toString() + ",previewPanel="
+ + previewPanelString;
}
/////////////////
@@ -654,6 +655,7 @@
okButton.getAccessibleContext().setAccessibleDescription(okString);
okButton.setActionCommand("OK");
okButton.addActionListener(new ActionListener() {
+ @SuppressWarnings("deprecation")
public void actionPerformed(ActionEvent e) {
hide();
}
@@ -685,6 +687,7 @@
cancelButton.setActionCommand("cancel");
cancelButton.addActionListener(new ActionListener() {
+ @SuppressWarnings("deprecation")
public void actionPerformed(ActionEvent e) {
hide();
}
@@ -723,6 +726,7 @@
this.addWindowListener(new Closer());
}
+ @SuppressWarnings("deprecation")
public void show() {
initialColor = chooserPane.getColor();
super.show();
@@ -734,6 +738,7 @@
@SuppressWarnings("serial") // JDK-implementation class
class Closer extends WindowAdapter implements Serializable{
+ @SuppressWarnings("deprecation")
public void windowClosing(WindowEvent e) {
cancelButton.doClick(0);
Window w = e.getWindow();
--- a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java Tue Dec 16 09:58:02 2014 -0800
@@ -5049,6 +5049,7 @@
this.paintingChild = paintingChild;
}
+ @SuppressWarnings("deprecation")
void _paintImmediately(int x, int y, int w, int h) {
Graphics g;
Container c;
--- a/jdk/src/java.desktop/share/classes/javax/swing/JDialog.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JDialog.java Tue Dec 16 09:58:02 2014 -0800
@@ -849,6 +849,7 @@
* hidden: true
* description: The menubar for accessing pulldown menus from this dialog.
*/
+ @SuppressWarnings("deprecation")
public void setJMenuBar(JMenuBar menu) {
getRootPane().setMenuBar(menu);
}
@@ -859,6 +860,7 @@
* @return the menubar set on this dialog
* @see #setJMenuBar
*/
+ @SuppressWarnings("deprecation")
public JMenuBar getJMenuBar() {
return getRootPane().getMenuBar();
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JFileChooser.java Tue Dec 16 09:58:02 2014 -0800
@@ -757,6 +757,7 @@
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
+ @SuppressWarnings("deprecation")
public int showDialog(Component parent, String approveButtonText)
throws HeadlessException {
if (dialog != null) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JFrame.java Tue Dec 16 09:58:02 2014 -0800
@@ -494,6 +494,7 @@
* hidden: true
* description: The menubar for accessing pulldown menus from this frame.
*/
+ @SuppressWarnings("deprecation")
public void setJMenuBar(JMenuBar menubar) {
getRootPane().setMenuBar(menubar);
}
@@ -504,6 +505,7 @@
*
* @see #setJMenuBar
*/
+ @SuppressWarnings("deprecation")
public JMenuBar getJMenuBar() {
return getRootPane().getMenuBar();
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java Tue Dec 16 09:58:02 2014 -0800
@@ -1494,6 +1494,7 @@
* @param width an integer giving the component's new width in pixels
* @param height an integer giving the component's new height in pixels
*/
+ @SuppressWarnings("deprecation")
public void reshape(int x, int y, int width, int height) {
super.reshape(x, y, width, height);
validate();
@@ -1735,6 +1736,7 @@
* @see InternalFrameEvent#INTERNAL_FRAME_OPENED
* @see #setVisible
*/
+ @SuppressWarnings("deprecation")
public void show() {
// bug 4312922
if (isVisible()) {
@@ -1766,6 +1768,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void hide() {
if (isIcon()) {
getDesktopIcon().setVisible(false);
--- a/jdk/src/java.desktop/share/classes/javax/swing/JList.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JList.java Tue Dec 16 09:58:02 2014 -0800
@@ -3663,6 +3663,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac instanceof AccessibleComponent) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JOptionPane.java Tue Dec 16 09:58:02 2014 -0800
@@ -566,6 +566,7 @@
* <code>true</code>
* @see java.awt.GraphicsEnvironment#isHeadless
*/
+ @SuppressWarnings("deprecation")
public static Object showInputDialog(Component parentComponent,
Object message, String title, int messageType, Icon icon,
Object[] selectionValues, Object initialSelectionValue)
@@ -855,6 +856,7 @@
* <code>true</code>
* @see java.awt.GraphicsEnvironment#isHeadless
*/
+ @SuppressWarnings("deprecation")
public static int showOptionDialog(Component parentComponent,
Object message, String title, int optionType, int messageType,
Icon icon, Object[] options, Object initialValue)
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTabbedPane.java Tue Dec 16 09:58:02 2014 -0800
@@ -333,6 +333,7 @@
* @see #addChangeListener
* @see EventListenerList
*/
+ @SuppressWarnings("deprecation")
protected void fireStateChanged() {
/* --- Begin code to deal with visibility --- */
@@ -949,6 +950,7 @@
* @see #addTab
* @see #insertTab
*/
+ @SuppressWarnings("deprecation")
public void removeTabAt(int index) {
checkIndex(index);
@@ -1557,6 +1559,7 @@
* attribute: visualUpdate true
* description: The component at the specified tab index.
*/
+ @SuppressWarnings("deprecation")
public void setComponentAt(int index, Component component) {
Page page = pages.get(index);
if (component != page.component) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/JTable.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JTable.java Tue Dec 16 09:58:02 2014 -0800
@@ -5810,6 +5810,7 @@
* where 0 is the first column
* @return the <code>Component</code> being edited
*/
+ @SuppressWarnings("deprecation")
public Component prepareEditor(TableCellEditor editor, int row, int column) {
Object value = getValueAt(row, column);
boolean isSelected = isCellSelected(row, column);
@@ -8788,6 +8789,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac instanceof AccessibleComponent) {
@@ -9640,6 +9642,7 @@
* @see AccessibleState#FOCUSED
* @see AccessibleStateSet
*/
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac instanceof AccessibleComponent) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java Tue Dec 16 09:58:02 2014 -0800
@@ -829,6 +829,7 @@
*
* @see JComponent#reshape(int, int, int, int)
*/
+ @SuppressWarnings("deprecation")
public void reshape(int x, int y, int w, int h) {
boolean sizeChanged = (getWidth() != w) || (getHeight() != h);
if (sizeChanged) {
@@ -1447,6 +1448,7 @@
* Returns true if the component needs to be completely repainted after
* a blit and a paint is received.
*/
+ @SuppressWarnings("deprecation")
private boolean needsRepaintAfterBlit() {
// Find the first heavy weight ancestor. isObscured and
// canDetermineObscurity are only appropriate for heavy weights.
--- a/jdk/src/java.desktop/share/classes/javax/swing/Popup.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/Popup.java Tue Dec 16 09:58:02 2014 -0800
@@ -253,6 +253,7 @@
paint(g);
}
+ @SuppressWarnings("deprecation")
public void show() {
this.pack();
if (getWidth() > 0 && getHeight() > 0) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java Tue Dec 16 09:58:02 2014 -0800
@@ -260,6 +260,7 @@
* @see #setMaximum
* @see #close
*/
+ @SuppressWarnings("deprecation")
public void setProgress(int nv) {
if (nv >= max) {
close();
--- a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -401,6 +401,7 @@
*
* @see JComponent#repaint
*/
+ @SuppressWarnings("deprecation")
private void addDirtyRegion0(Container c, int x, int y, int w, int h) {
/* Special cases we don't have to bother with.
*/
--- a/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java Tue Dec 16 09:58:02 2014 -0800
@@ -195,6 +195,7 @@
return true;
}
+ @SuppressWarnings("deprecation")
private void enumerateCycle(Container container, List<Component> cycle) {
if (!(container.isVisible() && container.isDisplayable())) {
return;
--- a/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/SwingUtilities.java Tue Dec 16 09:58:02 2014 -0800
@@ -1929,6 +1929,7 @@
public void windowDeactivated(WindowEvent e) {
}
+ @SuppressWarnings("deprecation")
public void show() {
// This frame can never be shown
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/UIManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -1436,6 +1436,7 @@
/*
* Sets default swing focus traversal policy.
*/
+ @SuppressWarnings("deprecation")
private static void maybeInitializeFocusPolicy(JComponent comp) {
// Check for JRootPane which indicates that a swing toplevel
// is coming, in which case a swing default focus policy
--- a/jdk/src/java.desktop/share/classes/javax/swing/package.html Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/package.html Tue Dec 16 09:58:02 2014 -0800
@@ -3,7 +3,7 @@
<HEAD>
<!--
-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
@@ -68,6 +68,8 @@
the event dispatching thread. The following two examples work equally
well for transferring control and starting up a Swing application:
<pre>
+import javax.swing.SwingUtilities;
+
public class MyApp implements Runnable {
public void run() {
// Invoked on the event dispatching thread.
@@ -75,16 +77,18 @@
}
public static void main(String[] args) {
- SwingUtilities.invokeLater(new MyApp(args));
+ SwingUtilities.invokeLater(new MyApp());
}
}
</pre>
Or:
<pre>
+import javax.swing.SwingUtilities;
+
public class MyApp {
MyApp(String[] args) {
- // Invoked on the event dispatching thread. Do any initialization
- // here.
+ // Invoked on the event dispatching thread.
+ // Do any initialization here.
}
public void show() {
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java Tue Dec 16 09:58:02 2014 -0800
@@ -216,6 +216,7 @@
*
* @return {@code false}
*/
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java Tue Dec 16 09:58:02 2014 -0800
@@ -223,6 +223,7 @@
/**
* Implementation of ComboPopup.show().
*/
+ @SuppressWarnings("deprecation")
public void show() {
comboBox.firePopupMenuWillBecomeVisible();
setListSelection(comboBox.getSelectedIndex());
@@ -234,6 +235,7 @@
/**
* Implementation of ComboPopup.hide().
*/
+ @SuppressWarnings("deprecation")
public void hide() {
MenuSelectionManager manager = MenuSelectionManager.defaultManager();
MenuElement [] selection = manager.getSelectedPath();
@@ -1032,6 +1034,7 @@
/**
* Overridden to unconditionally return false.
*/
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -502,6 +502,7 @@
public void mouseReleased(MouseEvent evt) {
}
+ @SuppressWarnings("deprecation")
public void valueChanged(ListSelectionEvent evt) {
if(!evt.getValueIsAdjusting()) {
JFileChooser chooser = getFileChooser();
@@ -1305,6 +1306,7 @@
* @return The representation of the data to be transfered.
*
*/
+ @SuppressWarnings("deprecation")
protected Transferable createTransferable(JComponent c) {
Object[] values = null;
if (c instanceof JList) {
@@ -1330,8 +1332,8 @@
for (Object obj : values) {
String val = ((obj == null) ? "" : obj.toString());
- plainBuf.append(val + "\n");
- htmlBuf.append(" <li>" + val + "\n");
+ plainBuf.append(val).append('\n');
+ htmlBuf.append(" <li>").append(val).append('\n');
}
// remove the last newline
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Tue Dec 16 09:58:02 2014 -0800
@@ -926,6 +926,7 @@
* This class should be treated as a "protected" inner class.
* Instantiate it only within subclasses of <code>Foo</code>.
*/
+ @SuppressWarnings("deprecation")
public class SystemMenuBar extends JMenuBar {
public boolean isFocusTraversable() { return false; }
public void requestFocus() {}
@@ -963,6 +964,7 @@
setOpaque(((Boolean)opacity).booleanValue());
}
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() { return false; }
public void requestFocus() {}
public AccessibleContext getAccessibleContext() {
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -2931,6 +2931,7 @@
* @return The representation of the data to be transfered.
*
*/
+ @SuppressWarnings("deprecation")
protected Transferable createTransferable(JComponent c) {
if (c instanceof JList) {
JList<?> list = (JList) c;
@@ -2948,8 +2949,8 @@
for (int i = 0; i < values.length; i++) {
Object obj = values[i];
String val = ((obj == null) ? "" : obj.toString());
- plainStr.append(val + "\n");
- htmlStr.append(" <li>" + val + "\n");
+ plainStr.append(val).append('\n');
+ htmlStr.append(" <li>").append(val).append('\n');
}
// remove the last newline
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java Tue Dec 16 09:58:02 2014 -0800
@@ -441,6 +441,7 @@
}
}
// Don't want the button to participate in focus traversable.
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
@@ -497,6 +498,7 @@
}
}
// Don't want the button to participate in focus traversable.
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -1191,6 +1191,7 @@
* Should be messaged before the dragging session starts, resets
* lastDragLocation and dividerSize.
*/
+ @SuppressWarnings("deprecation")
protected void startDragging() {
Component leftC = splitPane.getLeftComponent();
Component rightC = splitPane.getRightComponent();
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -2395,6 +2395,7 @@
return total;
}
+ @SuppressWarnings("deprecation")
public void layoutContainer(Container parent) {
/* Some of the code in this method deals with changing the
* visibility of components to hide and show the contents for the
@@ -2903,6 +2904,7 @@
return calculateMaxTabWidth(tabPlacement);
}
+ @SuppressWarnings("deprecation")
public void layoutContainer(Container parent) {
/* Some of the code in this method deals with changing the
* visibility of components to hide and show the contents for the
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -2230,11 +2230,11 @@
for (int col = 0; col < cols.length; col++) {
Object obj = table.getValueAt(rows[row], cols[col]);
String val = ((obj == null) ? "" : obj.toString());
- plainStr.append(val + "\t");
- htmlStr.append(" <td>" + val + "</td>\n");
+ plainStr.append(val).append('\t');
+ htmlStr.append(" <td>").append(val).append("</td>\n");
}
// we want a newline at the end of each line and not a tab
- plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+ plainStr.deleteCharAt(plainStr.length() - 1).append('\n');
htmlStr.append("</tr>\n");
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -2644,6 +2644,7 @@
/**
* The only richer format supported is the file list flavor
*/
+ @SuppressWarnings("deprecation")
protected Object getRicherData(DataFlavor flavor) throws UnsupportedFlavorException {
if (richText == null) {
return null;
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -421,6 +421,7 @@
*
* @param direction a direction
*/
+ @SuppressWarnings("deprecation")
protected void navigateFocusedComp(int direction)
{
int nComp = toolBar.getComponentCount();
@@ -886,6 +887,7 @@
* @param b {@code true} if the {@code JToolBar} is floating
* @param p the position
*/
+ @SuppressWarnings("deprecation")
public void setFloating(boolean b, Point p) {
if (toolBar.isFloatable()) {
boolean visible = false;
@@ -1080,6 +1082,7 @@
* @param position the relative to the {@code JTollBar} position
* @param origin the screen position of {@code JToolBar} before dragging
*/
+ @SuppressWarnings("deprecation")
protected void dragTo(Point position, Point origin)
{
if (toolBar.isFloatable())
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -2363,6 +2363,7 @@
* @param messageCancel message to cancel editing
* @param messageTree message to tree
*/
+ @SuppressWarnings("deprecation")
protected void completeEditing(boolean messageStop,
boolean messageCancel,
boolean messageTree) {
@@ -3618,8 +3619,8 @@
boolean leaf = model.isLeaf(node);
String label = getDisplayString(path, true, leaf);
- plainStr.append(label + "\n");
- htmlStr.append(" <li>" + label + "\n");
+ plainStr.append(label).append('\n');
+ htmlStr.append(" <li>").append(label).append('\n');
}
// remove the last newline
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java Tue Dec 16 09:58:02 2014 -0800
@@ -161,6 +161,7 @@
iconOnly = onlyIcon;
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java Tue Dec 16 09:58:02 2014 -0800
@@ -441,6 +441,7 @@
* @param the Container for which this layout manager is being used
* @return a Dimension object containing the layout's preferred size
*/
+ @SuppressWarnings("deprecation")
public Dimension preferredLayoutSize(Container parent) {
Dimension cpd, mbd, tpd;
int cpWidth = 0;
@@ -493,6 +494,7 @@
* @param the Container for which this layout manager is being used
* @return a Dimension object containing the layout's minimum size
*/
+ @SuppressWarnings("deprecation")
public Dimension minimumLayoutSize(Container parent) {
Dimension cpd, mbd, tpd;
int cpWidth = 0;
@@ -544,6 +546,7 @@
* @param the Container for which this layout manager is being used
* @return a Dimension object containing the layout's maximum size
*/
+ @SuppressWarnings("deprecation")
public Dimension maximumLayoutSize(Container target) {
Dimension cpd, mbd, tpd;
int cpWidth = Integer.MAX_VALUE;
@@ -607,6 +610,7 @@
*
* @param the Container for which this layout manager is being used
*/
+ @SuppressWarnings("deprecation")
public void layoutContainer(Container parent) {
JRootPane root = (JRootPane) parent;
Rectangle b = root.getBounds();
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java Tue Dec 16 09:58:02 2014 -0800
@@ -185,6 +185,7 @@
}
// Don't want the button to participate in focus traversable.
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
@@ -294,6 +295,7 @@
}
// Don't want the button to participate in focus traversable.
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java Tue Dec 16 09:58:02 2014 -0800
@@ -1427,6 +1427,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
AccessibleContext ac = getCurrentAccessibleContext();
if (ac instanceof AccessibleComponent) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphPainter1.java Tue Dec 16 09:58:02 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
@@ -218,6 +218,7 @@
return p1;
}
+ @SuppressWarnings("deprecation")
void sync(GlyphView v) {
Font f = v.getFont();
if ((metrics == null) || (! f.equals(metrics.getFont()))) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/StyleContext.java Tue Dec 16 09:58:02 2014 -0800
@@ -279,6 +279,7 @@
* @param f the font
* @return the metrics
*/
+ @SuppressWarnings("deprecation")
public FontMetrics getFontMetrics(Font f) {
// The Toolkit implementations cache, so we just forward
// to the default toolkit.
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java Tue Dec 16 09:58:02 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
@@ -916,6 +916,7 @@
* @return the zero-based index of the character under Point p; if
* Point is invalid returns -1.
*/
+ @SuppressWarnings("deprecation")
public int getIndexAtPoint(Point p) {
View v = getView();
if (v != null) {
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FormView.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, 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
@@ -599,6 +599,7 @@
* @param point associated with the mouse click.
* @return the image data.
*/
+ @SuppressWarnings("deprecation")
private String getImageData(Point point) {
String mouseCoords = point.x + ":" + point.y;
@@ -816,6 +817,7 @@
* URLEncoder.encode() method before being added to the
* buffer.
*/
+ @SuppressWarnings("deprecation")
private void appendBuffer(StringBuilder buffer, String name, String value) {
if (buffer.length() > 0) {
buffer.append('&');
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/FrameView.java Tue Dec 16 09:58:02 2014 -0800
@@ -218,6 +218,7 @@
* the scrolling attribute. If not defined, the default is "auto" which
* maps to the scrollbar's being displayed as needed.
*/
+ @SuppressWarnings("deprecation")
private void createScrollPane() {
AttributeSet attributes = getElement().getAttributes();
String scrolling = (String)attributes.getAttribute(HTML.Attribute.SCROLLING);
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/HiddenTagView.java Tue Dec 16 09:58:02 2014 -0800
@@ -129,6 +129,7 @@
// local methods
+ @SuppressWarnings("deprecation")
void updateYAlign(Font font) {
Container c = getContainer();
FontMetrics fm = (c != null) ? c.getFontMetrics(font) :
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/IsindexView.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2000, 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
@@ -88,6 +88,7 @@
* contents of the JTextField. The search
* contents are URLEncoded.
*/
+ @SuppressWarnings("deprecation")
public void actionPerformed(ActionEvent evt) {
String data = textField.getText();
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/LineView.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, 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
@@ -161,6 +161,7 @@
/**
* Returns the location for the tab.
*/
+ @SuppressWarnings("deprecation")
protected float getPreTab(float x, int tabOffset) {
Document d = getDocument();
View v = getViewAtPosition(tabOffset, null);
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Tue Dec 16 09:58:02 2014 -0800
@@ -2562,6 +2562,7 @@
}
}
+ @SuppressWarnings("deprecation")
void paint(Graphics g, float x, float y, float w, float h, View v) {
Rectangle clip = g.getClipRect();
if (clip != null) {
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java Tue Dec 16 09:58:02 2014 -0800
@@ -234,6 +234,7 @@
* Minimum size
*/
@Override
+ @SuppressWarnings("deprecation")
public Dimension minimumSize() {
return new Dimension(defaultAppletSize.width,
defaultAppletSize.height);
@@ -243,6 +244,7 @@
* Preferred size
*/
@Override
+ @SuppressWarnings("deprecation")
public Dimension preferredSize() {
return new Dimension(currentAppletSize.width,
currentAppletSize.height);
@@ -700,6 +702,7 @@
* applet event processing so that it can be gracefully interrupted from
* things like HotJava.
*/
+ @SuppressWarnings("deprecation")
private void runLoader() {
if (status != APPLET_DISPOSE) {
showAppletStatus("notdisposed");
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletProps.java Tue Dec 16 09:58:02 2014 -0800
@@ -44,6 +44,7 @@
TextField proxyPort;
Choice accessMode;
+ @SuppressWarnings("deprecation")
AppletProps() {
setTitle(amh.getMessage("title"));
Panel p = new Panel();
@@ -100,6 +101,7 @@
}
}
+ @SuppressWarnings("deprecation")
void apply() {
String proxyHostValue = proxyHost.getText().trim();
String proxyPortValue = proxyPort.getText().trim();
@@ -172,6 +174,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean action(Event evt, Object obj) {
if (amh.getMessage("button.apply").equals(obj)) {
apply();
@@ -197,6 +200,7 @@
/* Dialog class to display property-related errors to user */
@SuppressWarnings("serial") // JDK implementation class
class AppletPropsErrorDialog extends Dialog {
+ @SuppressWarnings("deprecation")
public AppletPropsErrorDialog(Frame parent, String title, String message,
String buttonText) {
super(parent, title, true);
@@ -212,6 +216,7 @@
fRect.y + ((fRect.height - dDim.height) / 2));
}
+ @SuppressWarnings("deprecation")
public boolean action(Event event, Object object) {
hide();
dispose();
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletSecurity.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, 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
@@ -121,6 +121,7 @@
/**
* get the current (first) instance of an AppletClassLoader on the stack.
*/
+ @SuppressWarnings("deprecation")
private AppletClassLoader currentAppletClassLoader()
{
// try currentClassLoader first
@@ -308,6 +309,7 @@
* @exception SecurityException if the caller does not have
* permission to access the AWT event queue.
*/
+ @SuppressWarnings("deprecation")
public void checkAwtEventQueueAccess() {
AppContext appContext = AppContext.getAppContext();
AppletClassLoader appletClassLoader = currentAppletClassLoader();
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletViewer.java Tue Dec 16 09:58:02 2014 -0800
@@ -48,6 +48,7 @@
/**
* Create the tag frame.
*/
+ @SuppressWarnings("deprecation")
TextFrame(int x, int y, String title, String text) {
setTitle(title);
TextArea txt = new TextArea(20, 60);
@@ -156,6 +157,7 @@
/**
* Create the applet viewer.
*/
+ @SuppressWarnings("deprecation")
public AppletViewer(int x, int y, URL doc, Hashtable<String, String> atts,
PrintStream statusMsgStream, AppletViewerFactory factory) {
this.factory = factory;
@@ -228,6 +230,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void appletStateChanged(AppletEvent evt)
{
AppletPanel src = (AppletPanel)evt.getSource();
@@ -594,6 +597,7 @@
/**
* Make sure the atrributes are uptodate.
*/
+ @SuppressWarnings("deprecation")
public void updateAtts() {
Dimension d = panel.size();
Insets in = panel.insets();
@@ -648,6 +652,7 @@
/**
* Save the applet to a well known file (for now) as a serialized object
*/
+ @SuppressWarnings("deprecation")
void appletSave() {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
@@ -699,6 +704,7 @@
/**
* Clone the viewer and the applet.
*/
+ @SuppressWarnings("deprecation")
void appletClone() {
Point p = location();
updateAtts();
@@ -711,6 +717,7 @@
/**
* Show the applet tag.
*/
+ @SuppressWarnings("deprecation")
void appletTag() {
ByteArrayOutputStream out = new ByteArrayOutputStream();
updateAtts();
@@ -724,6 +731,7 @@
/**
* Show the applet info.
*/
+ @SuppressWarnings("deprecation")
void appletInfo() {
String str = panel.applet.getAppletInfo();
if (str == null) {
--- a/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/AppContext.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, 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
@@ -413,6 +413,7 @@
* contained within this AppContext
* @since 1.2
*/
+ @SuppressWarnings("deprecation")
public void dispose() throws IllegalThreadStateException {
// Check to be sure that the current Thread isn't in this AppContext
if (this.threadGroup.parentOf(Thread.currentThread().getThreadGroup())) {
--- a/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/DebugSettings.java Tue Dec 16 09:58:02 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
@@ -146,6 +146,7 @@
/*
* Sets up default property values
*/
+ @SuppressWarnings("deprecation")
private void loadDefaultProperties() {
// is there a more inefficient way to setup default properties?
// maybe, but this has got to be close to 100% non-optimal
--- a/jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/LightweightFrame.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,6 +88,7 @@
@Override public final void toFront() {}
@Override public final void toBack() {}
+ @SuppressWarnings("deprecation")
@Override public void addNotify() {
synchronized (getTreeLock()) {
if (getPeer() == null) {
@@ -114,6 +115,7 @@
* @param activate if <code>true</code>, activates the frame;
* otherwise, deactivates the frame
*/
+ @SuppressWarnings("deprecation")
public void emulateActivation(boolean activate) {
((FramePeer)getPeer()).emulateActivation(activate);
}
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java Tue Dec 16 09:58:02 2014 -0800
@@ -713,6 +713,7 @@
}
+ @SuppressWarnings("deprecation")
static final SoftCache imgCache = new SoftCache();
static Image getImageFromHash(Toolkit tk, URL url) {
--- a/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Dec 16 09:58:02 2014 -0800
@@ -717,6 +717,7 @@
* Primary translation function for translating a Transferable into
* a byte array, given a source DataFlavor and target format.
*/
+ @SuppressWarnings("deprecation")
public byte[] translateTransferable(Transferable contents,
DataFlavor flavor,
long format) throws IOException
@@ -1287,6 +1288,7 @@
* an InputStream into an Object, given a source format and a target
* DataFlavor.
*/
+ @SuppressWarnings("deprecation")
public Object translateStream(InputStream str, DataFlavor flavor,
long format, Transferable localeTransferable)
throws IOException
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java Tue Dec 16 09:58:02 2014 -0800
@@ -114,7 +114,7 @@
/**
* produce an image from the stream.
*/
- @SuppressWarnings("fallthrough")
+ @SuppressWarnings({"fallthrough", "deprecation"})
public void produceImage() throws IOException, ImageFormatException {
try {
readHeader();
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -59,6 +59,7 @@
private static class ObserverCache {
+ @SuppressWarnings("deprecation")
static final SoftCache INSTANCE = new SoftCache();
}
@@ -80,7 +81,7 @@
}
synchronized (ObserverCache.INSTANCE) {
- ImageObserver o = (ImageObserver) ObserverCache.INSTANCE.get(image);
+ ImageObserver o = (ImageObserver) ObserverCache.INSTANCE.get(observer);
if (o == null) {
@@ -109,7 +110,7 @@
image, flags, x, y, width, height);
};
- ObserverCache.INSTANCE.put(image, o);
+ ObserverCache.INSTANCE.put(observer, o);
}
return o;
}
--- a/jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java Tue Dec 16 09:58:02 2014 -0800
@@ -1894,9 +1894,9 @@
}
}
catch(Exception e) {
- buf.append(" " + e.getMessage());
+ buf.append(' ').append(e.getMessage());
}
- buf.append("}");
+ buf.append('}');
return buf;
}
--- a/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java Tue Dec 16 09:58:02 2014 -0800
@@ -1214,6 +1214,7 @@
* of distinct PS fonts needed to draw this text. This saves us
* doing this processing one extra time.
*/
+ @SuppressWarnings("deprecation")
protected int platformFontCount(Font font, String str) {
if (mFontProps == null) {
return 0;
@@ -1228,6 +1229,7 @@
return (psFonts == null) ? 0 : psFonts.length;
}
+ @SuppressWarnings("deprecation")
protected boolean textOut(Graphics g, String str, float x, float y,
Font mLastFont, FontRenderContext frc,
float width) {
@@ -2123,6 +2125,7 @@
* @param w the width of the applet panel in the browser window
* @param h the width of the applet panel in the browser window
*/
+ @SuppressWarnings("deprecation")
public PluginPrinter(Component applet,
PrintStream stream,
int x, int y, int w, int h) {
--- a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Tue Dec 16 09:58:02 2014 -0800
@@ -745,6 +745,7 @@
* return a PageFormat corresponding to the updated attributes,
* or null if the user cancelled the dialog.
*/
+ @SuppressWarnings("deprecation")
public PageFormat pageDialog(final PrintRequestAttributeSet attributes)
throws HeadlessException {
if (GraphicsEnvironment.isHeadless()) {
--- a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java Tue Dec 16 09:58:02 2014 -0800
@@ -792,6 +792,7 @@
return label;
}
+ @SuppressWarnings("deprecation")
public void actionPerformed(ActionEvent e) {
Object source = e.getSource();
--- a/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/swing/FilePane.java Tue Dec 16 09:58:02 2014 -0800
@@ -1355,6 +1355,7 @@
/**
* @param index visual index of the file to be edited
*/
+ @SuppressWarnings("deprecation")
private void editFileName(int index) {
JFileChooser chooser = getFileChooser();
File currentDirectory = chooser.getCurrentDirectory();
@@ -1521,6 +1522,7 @@
}
+ @SuppressWarnings("deprecation")
void setFileSelected() {
if (getFileChooser().isMultiSelectionEnabled() && !isDirectorySelected()) {
File[] files = getFileChooser().getSelectedFiles(); // Should be selected
--- a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java Tue Dec 16 09:58:02 2014 -0800
@@ -241,6 +241,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void notifyDisplayChanged(final int scaleFactor) {
if (scaleFactor != this.scaleFactor) {
if (!copyBufferEnabled) content.paintLock();
@@ -260,6 +261,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void addNotify() {
super.addNotify();
if (getPeer() instanceof DisplayChangedListener) {
--- a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java Tue Dec 16 09:58:02 2014 -0800
@@ -358,6 +358,7 @@
* @param c Graphics Graphics
* @param font Font to get FontMetrics for
*/
+ @SuppressWarnings("deprecation")
public static FontMetrics getFontMetrics(JComponent c, Graphics g,
Font font) {
if (c != null) {
@@ -1706,6 +1707,7 @@
* This is not a general-purpose method and is here only to permit
* sharing code.
*/
+ @SuppressWarnings("deprecation")
public static boolean tabbedPaneChangeFocusTo(Component comp) {
if (comp != null) {
if (comp.isFocusTraversable()) {
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java Tue Dec 16 09:58:02 2014 -0800
@@ -71,6 +71,7 @@
}
// Must be executed on EDT.
+ @SuppressWarnings("deprecation")
protected void show(Point corner, int indent) {
assert SunToolkit.isDispatchThreadForAppContext(this);
@@ -98,6 +99,7 @@
closer.schedule();
}
+ @SuppressWarnings("deprecation")
public void hide() {
closer.close();
}
@@ -125,6 +127,7 @@
}
// WARNING: this method may be executed on Toolkit thread.
+ @SuppressWarnings("deprecation")
private void doClose() {
SunToolkit.executeOnEventHandlerThread(InfoWindow.this, new Runnable() {
public void run() {
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java Tue Dec 16 09:58:02 2014 -0800
@@ -225,6 +225,7 @@
return index == focusedIndex;
}
+ @SuppressWarnings("deprecation")
void setFont(Font newFont) {
if (newFont != font) {
font = newFont;
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java Tue Dec 16 09:58:02 2014 -0800
@@ -326,6 +326,7 @@
* check for adding duplicate items
* @param item item to add
*/
+ @SuppressWarnings("deprecation")
public void addItem(MenuItem item) {
XMenuItemPeer mp = (XMenuItemPeer)item.getPeer();
if (mp != null) {
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java Tue Dec 16 09:58:02 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
@@ -499,6 +499,7 @@
}
// Stolen from TinyChoicePeer
+ @SuppressWarnings("deprecation")
public Dimension getMinimumSize() {
// TODO: move this impl into ListHelper?
FontMetrics fm = getFontMetrics(target.getFont());
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java Tue Dec 16 09:58:02 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
@@ -281,6 +281,11 @@
}
}
- checkChange(formats);
+ XToolkit.awtUnlock();
+ try {
+ checkChange(formats);
+ } finally {
+ XToolkit.awtLock();
+ }
}
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -167,6 +167,7 @@
return System.getProperty("sun.awt.X11.XComponentPeer.reparentNotSupported", "false").equals("false");
}
+ @SuppressWarnings("deprecation")
public boolean isObscured() {
Container container = (target instanceof Container) ?
(Container)target : target.getParent();
@@ -279,6 +280,7 @@
}
// TODO: consider moving it to KeyboardFocusManagerPeerImpl
+ @SuppressWarnings("deprecation")
final public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed, long time,
CausedFocusEvent.Cause cause)
@@ -388,6 +390,7 @@
/**
* @see java.awt.peer.ComponentPeer
*/
+ @SuppressWarnings("deprecation")
public void setEnabled(final boolean value) {
if (enableLog.isLoggable(PlatformLogger.Level.FINE)) {
enableLog.fine("{0}ing {1}", (value ? "Enabl" : "Disabl"), this);
@@ -1324,6 +1327,7 @@
}
}
+ @SuppressWarnings("deprecation")
private void addTree(Collection<Long> order, Set<Long> set, Container cont) {
for (int i = 0; i < cont.getComponentCount(); i++) {
Component comp = cont.getComponent(i);
@@ -1344,6 +1348,7 @@
/****** DropTargetPeer implementation ********************/
+ @SuppressWarnings("deprecation")
public void addDropTarget(DropTarget dt) {
Component comp = target;
while(!(comp == null || comp instanceof Window)) {
@@ -1358,6 +1363,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void removeDropTarget(DropTarget dt) {
Component comp = target;
while(!(comp == null || comp instanceof Window)) {
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -110,6 +110,7 @@
return theInstance;
}
+ @SuppressWarnings("deprecation")
protected void startDrag(Transferable transferable,
long[] formats, Map<Long, DataFlavor> formatMap) {
Component component = getTrigger().getComponent();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java Tue Dec 16 09:58:02 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
@@ -188,6 +188,7 @@
// If source is an XEmbedCanvasPeer, passes the event to it for processing and
// return true if the event is forwarded to the XEmbed child.
// Otherwise, does nothing and return false.
+ @SuppressWarnings("deprecation")
private boolean processSunDropTargetEvent(SunDropTargetEvent event) {
Object source = event.getSource();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, 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
@@ -166,6 +166,7 @@
XToolkit.postEvent(XToolkit.targetToAppContext(proxy), event);
}
+ @SuppressWarnings("deprecation")
boolean simulateMotifRequestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed, long time)
{
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java Tue Dec 16 09:58:02 2014 -0800
@@ -61,6 +61,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void addNotify()
{
if (getPeer() == null) {
@@ -77,6 +78,7 @@
/*
* The method shouldn't be called in case of active XEmbed.
*/
+ @SuppressWarnings("deprecation")
public boolean traverseIn(boolean direction) {
XEmbeddedFramePeer peer = (XEmbeddedFramePeer)getPeer();
if (peer != null) {
@@ -89,6 +91,7 @@
return false;
}
+ @SuppressWarnings("deprecation")
protected boolean traverseOut(boolean direction) {
XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
if (direction == FORWARD) {
@@ -103,6 +106,7 @@
/*
* The method shouldn't be called in case of active XEmbed.
*/
+ @SuppressWarnings("deprecation")
public void synthesizeWindowActivation(boolean doActivate) {
XEmbeddedFramePeer peer = (XEmbeddedFramePeer)getPeer();
if (peer != null) {
@@ -114,12 +118,14 @@
}
}
+ @SuppressWarnings("deprecation")
public void registerAccelerator(AWTKeyStroke stroke) {
XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
if (xefp != null) {
xefp.registerAccelerator(stroke);
}
}
+ @SuppressWarnings("deprecation")
public void unregisterAccelerator(AWTKeyStroke stroke) {
XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
if (xefp != null) {
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, 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
@@ -46,6 +46,7 @@
XToolkit.removeEventDispatcher(embedder.getWindow(), this);
}
+ @SuppressWarnings("deprecation")
void add(long child) {
if (checkXEmbed(child)) {
Component proxy = createChildProxy(child);
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -135,6 +135,7 @@
this.target = target;
}
+ @SuppressWarnings("deprecation")
private void init(FileDialog target) {
fileDialog = target; //new Dialog(target, target.getTitle(), false);
this.title = target.getTitle();
@@ -414,6 +415,7 @@
/**
* handle the cancel event
*/
+ @SuppressWarnings("deprecation")
void handleCancel() {
KeyboardFocusManager.getCurrentKeyboardFocusManager()
.removeKeyEventDispatcher(this);
@@ -435,6 +437,7 @@
/**
* handle the quit event
*/
+ @SuppressWarnings("deprecation")
void handleQuitButton() {
dir = null;
file = null;
@@ -444,6 +447,7 @@
/**
* set the entry of the new dir with f
*/
+ @SuppressWarnings("deprecation")
void setFilterEntry(String d, String f) {
File fe = new File(d);
@@ -638,6 +642,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean dispatchKeyEvent(KeyEvent keyEvent) {
int id = keyEvent.getID();
int keyCode = keyEvent.getKeyCode();
@@ -774,6 +779,7 @@
}
// 03/02/2005 b5097243 Pressing 'ESC' on a file dlg does not dispose the dlg on Xtoolkit
+ @SuppressWarnings("deprecation")
public void setVisible(boolean b){
if (fileDialog == null) {
init(target);
@@ -852,6 +858,7 @@
public final static int VERTICAL = 1;
int orientation;
+ @SuppressWarnings("deprecation")
public Separator(int length, int thickness, int orient) {
super();
orientation = orient;
@@ -863,6 +870,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void paint(Graphics g) {
int x1, y1, x2, y2;
Rectangle bbox = bounds();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -108,6 +108,7 @@
setExtendedState(state);
}
+ @SuppressWarnings("deprecation")
public void setMenuBar(MenuBar mb) {
// state_lock should always be the second after awt_lock
XToolkit.awtLock();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java Tue Dec 16 09:58:02 2014 -0800
@@ -137,6 +137,7 @@
XToolkit.awtUnlock();
}
+ @SuppressWarnings("deprecation")
long getCurrentParentWindow() {
return ((XWindow)clientComponentWindow.getPeer()).getContentWindow();
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -163,6 +163,7 @@
postPaintEvent();
}
+ @SuppressWarnings("deprecation")
public void addHelpMenu(Menu m) {
XMenuPeer mp = (XMenuPeer)m.getPeer();
synchronized(getMenuTreeLock()) {
@@ -179,6 +180,7 @@
/**
* called from XFramePeer.setMenuBar
*/
+ @SuppressWarnings("deprecation")
public void init(Frame frame) {
this.target = frame;
this.framePeer = (XFramePeer)frame.getPeer();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, 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
@@ -75,6 +75,7 @@
return 0;
}
+ @SuppressWarnings("deprecation")
public boolean isWindowUnderMouse(Window w) {
long display = XToolkit.getDisplay();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, 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
@@ -76,6 +76,7 @@
}
+ @SuppressWarnings("deprecation")
public void setBackground(Color c) {
Component comp;
int i;
@@ -101,6 +102,7 @@
setForegroundForHierarchy((Container) target, c);
}
+ @SuppressWarnings("deprecation")
private void setForegroundForHierarchy(Container cont, Color c) {
synchronized(target.getTreeLock()) {
int n = cont.getComponentCount();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java Tue Dec 16 09:58:02 2014 -0800
@@ -55,6 +55,7 @@
/**
* Calls <code>Component.paint(Graphics)</code> with given Graphics.
*/
+ @SuppressWarnings("deprecation")
protected void paintComponent(Component comp, Graphics g) {
if (comp != null) {
final XComponentPeer peer = (XComponentPeer) comp.getPeer();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, 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
@@ -141,6 +141,7 @@
repaint();
}
+ @SuppressWarnings("deprecation")
Dimension getChildSize() {
ScrollPane sp = (ScrollPane)target;
if (sp.countComponents() > 0) {
@@ -151,6 +152,7 @@
}
}
+ @SuppressWarnings("deprecation")
boolean setScrollbarSpace() {
ScrollPane sp = (ScrollPane)target;
boolean changed = false;
@@ -268,6 +270,7 @@
/**
* Scroll the contents to position x, y
*/
+ @SuppressWarnings("deprecation")
void scroll(int x, int y, int flag, int type) {
checkSecurity();
ScrollPane sp = (ScrollPane)target;
@@ -569,6 +572,7 @@
* ToDo(aim): needs to query native motif for more accurate size and
* color information.
*/
+ @SuppressWarnings("deprecation")
public void print(Graphics g) {
ScrollPane sp = (ScrollPane)target;
Dimension d = sp.size();
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java Tue Dec 16 09:58:02 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
@@ -43,6 +43,7 @@
DEFAULT_WIDTH_LINUX = XToolkit.getUIDefaults().getInt("ScrollBar.defaultWidth");
}
+ @SuppressWarnings("deprecation")
public void preInit(XCreateWindowParams params) {
super.preInit(params);
Scrollbar target = (Scrollbar) this.target;
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -1164,6 +1164,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public ComponentPeer getPeer() {
return (ComponentPeer) (xwin);
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTextFieldPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -208,6 +208,7 @@
* @see java.awt.peer.TextComponentPeer
*/
@Override
+ @SuppressWarnings("deprecation")
public String getText() {
return xtext.getText();
}
@@ -564,6 +565,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void actionPerformed( ActionEvent actionEvent ) {
peer.postEvent(new ActionEvent(peer.target,
ActionEvent.ACTION_PERFORMED,
@@ -598,6 +600,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public ComponentPeer getPeer() {
return (ComponentPeer) peer;
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Tue Dec 16 09:58:02 2014 -0800
@@ -2438,12 +2438,14 @@
awtUnlock();
}
}
+ @SuppressWarnings("deprecation")
public void grab(Window w) {
if (w.getPeer() != null) {
((XWindowPeer)w.getPeer()).setGrab(true);
}
}
+ @SuppressWarnings("deprecation")
public void ungrab(Window w) {
if (w.getPeer() != null) {
((XWindowPeer)w.getPeer()).setGrab(false);
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -347,6 +347,7 @@
}
// It's synchronized with disposal by EDT.
+ @SuppressWarnings("deprecation")
public void showPopupMenu(int x, int y) {
if (isDisposed())
return;
@@ -415,6 +416,7 @@
canvas.addMouseMotionListener(eventProxy);
}
+ @SuppressWarnings("deprecation")
long getWindow() {
return ((XEmbeddedFramePeer)eframe.getPeer()).getWindow();
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java Tue Dec 16 09:58:02 2014 -0800
@@ -282,6 +282,7 @@
return reparented;
}
+ @SuppressWarnings("deprecation")
static long getParentWindowID(Component target) {
ComponentPeer peer = target.getParent().getPeer();
@@ -298,6 +299,7 @@
}
+ @SuppressWarnings("deprecation")
static XWindow getParentXWindowObject(Component target) {
if (target == null) return null;
Component temp = target.getParent();
@@ -374,6 +376,7 @@
target.getFont());
}
+ @SuppressWarnings("deprecation")
public FontMetrics getFontMetrics(Font font) {
return Toolkit.getDefaultToolkit().getFontMetrics(font);
}
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -210,6 +210,7 @@
private static native String getLocalHostname();
private static native int getJvmPID();
+ @SuppressWarnings("deprecation")
void postInit(XCreateWindowParams params) {
super.postInit(params);
@@ -400,6 +401,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void recursivelySetIcon(java.util.List<IconInfo> icons) {
dumpIcons(winAttr.icons);
setIconHints(icons);
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java Tue Dec 16 09:58:02 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
@@ -325,6 +325,7 @@
return (isFullScreenSupported() && (getFullScreenWindow() != null));
}
+ @SuppressWarnings("deprecation")
private static void enterFullScreenExclusive(Window w) {
X11ComponentPeer peer = (X11ComponentPeer)w.getPeer();
if (peer != null) {
@@ -333,6 +334,7 @@
}
}
+ @SuppressWarnings("deprecation")
private static void exitFullScreenExclusive(Window w) {
X11ComponentPeer peer = (X11ComponentPeer)w.getPeer();
if (peer != null) {
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java Tue Dec 16 09:58:02 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
@@ -73,6 +73,7 @@
* Create a pbuffer-based SurfaceData object (or init the backbuffer
* of an existing window if this is a double buffered GraphicsConfig)
*/
+ @SuppressWarnings("deprecation")
protected SurfaceData initAcceleratedSurface() {
SurfaceData sData;
Component comp = vImg.getComponent();
--- a/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java Tue Dec 16 09:58:02 2014 -0800
@@ -329,6 +329,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public synchronized void setFullScreenWindow(Window w) {
Window old = getFullScreenWindow();
if (w == old) {
@@ -404,6 +405,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public synchronized void setDisplayMode(DisplayMode dm) {
if (!isDisplayChangeSupported()) {
super.setDisplayMode(dm);
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java Tue Dec 16 09:58:02 2014 -0800
@@ -606,6 +606,7 @@
// java.awt.Toolkit#getNativeContainer() is not available
// from this package
+ @SuppressWarnings("deprecation")
private WComponentPeer getNearestNativePeer(Component comp)
{
if (comp==null) return null;
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -46,6 +46,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void setCurrentFocusOwner(Component comp) {
setNativeFocusOwner(comp != null ? comp.getPeer() : null);
}
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -39,6 +39,7 @@
// ListPeer implementation
@Override
+ @SuppressWarnings("deprecation")
public int[] getSelectedIndexes() {
List l = (List)target;
int len = l.countItems();
@@ -92,6 +93,7 @@
@Override
public native void delItems(int start, int end);
+ @SuppressWarnings("deprecation")
public void clear() {
List l = (List)target;
delItems(0, l.countItems());
@@ -129,6 +131,7 @@
native void create(WComponentPeer parent);
@Override
+ @SuppressWarnings("deprecation")
void initialize() {
List li = (List)target;
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -199,6 +199,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void run() {
if (getScrollChild() == null) {
return;
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java Tue Dec 16 09:58:02 2014 -0800
@@ -82,6 +82,7 @@
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
@Override
+ @SuppressWarnings("deprecation")
public void run() {
PopupMenu newPopup = ((TrayIcon)target).getPopupMenu();
if (popup != newPopup) {
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java Tue Dec 16 09:58:02 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
@@ -61,6 +61,7 @@
private BufferCapabilities bufferCaps;
private D3DGraphicsDevice device;
+ @SuppressWarnings("deprecation")
protected D3DGraphicsConfig(D3DGraphicsDevice device) {
super(device, 0);
this.device = device;
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Tue Dec 16 09:58:02 2014 -0800
@@ -176,6 +176,7 @@
long hwnd);
@Override
+ @SuppressWarnings("deprecation")
protected void enterFullScreenExclusive(final int screen, WindowPeer wp)
{
final WWindowPeer wpeer = (WWindowPeer)realFSWindow.getPeer();
@@ -246,6 +247,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
protected void addFSWindowListener(Window w) {
// if the window is not a toplevel (has an owner) we have to use the
// real toplevel to enter the full-screen mode with (4933099).
@@ -273,6 +275,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
protected void removeFSWindowListener(Window w) {
realFSWindow.removeWindowListener(fsWindowListener);
fsWindowListener = null;
@@ -337,6 +340,7 @@
int bitDepth,
int refreshRate);
@Override
+ @SuppressWarnings("deprecation")
protected void configDisplayMode(final int screen, final WindowPeer w,
final int width, final int height,
final int bitDepth, final int refreshRate)
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -523,6 +523,7 @@
* @param comp component to check for hw children
* @return true if Component has heavyweight children
*/
+ @SuppressWarnings("deprecation")
private static boolean hasHWChildren(Component comp) {
if (comp instanceof Container) {
for (Component c : ((Container)comp).getComponents()) {
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java Tue Dec 16 09:58:02 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
@@ -79,6 +79,7 @@
* Create a pbuffer-based SurfaceData object (or init the backbuffer
* of an existing window if this is a double buffered GraphicsConfig).
*/
+ @SuppressWarnings("deprecation")
protected SurfaceData initAcceleratedSurface() {
SurfaceData sData;
Component comp = vImg.getComponent();
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -81,6 +81,7 @@
wglAvailable = initWGL();
}
+ @SuppressWarnings("deprecation")
protected WGLGraphicsConfig(Win32GraphicsDevice device, int visualnum,
long configInfo, ContextCapabilities oglCaps)
{
--- a/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java Tue Dec 16 09:58:02 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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 @@
* Create a pbuffer-based SurfaceData object (or init the backbuffer
* of an existing window if this is a double buffered GraphicsConfig).
*/
+ @SuppressWarnings("deprecation")
protected SurfaceData initAcceleratedSurface() {
SurfaceData sData;
Component comp = vImg.getComponent();
--- a/jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/test/java/awt/GraphicsEnvironment/TestDetectHeadless/TestDetectHeadless.sh Tue Dec 16 09:58:02 2014 -0800
@@ -28,7 +28,7 @@
#
# @test
-# @bug 8058930
+# @bug 8058930 7077826
# @summary java.awt.GraphicsEnvironment.getHeadlessProperty() does not work for AIX
#
# @build TestDetectHeadless
@@ -36,7 +36,7 @@
OS=`uname -s`
case "$OS" in
- Windows* | CYGWIN* )
+ Windows* | CYGWIN* | Darwin)
echo "Passed"; exit 0 ;;
* ) unset DISPLAY ;;
esac
@@ -44,4 +44,14 @@
${TESTJAVA}/bin/java ${TESTVMOPTS} \
-cp ${TESTCLASSES} TestDetectHeadless
+if [ $? -ne 0 ]; then
+ exit 1;
+fi
+
+DISPLAY=
+export DISPLAY
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} \
+ -cp ${TESTCLASSES} TestDetectHeadless
+
exit $?
--- a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh Tue Dec 16 09:58:02 2014 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -21,23 +21,15 @@
${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
-
-DISPLAY=
-export DISPLAY
-
OS=`uname -s`
case "$OS" in
- SunOS )
- ${TESTJAVA}/bin/java ${TESTVMOPTS} BadDisplayTest
- ;;
- Linux )
- ${TESTJAVA}/bin/java ${TESTVMOPTS} BadDisplayTest
- ;;
- * )
- echo "Unsupported System: ${OS}"
- exit 0;
- ;;
+ Windows* | CYGWIN* | Darwin)
+ echo "Passed"; exit 0 ;;
esac
+DISPLAY=SomeBadDisplay
+export DISPLAY
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} BadDisplayTest
+
exit $?
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/image/MultiResolutionImage/MultiResolutionImageObserverTest.java Tue Dec 16 09:58:02 2014 -0800
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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.
+ */
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
+import static java.awt.image.ImageObserver.*;
+import java.io.File;
+import javax.imageio.ImageIO;
+/*
+ * @test
+ * @bug 8065627
+ * @summary Animated GIFs fail to display on a HiDPI display
+ * @author Alexander Scherbatiy
+ * @run main MultiResolutionImageObserverTest
+ */
+
+public class MultiResolutionImageObserverTest {
+
+ private static final int TIMEOUT = 500;
+
+ public static void main(String[] args) throws Exception {
+
+ generateImages();
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
+ Image image = Toolkit.getDefaultToolkit().getImage(IMAGE_NAME_1X);
+
+ LoadImageObserver sizeObserver
+ = new LoadImageObserver(WIDTH | HEIGHT);
+ toolkit.prepareImage(image, -1, -1, sizeObserver);
+ waitForImageLoading(sizeObserver, "The first observer is not called");
+
+ LoadImageObserver bitsObserver
+ = new LoadImageObserver(SOMEBITS | FRAMEBITS | ALLBITS);
+
+ BufferedImage buffImage = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2d = (Graphics2D) buffImage.createGraphics();
+ g2d.scale(2, 2);
+ g2d.drawImage(image, 0, 0, bitsObserver);
+ waitForImageLoading(bitsObserver, "The second observer is not called!");
+ g2d.dispose();
+ }
+
+ private static void waitForImageLoading(LoadImageObserver observer,
+ String errorMessage) throws Exception {
+
+ long endTime = System.currentTimeMillis() + TIMEOUT;
+
+ while (!observer.loaded && System.currentTimeMillis() < endTime) {
+ Thread.sleep(TIMEOUT / 10);
+ }
+
+ if (!observer.loaded) {
+ throw new RuntimeException(errorMessage);
+ }
+ }
+
+ private static final String IMAGE_NAME_1X = "image.png";
+ private static final String IMAGE_NAME_2X = "image@2x.png";
+
+ private static void generateImages() throws Exception {
+ generateImage(1);
+ generateImage(2);
+ }
+
+ private static void generateImage(int scale) throws Exception {
+ BufferedImage image = new BufferedImage(
+ scale * 200, scale * 300,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics g = image.createGraphics();
+ g.setColor(scale == 1 ? Color.GREEN : Color.BLUE);
+ g.fillRect(0, 0, scale * 200, scale * 300);
+ File file = new File(scale == 1 ? IMAGE_NAME_1X : IMAGE_NAME_2X);
+ ImageIO.write(image, "png", file);
+ g.dispose();
+ }
+
+ private static class LoadImageObserver implements ImageObserver {
+
+ private final int infoflags;
+ private boolean loaded;
+
+ public LoadImageObserver(int flags) {
+ this.infoflags = flags;
+ }
+
+ @Override
+ public boolean imageUpdate(Image img, int flags, int x, int y, int width, int height) {
+
+ if ((flags & infoflags) != 0) {
+ loaded = true;
+ }
+
+ return !loaded;
+ }
+ }
+}
--- a/jdk/test/javax/swing/regtesthelpers/Util.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/test/javax/swing/regtesthelpers/Util.java Tue Dec 16 09:58:02 2014 -0800
@@ -253,4 +253,18 @@
}
return result;
}
+
+ /**
+ * Gets key codes from system mnemonic key mask
+ * @return key codes list
+ */
+ public static ArrayList<Integer> getSystemMnemonicKeyCodes() {
+ String osName = System.getProperty("os.name");
+ ArrayList<Integer> result = new ArrayList<>();
+ if (osName.contains("OS X")) {
+ result.add(KeyEvent.VK_CONTROL);
+ }
+ result.add(KeyEvent.ALT_MASK);
+ return result;
+ }
}
--- a/jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Dec 16 09:51:17 2014 -0800
+++ b/jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Dec 16 09:58:02 2014 -0800
@@ -277,9 +277,6 @@
try {
Transferable t = dtde.getTransferable();
Object data = t.getTransferData(DropObjectFlavor);
- if (data != null) {
- throw new Exception("getTransferData returned non-null");
- }
} catch (Exception e) {
dragEnterException = e;
e.printStackTrace();