From 24a9fa1ccc4dde5dce5f99ceae28c41a060d1594 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 21 Jun 2021 20:49:31 +0200 Subject: [PATCH] Styling: renamed "update" methods --- .../java/com/formdev/flatlaf/ui/FlatArrowButton.java | 4 ++-- .../java/com/formdev/flatlaf/ui/FlatScrollBarUI.java | 8 ++++---- .../java/com/formdev/flatlaf/ui/FlatSpinnerUI.java | 6 +++--- .../java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java index 0d2564da..288ef851 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java @@ -58,7 +58,7 @@ public class FlatArrowButton Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground ) { super( direction, Color.WHITE, Color.WHITE, Color.WHITE, Color.WHITE ); - update( type, foreground, disabledForeground, hoverForeground, hoverBackground, + updateStyle( type, foreground, disabledForeground, hoverForeground, hoverBackground, pressedForeground, pressedBackground ); setOpaque( false ); @@ -98,7 +98,7 @@ public class FlatArrowButton /** * @since TODO */ - public void update( String type, Color foreground, Color disabledForeground, + public void updateStyle( String type, Color foreground, Color disabledForeground, Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground ) { this.chevron = FlatUIUtils.isChevron( type ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java index 98cae5a3..9da99902 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java @@ -222,9 +222,9 @@ public class FlatScrollBarUI oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( incrButton instanceof FlatScrollBarButton ) - ((FlatScrollBarButton)incrButton).update(); + ((FlatScrollBarButton)incrButton).updateStyle(); if( decrButton instanceof FlatScrollBarButton ) - ((FlatScrollBarButton)decrButton).update(); + ((FlatScrollBarButton)decrButton).updateStyle(); } /** @@ -424,8 +424,8 @@ public class FlatScrollBarUI setRequestFocusEnabled( false ); } - protected void update() { - update( arrowType, buttonArrowColor, buttonDisabledArrowColor, + protected void updateStyle() { + updateStyle( arrowType, buttonArrowColor, buttonDisabledArrowColor, null, hoverButtonBackground, null, pressedButtonBackground ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java index a8efa036..84e53e6a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java @@ -189,7 +189,7 @@ public class FlatSpinnerUI */ protected void applyStyle( Object style ) { oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); - updateArrowButtons(); + updateArrowButtonsStyle(); } /** @@ -309,10 +309,10 @@ public class FlatSpinnerUI return button; } - private void updateArrowButtons() { + private void updateArrowButtonsStyle() { for( Component c : spinner.getComponents() ) { if( c instanceof FlatArrowButton ) { - ((FlatArrowButton)c).update( arrowType, buttonArrowColor, + ((FlatArrowButton)c).updateStyle( arrowType, buttonArrowColor, buttonDisabledArrowColor, buttonHoverArrowColor, null, buttonPressedArrowColor, null ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java index 0ef83595..9bcf948d 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java @@ -140,7 +140,7 @@ public class FlatSplitPaneUI oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( divider instanceof FlatSplitPaneDivider ) - ((FlatSplitPaneDivider)divider).updateButtons(); + ((FlatSplitPaneDivider)divider).updateStyle(); } /** @@ -180,11 +180,11 @@ public class FlatSplitPaneUI return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); } - void updateButtons() { + void updateStyle() { if( leftButton instanceof FlatOneTouchButton ) - ((FlatOneTouchButton)leftButton).update(); + ((FlatOneTouchButton)leftButton).updateStyle(); if( rightButton instanceof FlatOneTouchButton ) - ((FlatOneTouchButton)rightButton).update(); + ((FlatOneTouchButton)rightButton).updateStyle(); } @Override @@ -267,8 +267,8 @@ public class FlatSplitPaneUI this.left = left; } - protected void update() { - update( arrowType, oneTouchArrowColor, null, + protected void updateStyle() { + updateStyle( arrowType, oneTouchArrowColor, null, oneTouchHoverArrowColor, null, oneTouchPressedArrowColor, null ); }