diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java index 4b09210e9e41..abfb14758fe2 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020, 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 @@ -431,7 +431,7 @@ public void repaintButtons() { } @Override - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void mouseReleased(final MouseEvent e) { if (didForwardEvent(e)) return; diff --git a/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java b/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java index c6968c2ebc9d..4e065945ff16 100644 --- a/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java +++ b/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2020, 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,7 +88,7 @@ public static void setDelegateRepaintManager(JComponent component, * or {@code Applet} * @param isRequested the value to set vsyncRequested state to */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static void setVsyncRequested(Container rootContainer, boolean isRequested) { assert (rootContainer instanceof Applet) || (rootContainer instanceof Window); @@ -105,7 +105,7 @@ public static void setVsyncRequested(Container rootContainer, * @param rootContainer topmost container. Should be either Window or Applet * @return {@code true} if vsync painting is requested for {@code rootContainer} */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static boolean isVsyncRequested(Container rootContainer) { assert (rootContainer instanceof Applet) || (rootContainer instanceof Window); return Boolean.TRUE == vsyncedMap.get(rootContainer); diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java index 84f17cd18aaf..aaac69d703dd 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -57,7 +57,7 @@ * @author Arthur van Hoff, Kara Kytle, Jan Borgersen * @author Florian Bomers */ -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "removal"}) public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, LineListener { private static final int BUFFER_SIZE = 16384; // number of bytes written each time to the source data line diff --git a/src/java.desktop/share/classes/java/applet/Applet.java b/src/java.desktop/share/classes/java/applet/Applet.java index f45ed4436196..7a210078edd9 100644 --- a/src/java.desktop/share/classes/java/applet/Applet.java +++ b/src/java.desktop/share/classes/java/applet/Applet.java @@ -59,7 +59,8 @@ * @since 1.0 * @deprecated The Applet API is deprecated, no replacement. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) +@SuppressWarnings("removal") public class Applet extends Panel { /** diff --git a/src/java.desktop/share/classes/java/applet/AppletContext.java b/src/java.desktop/share/classes/java/applet/AppletContext.java index 4e18a8117783..f870bba829b1 100644 --- a/src/java.desktop/share/classes/java/applet/AppletContext.java +++ b/src/java.desktop/share/classes/java/applet/AppletContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2020, 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,7 +43,8 @@ * @since 1.0 * @deprecated The Applet API is deprecated, no replacement. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) +@SuppressWarnings("removal") public interface AppletContext { /** diff --git a/src/java.desktop/share/classes/java/applet/AppletStub.java b/src/java.desktop/share/classes/java/applet/AppletStub.java index ee6c43cb5c40..3b7646a8a42c 100644 --- a/src/java.desktop/share/classes/java/applet/AppletStub.java +++ b/src/java.desktop/share/classes/java/applet/AppletStub.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2020, 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 @@ -38,7 +38,8 @@ * @since 1.0 * @deprecated The Applet API is deprecated, no replacement. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) +@SuppressWarnings("removal") public interface AppletStub { /** diff --git a/src/java.desktop/share/classes/java/applet/AudioClip.java b/src/java.desktop/share/classes/java/applet/AudioClip.java index fd437e744e38..d58a609b9910 100644 --- a/src/java.desktop/share/classes/java/applet/AudioClip.java +++ b/src/java.desktop/share/classes/java/applet/AudioClip.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2020, 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 @@ -34,7 +34,7 @@ * @since 1.0 * @deprecated The Applet API is deprecated, no replacement. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) public interface AudioClip { /** diff --git a/src/java.desktop/share/classes/java/applet/package-info.java b/src/java.desktop/share/classes/java/applet/package-info.java index fd24ce24d940..196b6aa466b2 100644 --- a/src/java.desktop/share/classes/java/applet/package-info.java +++ b/src/java.desktop/share/classes/java/applet/package-info.java @@ -36,7 +36,11 @@ * running applets. For example, the applet context could be a Web browser or an * applet development environment. *

- * The APIs in this package are all deprecated without replacement. + * @deprecated. This package has been deprecated and may be removed in + * a future version of the Java Platform. There is no replacement. + * All of the classes and interfaces in this package have been terminally + * deprecated. + * Users are advised to migrate their applications to other technologies. * * @since 1.0 */ diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java index 98a8cdc03b70..2cd9643e7d17 100644 --- a/src/java.desktop/share/classes/java/awt/Component.java +++ b/src/java.desktop/share/classes/java/awt/Component.java @@ -4045,7 +4045,7 @@ protected class FlipBufferStrategy extends BufferStrategy { * {@code true}. * @see #createBuffers(int, BufferCapabilities) */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") protected FlipBufferStrategy(int numBuffers, BufferCapabilities caps) throws AWTException { @@ -8177,7 +8177,7 @@ boolean transferFocus(boolean clearOnFailure) { return res; } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") final Component getNextFocusCandidate() { Container rootAncestor = getTraversalRoot(); Component comp = this; diff --git a/src/java.desktop/share/classes/java/beans/AppletInitializer.java b/src/java.desktop/share/classes/java/beans/AppletInitializer.java index 1e2a99b357cb..2f01a3822d0f 100644 --- a/src/java.desktop/share/classes/java/beans/AppletInitializer.java +++ b/src/java.desktop/share/classes/java/beans/AppletInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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,7 +43,7 @@ * java.applet package * documentation for further information. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) public interface AppletInitializer { /** @@ -73,6 +73,7 @@ public interface AppletInitializer { * @param bCtxt The BeanContext intended for this Applet, or * null. */ + @SuppressWarnings("removal") void initialize(Applet newAppletBean, BeanContext bCtxt); /** @@ -84,5 +85,6 @@ public interface AppletInitializer { * * @param newApplet The newly instantiated JavaBean */ + @SuppressWarnings("removal") void activate(Applet newApplet); } diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java index 7cea80926b99..6a933aeff932 100644 --- a/src/java.desktop/share/classes/java/beans/Beans.java +++ b/src/java.desktop/share/classes/java/beans/Beans.java @@ -167,7 +167,8 @@ public static Object instantiate(ClassLoader cls, String beanName, * java.applet package * documentation for further information. */ - @Deprecated(since = "9") + @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") public static Object instantiate(ClassLoader cls, String beanName, BeanContext beanContext, AppletInitializer initializer) @@ -516,7 +517,8 @@ protected Class resolveClass(ObjectStreamClass classDesc) * Package private support class. This provides a default AppletContext * for beans which are applets. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) +@SuppressWarnings("removal") class BeansAppletContext implements AppletContext { Applet target; Hashtable imageCache = new Hashtable<>(); @@ -601,7 +603,8 @@ public Iterator getStreamKeys(){ * Package private support class. This provides an AppletStub * for beans which are applets. */ -@Deprecated(since = "9") +@Deprecated(since = "9", forRemoval = true) +@SuppressWarnings("removal") class BeansAppletStub implements AppletStub { transient boolean active; transient Applet target; diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java index 59adfba696d0..5baa0e03c278 100644 --- a/src/java.desktop/share/classes/javax/swing/JApplet.java +++ b/src/java.desktop/share/classes/javax/swing/JApplet.java @@ -96,10 +96,10 @@ * * @deprecated The Applet API is deprecated, no replacement. */ -@Deprecated(since = "9") +@Deprecated(since="9", forRemoval=true) @JavaBean(defaultProperty = "JMenuBar", description = "Swing's Applet subclass.") @SwingContainer(delegate = "getContentPane") -@SuppressWarnings("serial") // Same-version serialization only +@SuppressWarnings({"serial", "removal"}) // Same-version serialization only public class JApplet extends Applet implements Accessible, RootPaneContainer, TransferHandler.HasGetTransferHandler diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java index 45190d331995..1432dc170266 100644 --- a/src/java.desktop/share/classes/javax/swing/JComponent.java +++ b/src/java.desktop/share/classes/javax/swing/JComponent.java @@ -557,7 +557,7 @@ public void setComponentPopupMenu(JPopupMenu popup) { * @see #setComponentPopupMenu * @since 1.5 */ - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) public JPopupMenu getComponentPopupMenu() { if(!getInheritsPopupMenu()) { @@ -2916,7 +2916,7 @@ protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, * @param pressed true if the key is pressed * @return true if there is a key binding for e */ - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) boolean processKeyBindings(KeyEvent e, boolean pressed) { if (!SwingUtilities.isValidKeyEventForKeyBindings(e)) { return false; @@ -4474,7 +4474,7 @@ boolean rectangleIsObscured(int x,int y,int width,int height) * return value for this method * @see #getVisibleRect */ - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) static final void computeVisibleRect(Component c, Rectangle visibleRect) { Container p = c.getParent(); Rectangle bounds = c.getBounds(); @@ -4643,7 +4643,7 @@ public synchronized VetoableChangeListener[] getVetoableChangeListeners() { * or null if not in any container */ @BeanProperty(bound = false) - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) public Container getTopLevelAncestor() { for(Container p = this; p != null; p = p.getParent()) { if(p instanceof Window || p instanceof Applet) { @@ -5051,7 +5051,7 @@ void setPaintingChild(Component paintingChild) { this.paintingChild = paintingChild; } - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) void _paintImmediately(int x, int y, int w, int h) { Graphics g; Container c; diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java index 9fbc47be3945..1843a1ff83fe 100644 --- a/src/java.desktop/share/classes/javax/swing/JTable.java +++ b/src/java.desktop/share/classes/javax/swing/JTable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -6028,7 +6028,7 @@ public CellEditorRemover(KeyboardFocusManager fm) { this.focusManager = fm; } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void propertyChange(PropertyChangeEvent ev) { if (!isEditing() || getClientProperty("terminateEditOnFocusLost") != Boolean.TRUE) { return; diff --git a/src/java.desktop/share/classes/javax/swing/KeyboardManager.java b/src/java.desktop/share/classes/javax/swing/KeyboardManager.java index 40cd7aebe4dc..77f5a5ea1f81 100644 --- a/src/java.desktop/share/classes/javax/swing/KeyboardManager.java +++ b/src/java.desktop/share/classes/javax/swing/KeyboardManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2020, 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 @@ -137,7 +137,7 @@ public void registerKeyStroke(KeyStroke k, JComponent c) { /** * Find the top focusable Window, Applet, or InternalFrame */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private static Container getTopAncestor(JComponent c) { for(Container p = c.getParent(); p != null; p = p.getParent()) { if (p instanceof Window && ((Window)p).isFocusableWindow() || diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java index 31df7544c0e3..2428e96837b1 100644 --- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java +++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java @@ -275,7 +275,7 @@ else if (popupType == LIGHT_WEIGHT_POPUP && * Obtains the appropriate Popup based on * popupType. */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private Popup getPopup(Component owner, Component contents, int ownerX, int ownerY, int popupType) { if (GraphicsEnvironment.isHeadless()) { @@ -630,7 +630,7 @@ boolean overlappedByOwnedWindow() { * Returns true if popup can fit the screen and the owner's top parent. * It determines can popup be lightweight or mediumweight. */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") boolean fitsOnScreen() { boolean result = false; Component component = getComponent(); @@ -801,7 +801,7 @@ public void hide() { recycleLightWeightPopup(this); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void show() { Container parent = null; @@ -956,7 +956,7 @@ public void hide() { recycleMediumWeightPopup(this); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void show() { Component component = getComponent(); Container parent = null; diff --git a/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java index 9615a2722381..95f0479df5d4 100644 --- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, 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 @@ -420,7 +420,7 @@ public synchronized void removeInvalidComponent(JComponent component) { * * @see JComponent#repaint */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private void addDirtyRegion0(Container c, int x, int y, int w, int h) { /* Special cases we don't have to bother with. */ @@ -538,12 +538,13 @@ public void addDirtyRegion(Window window, int x, int y, int w, int h) { * java.applet package * documentation for further information. */ - @Deprecated(since = "9") + @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") public void addDirtyRegion(Applet applet, int x, int y, int w, int h) { addDirtyRegion0(applet, x, y, w, h); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") void scheduleHeavyWeightPaints() { Map hws; diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java index db8b71e3b2cf..45ae397a6692 100644 --- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java +++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java @@ -421,7 +421,7 @@ else if (sourceEvent instanceof MenuDragMouseEvent) { * @param p a Point object (converted to the new coordinate system) * @param c a Component object */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static void convertPointToScreen(Point p,Component c) { Rectangle b; int x,y; @@ -461,7 +461,7 @@ public static void convertPointToScreen(Point p,Component c) { * @param p a Point object (converted to the new coordinate system) * @param c a Component object */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static void convertPointFromScreen(Point p,Component c) { Rectangle b; int x,y; @@ -1662,7 +1662,7 @@ public static JRootPane getRootPane(Component c) { * @param c the component * @return the first ancestor of c that's a Window or the last Applet ancestor */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static Component getRoot(Component c) { Component applet = null; for(Component p = c; p != null; p = p.getParent()) { @@ -1703,7 +1703,7 @@ static JComponent getPaintingOrigin(JComponent c) { * @return true if a binding has found and processed * @since 1.4 */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public static boolean processKeyBindings(KeyEvent event) { if (event != null) { if (event.isConsumed()) { @@ -2218,7 +2218,7 @@ public static Component getUnwrappedView(JViewport viewport) { * @see java.awt.Component#isVisible() * @since 1.7 */ - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") static Container getValidateRoot(Container c, boolean visibleOnly) { Container root = null; diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java index bb37b05e906f..0b797c4fa884 100644 --- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java +++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java @@ -784,7 +784,7 @@ public void focusLost(FocusEvent evt){ // Returns: 0 no adjust // -1 can't fit // >0 adjust value by amount returned - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private int getPopupFitWidth(Rectangle popupRectInScreen, Component invoker){ if (invoker != null){ Container parent; @@ -810,7 +810,7 @@ private int getPopupFitWidth(Rectangle popupRectInScreen, Component invoker){ // Returns: 0 no adjust // >0 adjust by value return - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private int getPopupFitHeight(Rectangle popupRectInScreen, Component invoker){ if (invoker != null){ Container parent; diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java index a26f0511432f..2718569b77ac 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java @@ -932,7 +932,7 @@ public void eventDispatched(AWTEvent ev) { } } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") boolean isInPopup(Component src) { for (Component c=src; c!=null; c=c.getParent()) { if (c instanceof Applet || c instanceof Window) { @@ -1150,7 +1150,7 @@ void removeUIActionMap(JComponent c, ActionMap map) { } } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") public void stateChanged(ChangeEvent ev) { if (!(UIManager.getLookAndFeel() instanceof BasicLookAndFeel)) { uninstall(); diff --git a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java index 7585660f05d2..36e573624e3a 100644 --- a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java +++ b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, 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 @@ -504,7 +504,8 @@ public void toBack() {} * java.applet package * documentation for further information. */ - @Deprecated(since = "9") + @Deprecated(since = "9", forRemoval = true) + @SuppressWarnings("removal") public static Applet getAppletIfAncestorOf(Component comp) { Container parent = comp.getParent(); Applet applet = null; diff --git a/src/java.naming/share/classes/javax/naming/Context.java b/src/java.naming/share/classes/javax/naming/Context.java index 652ddd51a71c..545d1046f1dc 100644 --- a/src/java.naming/share/classes/javax/naming/Context.java +++ b/src/java.naming/share/classes/javax/naming/Context.java @@ -1082,6 +1082,6 @@ public Object removeFromEnvironment(String propName) * * @since 1.3 */ - @Deprecated + @Deprecated(since="9", forRemoval=true) String APPLET = "java.naming.applet"; };