From 16ad67e6da16766ebb5ffaadc0f0d0b9d7add436 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Tue, 21 Apr 2026 18:57:39 +0000 Subject: [PATCH] 8382487: Remove unnecessary SuppressWarnings annotations in java.desktop Reviewed-by: serb, aivanov, dmarkov --- .../share/classes/com/sun/imageio/stream/StreamCloser.java | 3 +-- src/java.desktop/share/classes/java/awt/Component.java | 2 -- src/java.desktop/share/classes/java/awt/SequencedEvent.java | 1 - .../share/classes/javax/imageio/spi/ServiceRegistry.java | 3 +-- src/java.desktop/share/classes/javax/swing/JComponent.java | 1 - src/java.desktop/share/classes/javax/swing/PopupFactory.java | 1 - src/java.desktop/share/classes/javax/swing/ToolTipManager.java | 3 +-- .../windows/classes/sun/awt/windows/WWindowPeer.java | 1 - 8 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java index 7de400ad199..29aaed7d9e3 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java +++ b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamCloser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2026, 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 @@ -48,7 +48,6 @@ public class StreamCloser { private static WeakHashMap toCloseQueue; private static Thread streamCloser; - @SuppressWarnings("removal") public static void addToQueue(CloseAction ca) { synchronized (StreamCloser.class) { if (toCloseQueue == null) { diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java index 7f021dcdb85..21358efa3f3 100644 --- a/src/java.desktop/share/classes/java/awt/Component.java +++ b/src/java.desktop/share/classes/java/awt/Component.java @@ -4000,7 +4000,6 @@ public abstract class Component implements ImageObserver, MenuContainer, * {@code true}. * @see #createBuffers(int, BufferCapabilities) */ - @SuppressWarnings("removal") protected FlipBufferStrategy(int numBuffers, BufferCapabilities caps) throws AWTException { @@ -8129,7 +8128,6 @@ public abstract class Component implements ImageObserver, MenuContainer, return res; } - @SuppressWarnings("removal") final Component getNextFocusCandidate() { Container rootAncestor = getTraversalRoot(); Component comp = this; diff --git a/src/java.desktop/share/classes/java/awt/SequencedEvent.java b/src/java.desktop/share/classes/java/awt/SequencedEvent.java index 25fe72e1787..c919374a85c 100644 --- a/src/java.desktop/share/classes/java/awt/SequencedEvent.java +++ b/src/java.desktop/share/classes/java/awt/SequencedEvent.java @@ -55,7 +55,6 @@ class SequencedEvent extends AWTEvent implements ActiveEvent { private static final LinkedList list = new LinkedList<>(); private final AWTEvent nested; - @SuppressWarnings("serial") // Not statically typed as Serializable private boolean disposed; private final LinkedList pendingEvents = new LinkedList<>(); diff --git a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java index 7eaa14133c5..2d6edaca544 100644 --- a/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java +++ b/src/java.desktop/share/classes/javax/imageio/spi/ServiceRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2026, 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 @@ -718,7 +718,6 @@ class SubRegistry { this.category = category; } - @SuppressWarnings("removal") public synchronized boolean registerServiceProvider(Object provider) { Object oprovider = map.get(provider.getClass()); boolean present = oprovider != null; diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java index 87d6a41c2b0..9a7e67913ff 100644 --- a/src/java.desktop/share/classes/javax/swing/JComponent.java +++ b/src/java.desktop/share/classes/javax/swing/JComponent.java @@ -5070,7 +5070,6 @@ public abstract class JComponent extends Container implements Serializable, this.paintingChild = paintingChild; } - @SuppressWarnings("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/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java index 7245820c289..58a74def3b6 100644 --- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java +++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java @@ -865,7 +865,6 @@ public class PopupFactory { /** * Returns the cache to use for medium weight popups. */ - @SuppressWarnings("unchecked") private static List getMediumWeightPopupCache() { synchronized (MediumWeightPopup.class) { if (cache == null) { diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java index 4c3d0209823..58a4b384ccf 100644 --- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java +++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2026, 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 @@ -818,7 +818,6 @@ public final class ToolTipManager extends MouseAdapter implements MouseMotionLis // Returns: 0 no adjust // >0 adjust by value return - @SuppressWarnings("removal") private int getPopupFitHeight(Rectangle popupRectInScreen, Component invoker){ if (invoker != null){ Container parent; diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java index f028e0fbec5..9c1c7665f4b 100644 --- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java +++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java @@ -108,7 +108,6 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer, static List activeWindows = new LinkedList(); // WComponentPeer overrides @Override - @SuppressWarnings("unchecked") protected void disposeImpl() { synchronized (activeWindows) { activeWindows.remove(this);