From af967ded877a8e55eaf4d370d173a68255d95323 Mon Sep 17 00:00:00 2001 From: prrace Date: Thu, 12 Jun 2025 14:25:29 -0700 Subject: [PATCH] 8359053 --- .../macosx/classes/com/apple/laf/AquaInternalFrameUI.java | 1 - .../share/classes/com/sun/java/swing/SwingUtilities3.java | 2 -- .../classes/com/sun/media/sound/JavaSoundAudioClip.java | 1 - src/java.desktop/share/classes/javax/swing/JComponent.java | 5 +---- src/java.desktop/share/classes/javax/swing/JTable.java | 1 - .../share/classes/javax/swing/KeyboardManager.java | 1 - src/java.desktop/share/classes/javax/swing/PopupFactory.java | 4 ---- .../share/classes/javax/swing/RepaintManager.java | 2 -- .../share/classes/javax/swing/SwingUtilities.java | 5 ----- .../share/classes/javax/swing/ToolTipManager.java | 1 - .../classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 2 -- 11 files changed, 1 insertion(+), 24 deletions(-) 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 b09590c8a61..ac2d01aa8dc 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java @@ -431,7 +431,6 @@ public class AquaInternalFrameUI extends BasicInternalFrameUI implements SwingCo } @Override - @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 370ade7d4d1..277b00ba4cf 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 @@ -91,7 +91,6 @@ public class SwingUtilities3 { * @param rootContainer topmost container. Should be {@code Window} * @param isRequested the value to set vsyncRequested state to */ - @SuppressWarnings("removal") public static void setVsyncRequested(Container rootContainer, boolean isRequested) { assert (rootContainer instanceof Window); @@ -108,7 +107,6 @@ public class SwingUtilities3 { * @param rootContainer topmost container. Should be Window * @return {@code true} if vsync painting is requested for {@code rootContainer} */ - @SuppressWarnings("removal") public static boolean isVsyncRequested(Container rootContainer) { assert (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 6fdc69da783..26f8cb9783f 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 @@ -58,7 +58,6 @@ import javax.sound.sampled.UnsupportedAudioFileException; * @author Arthur van Hoff, Kara Kytle, Jan Borgersen * @author Florian Bomers */ -@SuppressWarnings("removal") public final class JavaSoundAudioClip implements MetaEventListener, LineListener { private long lastPlayCall = 0; diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java index 4b4c97e290c..40f13e4ea81 100644 --- a/src/java.desktop/share/classes/javax/swing/JComponent.java +++ b/src/java.desktop/share/classes/javax/swing/JComponent.java @@ -607,7 +607,6 @@ public abstract class JComponent extends Container implements Serializable, * @see #setComponentPopupMenu * @since 1.5 */ - @SuppressWarnings("removal") public JPopupMenu getComponentPopupMenu() { if(!getInheritsPopupMenu()) { @@ -2966,7 +2965,7 @@ public abstract class JComponent extends Container implements Serializable, * @param pressed true if the key is pressed * @return true if there is a key binding for e */ - @SuppressWarnings({"deprecation", "removal"}) + @SuppressWarnings("deprecation") boolean processKeyBindings(KeyEvent e, boolean pressed) { if (!SwingUtilities.isValidKeyEventForKeyBindings(e)) { return false; @@ -4521,7 +4520,6 @@ public abstract class JComponent extends Container implements Serializable, * return value for this method * @see #getVisibleRect */ - @SuppressWarnings("removal") static final void computeVisibleRect(Component c, Rectangle visibleRect) { Container p = c.getParent(); Rectangle bounds = c.getBounds(); @@ -4690,7 +4688,6 @@ public abstract class JComponent extends Container implements Serializable, * or null if not in any container */ @BeanProperty(bound = false) - @SuppressWarnings("removal") public Container getTopLevelAncestor() { for(Container p = this; p != null; p = p.getParent()) { if(p instanceof Window) { diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java index 07bc919f361..653466318a7 100644 --- a/src/java.desktop/share/classes/javax/swing/JTable.java +++ b/src/java.desktop/share/classes/javax/swing/JTable.java @@ -6121,7 +6121,6 @@ public class JTable extends JComponent implements TableModelListener, Scrollable this.focusManager = fm; } - @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 d76536db6eb..6295f8bbedf 100644 --- a/src/java.desktop/share/classes/javax/swing/KeyboardManager.java +++ b/src/java.desktop/share/classes/javax/swing/KeyboardManager.java @@ -134,7 +134,6 @@ class KeyboardManager { /** * Find the top focusable Window, or InternalFrame */ - @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 a8540e783bf..2b274c816b1 100644 --- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java +++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java @@ -273,7 +273,6 @@ public class PopupFactory { * Obtains the appropriate Popup based on * popupType. */ - @SuppressWarnings("removal") private Popup getPopup(Component owner, Component contents, int ownerX, int ownerY, int popupType) { if (GraphicsEnvironment.isHeadless()) { @@ -621,7 +620,6 @@ public class PopupFactory { * Returns true if popup can fit the screen and the owner's top parent. * It determines can popup be lightweight or mediumweight. */ - @SuppressWarnings("removal") boolean fitsOnScreen() { boolean result = false; Component component = getComponent(); @@ -784,7 +782,6 @@ public class PopupFactory { recycleLightWeightPopup(this); } - @SuppressWarnings("removal") public void show() { Container parent = null; @@ -932,7 +929,6 @@ public class PopupFactory { recycleMediumWeightPopup(this); } - @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 e2e478e2450..cf0f70da014 100644 --- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -405,7 +405,6 @@ public class RepaintManager * * @see JComponent#repaint */ - @SuppressWarnings("removal") private void addDirtyRegion0(Container c, int x, int y, int w, int h) { /* Special cases we don't have to bother with. */ @@ -507,7 +506,6 @@ public class RepaintManager addDirtyRegion0(window, x, y, w, h); } - @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 d8d063b563c..ebf39ac0283 100644 --- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java +++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java @@ -414,7 +414,6 @@ public class SwingUtilities implements SwingConstants * @param p a Point object (converted to the new coordinate system) * @param c a Component object */ - @SuppressWarnings("removal") public static void convertPointToScreen(Point p,Component c) { Rectangle b; int x,y; @@ -453,7 +452,6 @@ public class SwingUtilities implements SwingConstants * @param p a Point object (converted to the new coordinate system) * @param c a Component object */ - @SuppressWarnings("removal") public static void convertPointFromScreen(Point p,Component c) { Rectangle b; int x,y; @@ -1653,7 +1651,6 @@ public class SwingUtilities implements SwingConstants * @param c the component * @return the first ancestor of c that's a Window */ - @SuppressWarnings("removal") public static Component getRoot(Component c) { for(Component p = c; p != null; p = p.getParent()) { if (p instanceof Window) { @@ -1690,7 +1687,6 @@ public class SwingUtilities implements SwingConstants * @return true if a binding has found and processed * @since 1.4 */ - @SuppressWarnings("removal") public static boolean processKeyBindings(KeyEvent event) { if (event != null) { if (event.isConsumed()) { @@ -2204,7 +2200,6 @@ public class SwingUtilities implements SwingConstants * @see java.awt.Component#isVisible() * @since 1.7 */ - @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 fe03aad30c1..1f77980f896 100644 --- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java +++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java @@ -794,7 +794,6 @@ public final class ToolTipManager extends MouseAdapter implements MouseMotionLis // Returns: 0 no adjust // -1 can't fit // >0 adjust value by amount returned - @SuppressWarnings("removal") private int getPopupFitWidth(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 18846413d19..e518f509c5a 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 @@ -914,7 +914,6 @@ public class BasicPopupMenuUI extends PopupMenuUI { } } - @SuppressWarnings("removal") boolean isInPopup(Component src) { for (Component c=src; c!=null; c=c.getParent()) { if (c instanceof Window) { @@ -1129,7 +1128,6 @@ public class BasicPopupMenuUI extends PopupMenuUI { } } - @SuppressWarnings("removal") public void stateChanged(ChangeEvent ev) { if (!(UIManager.getLookAndFeel() instanceof BasicLookAndFeel)) { uninstall();