8067086: Suppress mac-specific deprecation warnings in the java.desktop module
Reviewed-by: prr
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxButton.java Tue Dec 16 10:09:01 2014 -0800
@@ -70,6 +70,7 @@
return comboBox == null ? true : comboBox.isEnabled();
}
+ @SuppressWarnings("deprecation")
public boolean isFocusTraversable() {
return false;
}
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java Tue Dec 16 10:09:01 2014 -0800
@@ -303,6 +303,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void hide() {
final Container parent = getParent();
final Rectangle r = this.getBounds();
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java Tue Dec 16 10:09:01 2014 -0800
@@ -2231,6 +2231,7 @@
return total;
}
+ @SuppressWarnings("deprecation")
public void layoutContainer(final Container parent) {
/* Some of the code in this method deals with changing the
* visibility of components to hide and show the contents for the
@@ -2725,6 +2726,7 @@
return calculateMaxTabWidth(tabPlacement);
}
+ @SuppressWarnings("deprecation")
public void layoutContainer(final 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/macosx/classes/com/apple/laf/ScreenMenu.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java Tue Dec 16 10:09:01 2014 -0800
@@ -229,6 +229,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void addNotify() {
synchronized (getTreeLock()) {
super.addNotify();
@@ -354,6 +355,7 @@
public void setIndeterminate(boolean indeterminate) { }
@Override
+ @SuppressWarnings("deprecation")
public void setToolTipText(final String text) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -363,6 +365,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void setIcon(final Icon i) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuBar.java Tue Dec 16 10:09:01 2014 -0800
@@ -246,6 +246,7 @@
fSubmenus.remove(menu);
}
+ @SuppressWarnings("deprecation")
public Menu add(final Menu m, final int index) {
synchronized (getTreeLock()) {
if (m.getParent() != null) {
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItem.java Tue Dec 16 10:09:01 2014 -0800
@@ -97,6 +97,7 @@
fMenuItem.removeComponentListener(this);
}
+ @SuppressWarnings("deprecation")
static void syncLabelAndKS(MenuItem menuItem, String label, KeyStroke ks) {
final MenuComponentPeer peer = menuItem.getPeer();
if (!(peer instanceof CMenuItem)) {
@@ -165,6 +166,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void setToolTipText(final String text) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -173,6 +175,7 @@
cmi.setToolTipText(text);
}
+ @SuppressWarnings("deprecation")
public void setIcon(final Icon i) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java Tue Dec 16 10:09:01 2014 -0800
@@ -57,6 +57,7 @@
}
ScreenMenuPropertyListener fPropertyListener;
+ @SuppressWarnings("deprecation")
public void addNotify() {
super.addNotify();
@@ -154,6 +155,7 @@
setVisible(false);
}
+ @SuppressWarnings("deprecation")
public void setToolTipText(final String text) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -161,6 +163,7 @@
((CMenuItem)peer).setToolTipText(text);
}
+ @SuppressWarnings("deprecation")
public void setIcon(final Icon i) {
final MenuComponentPeer peer = getPeer();
if (!(peer instanceof CMenuItem)) return;
@@ -205,6 +208,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void setIndeterminate(final boolean indeterminate) {
final MenuComponentPeer peer = getPeer();
if (peer instanceof CCheckboxMenuItem) {
--- a/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/awt/CGraphicsDevice.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * 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
@@ -202,6 +202,7 @@
return true;
}
+ @SuppressWarnings("deprecation")
private static void enterFullScreenExclusive(Window w) {
FullScreenCapable peer = (FullScreenCapable)w.getPeer();
if (peer != null) {
@@ -209,6 +210,7 @@
}
}
+ @SuppressWarnings("deprecation")
private static void exitFullScreenExclusive(Window w) {
FullScreenCapable peer = (FullScreenCapable)w.getPeer();
if (peer != null) {
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -125,6 +125,7 @@
return fConfig;
}
+ @SuppressWarnings("deprecation")
protected void setBounds(int x, int y, int w, int h) {
fBounds.reshape(x, y, w, y + h);
}
--- a/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,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 = null;
Component comp = vImg.getComponent();
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Dec 16 10:09:01 2014 -0800
@@ -1243,6 +1243,7 @@
changeFocusedWindow(activate, null);
}
+ @SuppressWarnings("deprecation")
private boolean isOneOfOwnersOf(LWWindowPeer peer) {
Window owner = (peer != null ? peer.getTarget().getOwner() : null);
while (owner != null) {
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,7 @@
super.startDrag(dsc, cursor, dragImage, dragImageOffset);
}
+ @SuppressWarnings("deprecation")
protected void startDrag(Transferable transferable, long[] formats, Map<Long, DataFlavor> formatMap) {
DragGestureEvent trigger = getTrigger();
InputEvent triggerEvent = trigger.getTriggerEvent();
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Tue Dec 16 10:09:01 2014 -0800
@@ -46,6 +46,7 @@
show();
}
+ @SuppressWarnings("deprecation")
public void addNotify() {
if (getPeer() == null) {
LWCToolkit toolkit = (LWCToolkit)Toolkit.getDefaultToolkit();
@@ -60,6 +61,7 @@
public void unregisterAccelerator(AWTKeyStroke stroke) {}
+ @SuppressWarnings("deprecation")
protected long getLayerPtr() {
LWWindowPeer peer = (LWWindowPeer)getPeer();
return peer.getLayerPtr();
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -385,6 +385,7 @@
// java.awt.Toolkit#getNativeContainer() is not available
// from this package
+ @SuppressWarnings("deprecation")
private LWComponentPeer<?, ?> getNearestNativePeer(Component comp) {
if (comp==null)
return null;
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuBar.java Tue Dec 16 10:09:01 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void addHelpMenu(Menu m) {
CMenu cMenu = (CMenu)m.getPeer();
nativeSetHelpMenu(getModel(), cMenu.getModel());
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Dec 16 10:09:01 2014 -0800
@@ -190,6 +190,7 @@
nativeSetNSWindowRepresentedFilename(c.getNSWindowPtr(), filename);
}}
}) {
+ @SuppressWarnings("deprecation")
public CPlatformWindow convertJComponentToTarget(final JRootPane p) {
Component root = SwingUtilities.getRoot(p);
if (root == null || (LWWindowPeer)root.getPeer() == null) return null;
@@ -519,6 +520,7 @@
}
@Override // PlatformWindow
+ @SuppressWarnings("deprecation")
public void setVisible(boolean visible) {
final long nsWindowPtr = getNSWindowPtr();
@@ -674,6 +676,7 @@
}
@Override // PlatformWindow
+ @SuppressWarnings("deprecation")
public void toFront() {
final long nsWindowPtr = getNSWindowPtr();
LWCToolkit lwcToolkit = (LWCToolkit) Toolkit.getDefaultToolkit();
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java Tue Dec 16 10:09:01 2014 -0800
@@ -68,6 +68,7 @@
updateImage();
}
+ @SuppressWarnings("deprecation")
private CPopupMenu checkAndCreatePopupPeer() {
CPopupMenu menuPeer = null;
if (popup != null) {
--- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java Tue Dec 16 09:57:33 2014 -0800
+++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java Tue Dec 16 10:09:01 2014 -0800
@@ -78,6 +78,7 @@
* Synthetic event delivery for focus management
*/
@Override
+ @SuppressWarnings("deprecation")
public void synthesizeWindowActivation(boolean activated) {
if (isActive != activated) {
isActive = activated;