[PATCH] Pattern matching of instanceof in java.desktop shared code

Author: turbanoff

src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java

@@ -345,8 +345,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(final Object obj) {
-        if (!(obj instanceof JRSUIControl)) return false;
-        final JRSUIControl other = (JRSUIControl)obj;
+        if (!(obj instanceof JRSUIControl other)) return false;
         if (currentEncodedProperties != other.currentEncodedProperties) return false;
         if (!nativeMap.equals(other.nativeMap)) return false;
         if (!changes.equals(other.changes)) return false;

src/java.desktop/macosx/classes/com/apple/eawt/FullScreenUtilities.java

@@ -63,8 +63,7 @@ public final class FullScreenUtilities {
      * @throws IllegalArgumentException if window is not a {@link RootPaneContainer}
      */
     public static void setWindowCanFullScreen(final Window window, final boolean canFullScreen) {
-        if (!(window instanceof RootPaneContainer)) throw new IllegalArgumentException("Can't mark a non-RootPaneContainer as full screen-able");
-        final RootPaneContainer rpc = (RootPaneContainer)window;
+        if (!(window instanceof RootPaneContainer rpc)) throw new IllegalArgumentException("Can't mark a non-RootPaneContainer as full screen-able");
         rpc.getRootPane().putClientProperty(CPlatformWindow.WINDOW_FULLSCREENABLE, Boolean.valueOf(canFullScreen));
     }
 

src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java

@@ -130,8 +130,7 @@ public void applySizeFor(final JComponent c, final Size size) {
     protected void setThemeBorder(final AbstractButton b) {
         // Set the correct border
         final ButtonUI genericUI = b.getUI();
-        if (!(genericUI instanceof AquaButtonUI)) return;
-        final AquaButtonUI ui = (AquaButtonUI)genericUI;
+        if (!(genericUI instanceof AquaButtonUI ui)) return;
 
         Border border = b.getBorder();
         if (!ui.isBorderFromProperty(b) && (border == null || border instanceof UIResource || border instanceof AquaButtonBorder)) {
@@ -196,12 +195,11 @@ public boolean isBorderFromProperty(final AbstractButton button) {
     }
 
     protected boolean setButtonType(final AbstractButton b, final Object prop) {
-        if (!(prop instanceof String)) {
+        if (!(prop instanceof String buttonType)) {
             b.putClientProperty(BUTTON_TYPE, null); // so we know to use the automatic button type
             return false;
         }
 
-        final String buttonType = (String)prop;
         boolean iconFont = true;
 
         final TypeSpecifier specifier = AquaButtonExtendedTypes.getSpecifierByName(buttonType);
@@ -590,9 +588,8 @@ public void hierarchyChanged(final HierarchyEvent e) {
             if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) == 0) return;
 
             final Object o = e.getSource();
-            if (!(o instanceof AbstractButton)) return;
+            if (!(o instanceof AbstractButton b)) return;
 
-            final AbstractButton b = (AbstractButton)o;
             final ButtonUI ui = b.getUI();
             if (!(ui instanceof AquaButtonUI)) return;
 

src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java

@@ -151,8 +151,7 @@ public void itemStateChanged(final ItemEvent e) {
 
                 final JList<Object> itemList = popup.getList();
                 final ListUI listUI = itemList.getUI();
-                if (!(listUI instanceof AquaListUI)) return;
-                final AquaListUI aquaListUI = (AquaListUI)listUI;
+                if (!(listUI instanceof AquaListUI aquaListUI)) return;
 
                 final int selectedIndex = comboBox.getSelectedIndex();
                 final ListModel<Object> dataModel = itemList.getModel();
@@ -637,8 +636,7 @@ void performComboBoxAction(final AquaComboBoxUI ui) {
     public void applySizeFor(final JComponent c, final Size size) {
         if (arrowButton == null) return;
         final Border border = arrowButton.getBorder();
-        if (!(border instanceof AquaButtonBorder)) return;
-        final AquaButtonBorder aquaBorder = (AquaButtonBorder)border;
+        if (!(border instanceof AquaButtonBorder aquaBorder)) return;
         arrowButton.setBorder(aquaBorder.deriveBorderForSize(size));
     }
 

src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java

@@ -419,9 +419,7 @@ public Insets getBorderInsets(final Component c) {
         if (fBorderInsets == null) fBorderInsets = new Insets(0, 0, 0, 0);
 
         // Paranoia check
-        if (!(c instanceof JInternalFrame)) return fBorderInsets;
-
-        final JInternalFrame frame = (JInternalFrame)c;
+        if (!(c instanceof JInternalFrame frame)) return fBorderInsets;
 
         // Set the contentRect to an arbitrary value (in case the current real one is too small)
         setInBounds(0, 0, kContentTester, kContentTester);

src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java

@@ -182,8 +182,7 @@ public boolean isBorderOpaque() {
 
         @Override
         public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int w, final int h) {
-            if (!(g instanceof Graphics2D)) return;
-            final Graphics2D g2d = (Graphics2D)g;
+            if (!(g instanceof Graphics2D g2d)) return;
 
             final int height = getHeight();
             final int width = getWidth();

src/java.desktop/macosx/classes/com/apple/laf/AquaInternalFrameUI.java

@@ -626,8 +626,7 @@ boolean didForwardEventInternal(final MouseEvent e) {
             if (!isEventInWindowShadow(originalPoint)) return false;
 
             final Container parent = frame.getParent();
-            if (!(parent instanceof JDesktopPane)) return false;
-            final JDesktopPane pane = (JDesktopPane)parent;
+            if (!(parent instanceof JDesktopPane pane)) return false;
             final Point parentPoint = SwingUtilities.convertPoint(frame, originalPoint, parent);
 
         /*     // debug drawing

src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java

@@ -99,8 +99,7 @@ protected Color getDisabledLabelColor(final JLabel label) {
         final Color fg = label.getForeground();
 
         final Object colorProperty = label.getClientProperty(DISABLED_COLOR_KEY);
-        if (colorProperty instanceof Color) {
-            final Color disabledColor = (Color)colorProperty;
+        if (colorProperty instanceof Color disabledColor) {
             if ((fg.getRGB() << 8) == (disabledColor.getRGB() << 8)) return disabledColor;
         }
 

src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBorder.java

@@ -83,12 +83,11 @@ protected static Insets getPopupInsets() {
      */
     @Override
     public Insets getBorderInsets(final Component c) {
-        if (!(c instanceof JPopupMenu)) {
+        if (!(c instanceof JPopupMenu menu)) {
             return getItemInsets();
         }
 
         // for more info on this issue, see AquaComboBoxPopup.updateContents()
-        final JPopupMenu menu = (JPopupMenu)c;
         final int nChildren = menu.getComponentCount();
         if (nChildren > 0) {
             final Component firstChild = menu.getComponent(0);

src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java

@@ -182,17 +182,14 @@ public void propertyChange(final PropertyChangeEvent evt) {
             if (!CLIENT_PROPERTY_KEY.equalsIgnoreCase(key)) return;
 
             final Object source = evt.getSource();
-            if (!(source instanceof JMenuItem)) return;
+            if (!(source instanceof JMenuItem c)) return;
 
-            final JMenuItem c = (JMenuItem)source;
             apply(c, evt.getNewValue());
         }
 
         static void apply(final JMenuItem menuItem, final Object value) {
             final ButtonUI ui = menuItem.getUI();
-            if (!(ui instanceof AquaMenuItemUI)) return;
-
-            final AquaMenuItemUI aquaUI = (AquaMenuItemUI)ui;
+            if (!(ui instanceof AquaMenuItemUI aquaUI)) return;
 
             if (aquaUI.fIsIndeterminate = "indeterminate".equals(value)) {
                 aquaUI.checkIcon = UIManager.getIcon(aquaUI.getPropertyPrefix() + ".dashIcon");