diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java index fb5a0022..c849d107 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCapsLockIcon.java @@ -23,7 +23,7 @@ import java.awt.geom.Path2D; import java.awt.geom.Rectangle2D; import java.awt.geom.RoundRectangle2D; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.ui.FlatUIUtils; /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java index 0d73b165..fff75272 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java @@ -28,8 +28,8 @@ import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.UIManager; import com.formdev.flatlaf.ui.FlatButtonUI; -import com.formdev.flatlaf.ui.FlatStyleSupport; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatUIUtils; /** @@ -136,14 +136,14 @@ public class FlatCheckBoxIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java index 99eab2b2..837c7300 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxMenuItemIcon.java @@ -25,8 +25,8 @@ import java.util.Map; import javax.swing.AbstractButton; import javax.swing.JMenuItem; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Icon for {@link javax.swing.JCheckBoxMenuItem}. @@ -53,14 +53,14 @@ public class FlatCheckBoxMenuItemIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java index e5790b41..63e01983 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java @@ -26,9 +26,9 @@ import java.util.Map; import javax.swing.AbstractButton; import javax.swing.ButtonModel; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatUIUtils; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; /** * "clear" icon for search fields. @@ -55,14 +55,14 @@ public class FlatClearIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java index 756858b0..742c9d0b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java @@ -25,9 +25,9 @@ import java.awt.geom.Path2D; import java.util.Map; import javax.swing.UIManager; import com.formdev.flatlaf.ui.FlatButtonUI; -import com.formdev.flatlaf.ui.FlatStyleSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatUIUtils; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; /** * Help button icon for {@link javax.swing.JButton}. @@ -78,14 +78,14 @@ public class FlatHelpButtonIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java index 13260c76..7581fa21 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java @@ -24,9 +24,9 @@ import java.awt.geom.Path2D; import java.util.Map; import javax.swing.JMenu; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport; import com.formdev.flatlaf.ui.FlatUIUtils; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * "arrow" icon for {@link javax.swing.JMenu}. @@ -55,14 +55,14 @@ public class FlatMenuArrowIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRadioButtonIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRadioButtonIcon.java index c26b1de6..381d2910 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRadioButtonIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRadioButtonIcon.java @@ -19,7 +19,7 @@ package com.formdev.flatlaf.icons; import java.awt.Component; import java.awt.Graphics2D; import java.awt.geom.Ellipse2D; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Icon for {@link javax.swing.JRadioButton}. diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java index f47a7839..9719adb7 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java @@ -24,9 +24,9 @@ import java.awt.geom.Ellipse2D; import java.util.Map; import javax.swing.UIManager; import com.formdev.flatlaf.ui.FlatButtonUI; -import com.formdev.flatlaf.ui.FlatStyleSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatUIUtils; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; /** * "search" icon for search fields. @@ -53,14 +53,14 @@ public class FlatSearchIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTabbedPaneCloseIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTabbedPaneCloseIcon.java index b5cf5cd8..eac04c4b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTabbedPaneCloseIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTabbedPaneCloseIcon.java @@ -26,8 +26,8 @@ import java.awt.geom.Path2D; import java.util.Map; import javax.swing.UIManager; import com.formdev.flatlaf.ui.FlatButtonUI; -import com.formdev.flatlaf.ui.FlatStyleSupport; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.ui.FlatUIUtils; /** @@ -70,14 +70,14 @@ public class FlatTabbedPaneCloseIcon * @since TODO */ public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java index ac12fe9d..998e7429 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java @@ -32,8 +32,8 @@ import javax.swing.JViewport; import javax.swing.UIManager; import javax.swing.plaf.basic.BasicBorders; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableBorder; import com.formdev.flatlaf.util.DerivedColor; /** @@ -84,7 +84,7 @@ public class FlatBorder */ @Override public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -92,7 +92,7 @@ public class FlatBorder */ @Override public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java index b29dece6..d9ac552a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java @@ -26,7 +26,7 @@ import java.awt.Paint; import javax.swing.AbstractButton; import javax.swing.UIManager; import javax.swing.plaf.UIResource; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; import com.formdev.flatlaf.util.UIScale; /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java index ea4a30d1..41f59437 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java @@ -48,9 +48,9 @@ import javax.swing.plaf.basic.BasicButtonListener; import javax.swing.plaf.basic.BasicButtonUI; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.icons.FlatHelpButtonIcon; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.UIScale; /** @@ -160,7 +160,7 @@ public class FlatButtonUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( (AbstractButton) c, FlatStyleSupport.getStyle( c ) ); + applyStyle( (AbstractButton) c, FlatStylingSupport.getStyle( c ) ); } @Override @@ -275,7 +275,7 @@ public class FlatButtonUI * @since TODO */ protected void applyStyle( AbstractButton b, Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, (key, value) -> applyStyleProperty( b, key, value ) ); } @@ -288,7 +288,7 @@ public class FlatButtonUI return new UnknownStyleException( key ); if( helpButtonIconShared ) { - helpButtonIcon = FlatStyleSupport.cloneIcon( helpButtonIcon ); + helpButtonIcon = FlatStylingSupport.cloneIcon( helpButtonIcon ); helpButtonIconShared = false; } @@ -298,7 +298,7 @@ public class FlatButtonUI if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, b, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, b, borderShared ); } /** @@ -306,9 +306,9 @@ public class FlatButtonUI */ @Override public Map> getStyleableInfos( JComponent c ) { - Map> infos = FlatStyleSupport.getAnnotatedStyleableInfos( this, c.getBorder() ); + Map> infos = FlatStylingSupport.getAnnotatedStyleableInfos( this, c.getBorder() ); if( helpButtonIcon instanceof FlatHelpButtonIcon ) - FlatStyleSupport.putAllPrefixKey( infos, "help.", ((FlatHelpButtonIcon)helpButtonIcon).getStyleableInfos() ); + FlatStylingSupport.putAllPrefixKey( infos, "help.", ((FlatHelpButtonIcon)helpButtonIcon).getStyleableInfos() ); return infos; } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java index 27f422a0..683204d0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java @@ -25,8 +25,8 @@ import javax.swing.JComponent; import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicCheckBoxMenuItemUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JCheckBoxMenuItem}. @@ -71,7 +71,7 @@ public class FlatCheckBoxMenuItemUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( menuItem ) ); + applyStyle( FlatStylingSupport.getStyle( menuItem ) ); } @Override @@ -97,14 +97,14 @@ public class FlatCheckBoxMenuItemUI @Override protected PropertyChangeListener createPropertyChangeListener( JComponent c ) { - return FlatStyleSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); + return FlatStylingSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); } /** * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java index 6a35558e..1c84e96b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java @@ -71,8 +71,8 @@ import javax.swing.plaf.basic.BasicComboPopup; import javax.swing.plaf.basic.ComboPopup; import javax.swing.text.JTextComponent; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.SystemInfo; /** @@ -156,7 +156,7 @@ public class FlatComboBoxUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( comboBox ) ); + applyStyle( FlatStylingSupport.getStyle( comboBox ) ); } @Override @@ -454,7 +454,7 @@ public class FlatComboBoxUI Insets oldPadding = padding; int oldEditorColumns = editorColumns; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( !padding.equals( oldPadding ) ) { paddingBorder.padding = padding; @@ -481,7 +481,7 @@ public class FlatComboBoxUI if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, comboBox, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, comboBox, borderShared ); } /** @@ -491,8 +491,8 @@ public class FlatComboBoxUI public Map> getStyleableInfos( JComponent c ) { Map> infos = new LinkedHashMap<>(); infos.put( "padding", Insets.class ); - FlatStyleSupport.collectAnnotatedStyleableInfos( this, infos ); - FlatStyleSupport.collectStyleableInfos( comboBox.getBorder(), infos ); + FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos ); + FlatStylingSupport.collectStyleableInfos( comboBox.getBorder(), infos ); return infos; } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDropShadowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDropShadowBorder.java index ede1bc4f..0e149fd2 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDropShadowBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatDropShadowBorder.java @@ -25,8 +25,8 @@ import java.awt.Insets; import java.awt.RadialGradientPaint; import java.awt.image.BufferedImage; import java.util.Map; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableBorder; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.UIScale; @@ -95,7 +95,7 @@ public class FlatDropShadowBorder */ @Override public Object applyStyleProperty( String key, Object value ) { - Object oldValue = FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + Object oldValue = FlatStylingSupport.applyToAnnotatedObject( this, key, value ); if( key.equals( "shadowInsets" ) ) { applyStyleProperty( nonNegativeInsets( shadowInsets ) ); shadowSize = maxInset( shadowInsets ); @@ -108,7 +108,7 @@ public class FlatDropShadowBorder */ @Override public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java index 1936f63a..57198896 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java @@ -33,8 +33,8 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicEditorPaneUI; import javax.swing.text.JTextComponent; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; /** @@ -91,7 +91,7 @@ public class FlatEditorPaneUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -179,7 +179,7 @@ public class FlatEditorPaneUI oldDisabledBackground = disabledBackground; oldInactiveBackground = inactiveBackground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); updateBackground(); } @@ -188,7 +188,7 @@ public class FlatEditorPaneUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -196,7 +196,7 @@ public class FlatEditorPaneUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } private void updateBackground() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java index d4077457..f95e33ec 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java @@ -35,9 +35,9 @@ import javax.swing.UIManager; import javax.swing.event.MouseInputAdapter; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicInternalFrameUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableBorder; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JInternalFrame}. @@ -116,7 +116,7 @@ public class FlatInternalFrameUI windowResizer = createWindowResizer(); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -148,7 +148,7 @@ public class FlatInternalFrameUI @Override protected PropertyChangeListener createPropertyChangeListener() { - return FlatStyleSupport.createPropertyChangeListener( frame, this::applyStyle, + return FlatStylingSupport.createPropertyChangeListener( frame, this::applyStyle, super.createPropertyChangeListener() ); } @@ -156,7 +156,7 @@ public class FlatInternalFrameUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -165,7 +165,7 @@ public class FlatInternalFrameUI protected Object applyStyleProperty( String key, Object value ) { if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, frame, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, frame, borderShared ); } /** @@ -173,7 +173,7 @@ public class FlatInternalFrameUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, frame.getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, frame.getBorder() ); } //---- class FlatInternalFrameBorder -------------------------------------- @@ -213,13 +213,13 @@ public class FlatInternalFrameUI case "inactiveDropShadowOpacity": return inactiveDropShadowBorder.applyStyleProperty( "shadowOpacity", value ); } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } @Override public Map> getStyleableInfos() { Map> infos = new LinkedHashMap<>(); - FlatStyleSupport.collectAnnotatedStyleableInfos( this, infos ); + FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos ); infos.put( "borderMargins", Insets.class ); infos.put( "activeDropShadowColor", Color.class ); infos.put( "activeDropShadowInsets", Insets.class ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java index f7f25afc..ea787e10 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java @@ -36,8 +36,8 @@ import javax.swing.plaf.basic.BasicHTML; import javax.swing.plaf.basic.BasicLabelUI; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatLaf; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.UIScale; @@ -83,7 +83,7 @@ public class FlatLabelUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -141,14 +141,14 @@ public class FlatLabelUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -156,7 +156,7 @@ public class FlatLabelUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java index 5dfce689..6f7727a0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java @@ -27,8 +27,8 @@ import javax.swing.JComponent; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicListUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JList}. @@ -90,7 +90,7 @@ public class FlatListUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -140,7 +140,7 @@ public class FlatListUI @Override protected PropertyChangeListener createPropertyChangeListener() { - return FlatStyleSupport.createPropertyChangeListener( list, this::applyStyle, + return FlatStylingSupport.createPropertyChangeListener( list, this::applyStyle, super.createPropertyChangeListener() ); } @@ -153,7 +153,7 @@ public class FlatListUI Color oldSelectionInactiveBackground = selectionInactiveBackground; Color oldSelectionInactiveForeground = selectionInactiveForeground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); // update selection background if( selectionBackground != oldSelectionBackground ) { @@ -178,7 +178,7 @@ public class FlatListUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -186,7 +186,7 @@ public class FlatListUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarBorder.java index dadf531f..dcd8b73a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarBorder.java @@ -24,8 +24,8 @@ import java.awt.Insets; import java.util.Map; import javax.swing.JMenuBar; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableBorder; /** * Border for {@link javax.swing.JMenuBar}. @@ -45,12 +45,12 @@ public class FlatMenuBarBorder */ @Override public Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } @Override public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java index 135dbd72..a8918ab0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java @@ -40,7 +40,7 @@ import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicMenuBarUI; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatLaf; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.SystemInfo; /** @@ -80,7 +80,7 @@ public class FlatMenuBarUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -102,7 +102,7 @@ public class FlatMenuBarUI protected void installListeners() { super.installListeners(); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( menuBar, this::applyStyle, null ); menuBar.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -131,7 +131,7 @@ public class FlatMenuBarUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -140,7 +140,7 @@ public class FlatMenuBarUI protected Object applyStyleProperty( String key, Object value ) { if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, menuBar, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, menuBar, borderShared ); } /** @@ -148,7 +148,7 @@ public class FlatMenuBarUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, menuBar.getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, menuBar.getBorder() ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java index a3f2c5d9..e74d3d7d 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java @@ -42,8 +42,8 @@ import javax.swing.text.View; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon; import com.formdev.flatlaf.icons.FlatMenuArrowIcon; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.DerivedColor; import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.HiDPIUtils; @@ -110,9 +110,9 @@ public class FlatMenuItemRenderer if( key.startsWith( "icon." ) || key.equals( "selectionForeground" ) ) { if( iconsShared ) { if( checkIcon instanceof FlatCheckBoxMenuItemIcon ) - checkIcon = FlatStyleSupport.cloneIcon( checkIcon ); + checkIcon = FlatStylingSupport.cloneIcon( checkIcon ); if( arrowIcon instanceof FlatMenuArrowIcon ) - arrowIcon = FlatStyleSupport.cloneIcon( arrowIcon ); + arrowIcon = FlatStylingSupport.cloneIcon( arrowIcon ); iconsShared = false; } @@ -147,18 +147,18 @@ public class FlatMenuItemRenderer } } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - Map> infos = FlatStyleSupport.getAnnotatedStyleableInfos( this ); + Map> infos = FlatStylingSupport.getAnnotatedStyleableInfos( this ); if( checkIcon instanceof FlatCheckBoxMenuItemIcon ) - FlatStyleSupport.putAllPrefixKey( infos, "icon.", ((FlatCheckBoxMenuItemIcon)checkIcon).getStyleableInfos() ); + FlatStylingSupport.putAllPrefixKey( infos, "icon.", ((FlatCheckBoxMenuItemIcon)checkIcon).getStyleableInfos() ); if( arrowIcon instanceof FlatMenuArrowIcon ) - FlatStyleSupport.putAllPrefixKey( infos, "icon.", ((FlatMenuArrowIcon)arrowIcon).getStyleableInfos() ); + FlatStylingSupport.putAllPrefixKey( infos, "icon.", ((FlatMenuArrowIcon)arrowIcon).getStyleableInfos() ); infos.remove( "icon.selectionForeground" ); return infos; } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java index 946b91e4..65431984 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java @@ -27,8 +27,8 @@ import javax.swing.JComponent; import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicMenuItemUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JMenuItem}. @@ -73,7 +73,7 @@ public class FlatMenuItemUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( menuItem ) ); + applyStyle( FlatStylingSupport.getStyle( menuItem ) ); } @Override @@ -99,14 +99,14 @@ public class FlatMenuItemUI @Override protected PropertyChangeListener createPropertyChangeListener( JComponent c ) { - return FlatStyleSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); + return FlatStylingSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); } /** * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -130,7 +130,7 @@ public class FlatMenuItemUI case "disabledForeground": case "acceleratorForeground": case "acceleratorSelectionForeground": - return FlatStyleSupport.applyToField( ui, key, key, value ); + return FlatStylingSupport.applyToField( ui, key, key, value ); default: throw new UnknownStyleException( key ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java index 1b976879..795e52e9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java @@ -33,8 +33,8 @@ import javax.swing.UIManager; import javax.swing.event.MouseInputListener; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicMenuUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JMenu}. @@ -90,7 +90,7 @@ public class FlatMenuUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( menuItem ) ); + applyStyle( FlatStylingSupport.getStyle( menuItem ) ); } @Override @@ -145,14 +145,14 @@ public class FlatMenuUI @Override protected PropertyChangeListener createPropertyChangeListener( JComponent c ) { - return FlatStyleSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); + return FlatStylingSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); } /** * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java index adfbd0d6..0680fde1 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java @@ -39,7 +39,7 @@ import javax.swing.text.JTextComponent; import javax.swing.text.PasswordView; import javax.swing.text.View; import com.formdev.flatlaf.icons.FlatCapsLockIcon; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JPasswordField}. @@ -168,7 +168,7 @@ public class FlatPasswordFieldUI protected Object applyStyleProperty( String key, Object value ) { if( key.equals( "capsLockIconColor" ) && capsLockIcon instanceof FlatCapsLockIcon ) { if( capsLockIconShared ) { - capsLockIcon = FlatStyleSupport.cloneIcon( capsLockIcon ); + capsLockIcon = FlatStylingSupport.cloneIcon( capsLockIcon ); capsLockIconShared = false; } return ((FlatCapsLockIcon)capsLockIcon).applyStyleProperty( key, value ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuBorder.java index 593dd2f1..3c424f09 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuBorder.java @@ -24,8 +24,8 @@ import java.util.LinkedHashMap; import java.util.Map; import javax.swing.JScrollPane; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableBorder; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.UIScale; /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java index 27435846..a5d56cbf 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java @@ -23,7 +23,7 @@ import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicPopupMenuUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JPopupMenu}. @@ -53,7 +53,7 @@ public class FlatPopupMenuUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -68,7 +68,7 @@ public class FlatPopupMenuUI protected void installListeners() { super.installListeners(); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( popupMenu, this::applyStyle, null ); + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( popupMenu, this::applyStyle, null ); popupMenu.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -84,7 +84,7 @@ public class FlatPopupMenuUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -93,7 +93,7 @@ public class FlatPopupMenuUI protected Object applyStyleProperty( String key, Object value ) { if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, popupMenu, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, popupMenu, borderShared ); } /** @@ -101,6 +101,6 @@ public class FlatPopupMenuUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, popupMenu.getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, popupMenu.getBorder() ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java index 072abd36..a4260e1e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java @@ -32,8 +32,8 @@ import javax.swing.LookAndFeel; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicProgressBarUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.UIScale; @@ -78,7 +78,7 @@ public class FlatProgressBarUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( progressBar ) ); + applyStyle( FlatStylingSupport.getStyle( progressBar ) ); } @Override @@ -133,14 +133,14 @@ public class FlatProgressBarUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -148,7 +148,7 @@ public class FlatProgressBarUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java index cfa7dcb3..30d03d90 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java @@ -25,8 +25,8 @@ import javax.swing.JComponent; import javax.swing.LookAndFeel; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicRadioButtonMenuItemUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JRadioButtonMenuItem}. @@ -71,7 +71,7 @@ public class FlatRadioButtonMenuItemUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( menuItem ) ); + applyStyle( FlatStylingSupport.getStyle( menuItem ) ); } @Override @@ -97,14 +97,14 @@ public class FlatRadioButtonMenuItemUI @Override protected PropertyChangeListener createPropertyChangeListener( JComponent c ) { - return FlatStyleSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); + return FlatStylingSupport.createPropertyChangeListener( c, this::applyStyle, super.createPropertyChangeListener( c ) ); } /** * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java index d26de632..b9a75fb3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java @@ -36,9 +36,9 @@ import javax.swing.plaf.basic.BasicButtonListener; import javax.swing.plaf.basic.BasicRadioButtonUI; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.icons.FlatCheckBoxIcon; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.UIScale; /** @@ -92,7 +92,7 @@ public class FlatRadioButtonUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -159,7 +159,7 @@ public class FlatRadioButtonUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -172,7 +172,7 @@ public class FlatRadioButtonUI return new UnknownStyleException( key ); if( iconShared ) { - icon = FlatStyleSupport.cloneIcon( icon ); + icon = FlatStylingSupport.cloneIcon( icon ); iconShared = false; } @@ -180,7 +180,7 @@ public class FlatRadioButtonUI return ((FlatCheckBoxIcon)icon).applyStyleProperty( key, value ); } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -188,7 +188,7 @@ public class FlatRadioButtonUI */ @Override public Map> getStyleableInfos( JComponent c ) { - Map> infos = FlatStyleSupport.getAnnotatedStyleableInfos( this ); + Map> infos = FlatStylingSupport.getAnnotatedStyleableInfos( this ); if( icon instanceof FlatCheckBoxIcon ) { for( Map.Entry> e : ((FlatCheckBoxIcon)icon).getStyleableInfos().entrySet() ) infos.put( "icon.".concat( e.getKey() ), e.getValue() ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRoundBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRoundBorder.java index 975c71e0..f9cce14d 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRoundBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRoundBorder.java @@ -18,7 +18,7 @@ package com.formdev.flatlaf.ui; import java.awt.Component; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Border for various components (e.g. {@link javax.swing.JComboBox}). 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 937ed1d1..1f4749c5 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 @@ -37,8 +37,8 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicScrollBarUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.UIScale; /** @@ -115,7 +115,7 @@ public class FlatScrollBarUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -224,7 +224,7 @@ public class FlatScrollBarUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( incrButton instanceof FlatScrollBarButton ) ((FlatScrollBarButton)incrButton).updateStyle(); @@ -246,7 +246,7 @@ public class FlatScrollBarUI case "maximumThumbSize": oldValue = maximumThumbSize; maximumThumbSize = (Dimension) value; return oldValue; } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -260,7 +260,7 @@ public class FlatScrollBarUI infos.put( "width", int.class ); infos.put( "minimumThumbSize", Dimension.class ); infos.put( "maximumThumbSize", Dimension.class ); - FlatStyleSupport.collectAnnotatedStyleableInfos( this, infos ); + FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos ); return infos; } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java index 6532d5aa..5ccff5a9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java @@ -48,7 +48,7 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicScrollPaneUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JScrollPane}. @@ -87,7 +87,7 @@ public class FlatScrollPaneUI int focusWidth = UIManager.getInt( "Component.focusWidth" ); LookAndFeel.installProperty( c, "opaque", focusWidth == 0 ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); MigLayoutVisualPadding.install( scrollpane ); } @@ -305,7 +305,7 @@ public class FlatScrollPaneUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -319,7 +319,7 @@ public class FlatScrollPaneUI if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, scrollpane, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, scrollpane, borderShared ); } /** @@ -327,7 +327,7 @@ public class FlatScrollPaneUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, scrollpane.getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, scrollpane.getBorder() ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java index b6cb9aae..cc64050b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java @@ -29,8 +29,8 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicSeparatorUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JSeparator}. @@ -82,7 +82,7 @@ public class FlatSeparatorUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -111,7 +111,7 @@ public class FlatSeparatorUI protected void installListeners( JSeparator s ) { super.installListeners( s ); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( s, style -> applyStyle( s, this, style ), null ); s.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -140,14 +140,14 @@ public class FlatSeparatorUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -155,7 +155,7 @@ public class FlatSeparatorUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java index 4db7abd3..b84931d6 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java @@ -36,8 +36,8 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicSliderUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.UIScale; @@ -119,7 +119,7 @@ public class FlatSliderUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( slider ) ); + applyStyle( FlatStylingSupport.getStyle( slider ) ); } @Override @@ -186,7 +186,7 @@ public class FlatSliderUI @Override protected PropertyChangeListener createPropertyChangeListener( JSlider slider ) { - return FlatStyleSupport.createPropertyChangeListener( slider, this::applyStyle, + return FlatStylingSupport.createPropertyChangeListener( slider, this::applyStyle, super.createPropertyChangeListener( slider ) ); } @@ -194,14 +194,14 @@ public class FlatSliderUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -209,7 +209,7 @@ public class FlatSliderUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override 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 b35beafe..4706c540 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 @@ -45,8 +45,8 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicSpinnerUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JSpinner}. @@ -114,7 +114,7 @@ public class FlatSpinnerUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( spinner ) ); + applyStyle( FlatStylingSupport.getStyle( spinner ) ); } @Override @@ -194,7 +194,7 @@ public class FlatSpinnerUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); updateEditorPadding(); updateArrowButtonsStyle(); } @@ -205,7 +205,7 @@ public class FlatSpinnerUI protected Object applyStyleProperty( String key, Object value ) { if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, spinner, borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, spinner, borderShared ); } /** @@ -213,7 +213,7 @@ public class FlatSpinnerUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, spinner.getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, spinner.getBorder() ); } @Override 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 c238a01c..87ea7341 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 @@ -35,9 +35,9 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicSplitPaneDivider; import javax.swing.plaf.basic.BasicSplitPaneUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.UIScale; /** @@ -90,7 +90,7 @@ public class FlatSplitPaneUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( splitPane ) ); + applyStyle( FlatStylingSupport.getStyle( splitPane ) ); } @Override @@ -121,7 +121,7 @@ public class FlatSplitPaneUI protected void installListeners() { super.installListeners(); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( splitPane, this::applyStyle, null ); + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( splitPane, this::applyStyle, null ); splitPane.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -142,7 +142,7 @@ public class FlatSplitPaneUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( divider instanceof FlatSplitPaneDivider ) ((FlatSplitPaneDivider)divider).updateStyle(); @@ -158,7 +158,7 @@ public class FlatSplitPaneUI } catch( UnknownStyleException ex ) { // ignore } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -166,7 +166,7 @@ public class FlatSplitPaneUI */ @Override public Map> getStyleableInfos( JComponent c ) { - Map> infos = FlatStyleSupport.getAnnotatedStyleableInfos( this ); + Map> infos = FlatStylingSupport.getAnnotatedStyleableInfos( this ); if( divider instanceof FlatSplitPaneDivider ) infos.putAll( ((FlatSplitPaneDivider)divider).getStyleableInfos() ); return infos; @@ -193,14 +193,14 @@ public class FlatSplitPaneUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** * @since TODO */ public Map> getStyleableInfos() { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } void updateStyle() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStylingSupport.java similarity index 99% rename from flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java rename to flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStylingSupport.java index d1387ca7..c166b068 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStylingSupport.java @@ -45,7 +45,7 @@ import com.formdev.flatlaf.util.SystemInfo; * @author Karl Tauber * @since TODO */ -public class FlatStyleSupport +public class FlatStylingSupport { /** * Indicates that a field is intended to be used by FlatLaf styling support. diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java index baccb168..89b74a51 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java @@ -87,9 +87,9 @@ import javax.swing.text.JTextComponent; import javax.swing.text.View; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.Animator; import com.formdev.flatlaf.util.CubicBezierEasing; import com.formdev.flatlaf.util.JavaCompatibility; @@ -269,7 +269,7 @@ public class FlatTabbedPaneUI super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -576,7 +576,7 @@ public class FlatTabbedPaneUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); // update buttons for( Component c : tabPane.getComponents() ) { @@ -595,7 +595,7 @@ public class FlatTabbedPaneUI return new UnknownStyleException( key ); if( closeIconShared ) { - closeIcon = FlatStyleSupport.cloneIcon( closeIcon ); + closeIcon = FlatStylingSupport.cloneIcon( closeIcon ); closeIconShared = false; } @@ -626,7 +626,7 @@ public class FlatTabbedPaneUI } } - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -638,7 +638,7 @@ public class FlatTabbedPaneUI infos.put( "tabInsets", Insets.class ); infos.put( "tabAreaInsets", Insets.class ); infos.put( "textIconGap", int.class ); - FlatStyleSupport.collectAnnotatedStyleableInfos( this, infos ); + FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos ); if( closeIcon instanceof FlatTabbedPaneCloseIcon ) infos.putAll( ((FlatTabbedPaneCloseIcon)closeIcon).getStyleableInfos() ); return infos; diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java index 5cb0ab82..c291ad85 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java @@ -38,8 +38,8 @@ import javax.swing.plaf.basic.BasicTableHeaderUI; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.UIScale; /** @@ -98,7 +98,7 @@ public class FlatTableHeaderUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -123,7 +123,7 @@ public class FlatTableHeaderUI protected void installListeners() { super.installListeners(); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( header, this::applyStyle, null ); + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( header, this::applyStyle, null ); header.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -139,7 +139,7 @@ public class FlatTableHeaderUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** @@ -149,7 +149,7 @@ public class FlatTableHeaderUI if( key.equals( "sortIconPosition" ) && value instanceof String ) value = parseSortIconPosition( (String) value ); - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -157,7 +157,7 @@ public class FlatTableHeaderUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } private static int parseSortIconPosition( String str ) { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java index 1ed05dcd..79092b07 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java @@ -38,8 +38,8 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicTableUI; import javax.swing.table.JTableHeader; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.UIScale; @@ -124,7 +124,7 @@ public class FlatTableUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -187,7 +187,7 @@ public class FlatTableUI protected void installListeners() { super.installListeners(); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( table, this::applyStyle, null ); + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( table, this::applyStyle, null ); table.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -229,7 +229,7 @@ public class FlatTableUI Color oldSelectionInactiveBackground = selectionInactiveBackground; Color oldSelectionInactiveForeground = selectionInactiveForeground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); // update selection background if( selectionBackground != oldSelectionBackground ) { @@ -254,7 +254,7 @@ public class FlatTableUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -262,7 +262,7 @@ public class FlatTableUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextAreaUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextAreaUI.java index ae694d2c..70351905 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextAreaUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextAreaUI.java @@ -29,8 +29,8 @@ import javax.swing.JTextArea; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicTextAreaUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; /** @@ -86,7 +86,7 @@ public class FlatTextAreaUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -153,7 +153,7 @@ public class FlatTextAreaUI oldDisabledBackground = disabledBackground; oldInactiveBackground = inactiveBackground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); updateBackground(); } @@ -162,7 +162,7 @@ public class FlatTextAreaUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -170,7 +170,7 @@ public class FlatTextAreaUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } private void updateBackground() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextBorder.java index 9ad7a5b4..e446e670 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextBorder.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextBorder.java @@ -18,7 +18,7 @@ package com.formdev.flatlaf.ui; import java.awt.Component; import javax.swing.UIManager; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; /** * Border for various text components (e.g. {@link javax.swing.JTextField}). diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java index 70abb546..d739ee5a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java @@ -43,8 +43,8 @@ import javax.swing.plaf.basic.BasicTextFieldUI; import javax.swing.text.Caret; import javax.swing.text.JTextComponent; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; import com.formdev.flatlaf.util.JavaCompatibility; import com.formdev.flatlaf.util.UIScale; @@ -107,7 +107,7 @@ public class FlatTextFieldUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -209,7 +209,7 @@ public class FlatTextFieldUI oldDisabledBackground = disabledBackground; oldInactiveBackground = inactiveBackground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); updateBackground(); } @@ -220,7 +220,7 @@ public class FlatTextFieldUI protected Object applyStyleProperty( String key, Object value ) { if( borderShared == null ) borderShared = new AtomicBoolean( true ); - return FlatStyleSupport.applyToAnnotatedObjectOrBorder( this, key, value, getComponent(), borderShared ); + return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, getComponent(), borderShared ); } /** @@ -228,7 +228,7 @@ public class FlatTextFieldUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this, getComponent().getBorder() ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this, getComponent().getBorder() ); } private void updateBackground() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextPaneUI.java index 3ebf2d20..13a6302b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextPaneUI.java @@ -29,8 +29,8 @@ import javax.swing.JEditorPane; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicTextPaneUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.HiDPIUtils; /** @@ -87,7 +87,7 @@ public class FlatTextPaneUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -161,7 +161,7 @@ public class FlatTextPaneUI oldDisabledBackground = disabledBackground; oldInactiveBackground = inactiveBackground; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); updateBackground(); } @@ -170,7 +170,7 @@ public class FlatTextPaneUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -178,7 +178,7 @@ public class FlatTextPaneUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } private void updateBackground() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java index cd49f1b5..7b102775 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java @@ -28,8 +28,8 @@ import javax.swing.JComponent; import javax.swing.JToggleButton; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.UnknownStyleException; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException; import com.formdev.flatlaf.util.UIScale; /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java index f08b9d99..61a5f42a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java @@ -32,8 +32,8 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicToolBarSeparatorUI; import com.formdev.flatlaf.FlatClientProperties; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JToolBar.Separator}. @@ -76,7 +76,7 @@ public class FlatToolBarSeparatorUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -107,7 +107,7 @@ public class FlatToolBarSeparatorUI protected void installListeners( JSeparator s ) { super.installListeners( s ); - propertyChangeListener = FlatStyleSupport.createPropertyChangeListener( + propertyChangeListener = FlatStylingSupport.createPropertyChangeListener( s, style -> applyStyle( s, this, style ), null ); s.addPropertyChangeListener( FlatClientProperties.STYLE, propertyChangeListener ); } @@ -136,14 +136,14 @@ public class FlatToolBarSeparatorUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -151,7 +151,7 @@ public class FlatToolBarSeparatorUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } @Override diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java index bc7fea16..42e933b8 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java @@ -29,8 +29,8 @@ import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicToolBarUI; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JToolBar}. @@ -83,7 +83,7 @@ public class FlatToolBarUI if( !focusableButtons ) setButtonsFocusable( false ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -133,7 +133,7 @@ public class FlatToolBarUI @Override protected PropertyChangeListener createPropertyListener() { - return FlatStyleSupport.createPropertyChangeListener( toolBar, this::applyStyle, super.createPropertyListener() ); + return FlatStylingSupport.createPropertyChangeListener( toolBar, this::applyStyle, super.createPropertyListener() ); } /** @@ -142,7 +142,7 @@ public class FlatToolBarUI protected void applyStyle( Object style ) { boolean oldFocusableButtons = focusableButtons; - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); if( focusableButtons != oldFocusableButtons ) setButtonsFocusable( focusableButtons ); @@ -152,7 +152,7 @@ public class FlatToolBarUI * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -160,7 +160,7 @@ public class FlatToolBarUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java index 3f3962d8..65931a91 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java @@ -40,8 +40,8 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicTreeUI; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreePath; -import com.formdev.flatlaf.ui.FlatStyleSupport.Styleable; -import com.formdev.flatlaf.ui.FlatStyleSupport.StyleableUI; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI; import com.formdev.flatlaf.util.UIScale; /** @@ -156,7 +156,7 @@ public class FlatTreeUI public void installUI( JComponent c ) { super.installUI( c ); - applyStyle( FlatStyleSupport.getStyle( c ) ); + applyStyle( FlatStylingSupport.getStyle( c ) ); } @Override @@ -313,14 +313,14 @@ public class FlatTreeUI * @since TODO */ protected void applyStyle( Object style ) { - oldStyleValues = FlatStyleSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); + oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty ); } /** * @since TODO */ protected Object applyStyleProperty( String key, Object value ) { - return FlatStyleSupport.applyToAnnotatedObject( this, key, value ); + return FlatStylingSupport.applyToAnnotatedObject( this, key, value ); } /** @@ -328,7 +328,7 @@ public class FlatTreeUI */ @Override public Map> getStyleableInfos( JComponent c ) { - return FlatStyleSupport.getAnnotatedStyleableInfos( this ); + return FlatStylingSupport.getAnnotatedStyleableInfos( this ); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index 2ee0fc55..c0dae004 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -868,7 +868,7 @@ debug*/ * with other components. This is only possible if it does not have styles. */ public static boolean canUseSharedUI( JComponent c ) { - return FlatStyleSupport.getStyle( c ) == null; + return FlatStylingSupport.getStyle( c ) == null; } //---- class RepaintFocusListener ----------------------------------------- diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java index dc01e58a..16110540 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java @@ -47,21 +47,21 @@ public class TestFlatStyling @Test void parse() { - assertEquals( null, FlatStyleSupport.parse( null ) ); - assertEquals( null, FlatStyleSupport.parse( "" ) ); - assertEquals( null, FlatStyleSupport.parse( " " ) ); - assertEquals( null, FlatStyleSupport.parse( ";" ) ); - assertEquals( null, FlatStyleSupport.parse( " ; ; " ) ); + assertEquals( null, FlatStylingSupport.parse( null ) ); + assertEquals( null, FlatStylingSupport.parse( "" ) ); + assertEquals( null, FlatStylingSupport.parse( " " ) ); + assertEquals( null, FlatStylingSupport.parse( ";" ) ); + assertEquals( null, FlatStylingSupport.parse( " ; ; " ) ); assertEquals( expectedMap( "background", Color.WHITE ), - FlatStyleSupport.parse( "background: #fff" ) ); + FlatStylingSupport.parse( "background: #fff" ) ); assertEquals( expectedMap( "background", Color.WHITE, "foreground", Color.BLACK ), - FlatStyleSupport.parse( "background: #fff; foreground: #000" ) ); + FlatStylingSupport.parse( "background: #fff; foreground: #000" ) ); assertEquals( expectedMap( "background", Color.WHITE, "foreground", Color.BLACK, "someWidth", 20 ), - FlatStyleSupport.parse( "background: #fff; foreground: #000; someWidth: 20" ) ); + FlatStylingSupport.parse( "background: #fff; foreground: #000; someWidth: 20" ) ); } private Map expectedMap( Object... keyValuePairs ) {