From a6394cac38d04620932bbb31d0d22b01972d37aa Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 14 Nov 2022 12:25:29 +0100 Subject: [PATCH] minor code cleanup: - remove redundant semicolon - create array with curly --- .../java/com/formdev/flatlaf/ui/TestUtils.java | 2 +- .../formdev/flatlaf/demo/DataComponentsPanel.java | 4 ++-- .../formdev/flatlaf/demo/MoreComponentsPanel.java | 2 +- .../java/com/formdev/flatlaf/demo/TabsPanel.java | 2 +- .../com/formdev/flatlaf/extras/FlatDesktop.java | 2 +- .../com/formdev/flatlaf/extras/FlatSVGIcon.java | 4 ++-- .../flatlaf/extras/components/FlatTabbedPane.java | 14 +++++++------- .../flatlaf/extras/components/FlatTextField.java | 2 +- .../flatlaf/testing/FlatComponents2Test.java | 12 ++++++------ .../formdev/flatlaf/testing/FlatContainerTest.java | 4 ++-- .../flatlaf/testing/FlatPaintingStringTest.java | 2 +- .../testing/jideoss/FlatJideOssContainerTest.java | 6 +++--- .../themeeditor/FlatThemeEditorOverlay.java | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java index d9399383..1fc939de 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestUtils.java @@ -30,7 +30,7 @@ import com.formdev.flatlaf.FlatSystemProperties; */ public class TestUtils { - public static final float[] FACTORS = new float[] { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 2.75f, 3f, 3.25f, 3.5f, 3.75f, 4f, 5f, 6f }; + public static final float[] FACTORS = { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 2.75f, 3f, 3.25f, 3.5f, 3.75f, 4f, 5f, 6f }; public static void setup( boolean withFocus ) { System.setProperty( FlatSystemProperties.UI_SCALE, "1x" ); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java index 41860d45..62d62e0b 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DataComponentsPanel.java @@ -290,10 +290,10 @@ class DataComponentsPanel "Not editable", "Text", "Combo", "Combo Editable", "Integer", "Boolean" } ) { - Class[] columnTypes = new Class[] { + Class[] columnTypes = { Object.class, Object.class, String.class, String.class, Integer.class, Boolean.class }; - boolean[] columnEditable = new boolean[] { + boolean[] columnEditable = { false, true, true, true, true, true }; @Override diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java index 5d40d972..1613fb3d 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/MoreComponentsPanel.java @@ -511,7 +511,7 @@ class MoreComponentsPanel // JFormDesigner - End of component initialization //GEN-END:initComponents if( FlatLafDemo.screenshotsMode ) { - Component[] components = new Component[] { + Component[] components = { indeterminateCheckBox, toolTipLabel, toolTip1, toolTip2, toolBarLabel, toolBar1, toolBar2, diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java index 28d39fec..473c996e 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java @@ -889,7 +889,7 @@ class TabsPanel // JFormDesigner - End of component initialization //GEN-END:initComponents if( FlatLafDemo.screenshotsMode ) { - Component[] components = new Component[] { + Component[] components = { tabPlacementLabel, tabPlacementToolBar, tabPlacementTabbedPane, iconBottomTabbedPane, iconTrailingTabbedPane, alignLeadingTabbedPane, alignTrailingTabbedPane, alignFillTabbedPane, diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatDesktop.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatDesktop.java index a7558ec5..49e56534 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatDesktop.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatDesktop.java @@ -35,7 +35,7 @@ import com.formdev.flatlaf.util.SystemInfo; */ public class FlatDesktop { - public enum Action { APP_ABOUT, APP_PREFERENCES, APP_QUIT_HANDLER }; + public enum Action { APP_ABOUT, APP_PREFERENCES, APP_QUIT_HANDLER } /** * Checks whether the given action is supported on the current platform. diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java index 83520749..00255fc3 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java @@ -634,7 +634,7 @@ public class FlatSVGIcon int iconWidth = getIconWidth(); int iconHeight = getIconHeight(); - Dimension[] dimensions = new Dimension[] { + Dimension[] dimensions = { new Dimension( iconWidth, iconHeight ), new Dimension( iconWidth * 2, iconHeight * 2 ), }; @@ -897,7 +897,7 @@ public class FlatSVGIcon color = mapper.apply( color ); return color; - }; + } private Color applyMappings( Color color ) { if( colorMap != null ) { diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTabbedPane.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTabbedPane.java index 0b18bba2..37687c82 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTabbedPane.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTabbedPane.java @@ -364,7 +364,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - /** @since 2 */ public enum TabType { underlined, card }; + /** @since 2 */ public enum TabType { underlined, card } /** * Returns type of selected tab. @@ -387,7 +387,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum TabsPopupPolicy { never, asNeeded }; + public enum TabsPopupPolicy { never, asNeeded } /** * Returns the display policy for the "more tabs" button, @@ -408,7 +408,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum ScrollButtonsPolicy { never, asNeeded, asNeededSingle }; + public enum ScrollButtonsPolicy { never, asNeeded, asNeededSingle } /** * Returns the display policy for the forward/backward scroll arrow buttons. @@ -427,7 +427,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum ScrollButtonsPlacement { both, trailing }; + public enum ScrollButtonsPlacement { both, trailing } /** * Returns the placement of the forward/backward scroll arrow buttons. @@ -446,7 +446,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum TabAreaAlignment { leading, trailing, center, fill }; + public enum TabAreaAlignment { leading, trailing, center, fill } /** * Returns the alignment of the tab area. @@ -465,7 +465,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum TabAlignment { leading, trailing, center }; + public enum TabAlignment { leading, trailing, center } /** * Returns the horizontal alignment of the tab title and icon. @@ -484,7 +484,7 @@ public class FlatTabbedPane // NOTE: enum names must be equal to allowed strings - public enum TabWidthMode { preferred, equal, compact }; + public enum TabWidthMode { preferred, equal, compact } /** * Returns how the tabs should be sized. diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTextField.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTextField.java index c2d14a07..a79288f1 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTextField.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTextField.java @@ -164,7 +164,7 @@ public class FlatTextField // NOTE: enum names must be equal to allowed strings - public enum SelectAllOnFocusPolicy { never, once, always }; + public enum SelectAllOnFocusPolicy { never, once, always } /** * Returns whether all text is selected when the text component gains focus. diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java index b9eaf22e..4349ea3b 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java @@ -155,7 +155,7 @@ public class FlatComponents2Test private void initTableEditors( JTable table ) { TableColumnModel cm = table.getColumnModel(); - String[] months = new String[] { + String[] months = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; @@ -427,7 +427,7 @@ public class FlatComponents2Test if( !(sel instanceof String) ) return; - JTree[] trees = new JTree[] { tree1, tree2, xTree1 }; + JTree[] trees = { tree1, tree2, xTree1 }; switch( (String) sel ) { case "default": for( JTree tree : trees ) @@ -1321,19 +1321,19 @@ public class FlatComponents2Test private class TestTableModel extends AbstractTableModel { - private final String[] columnNames = new String[] { + private final String[] columnNames = { "Not editable", "Text", "Combo", "Combo Editable", "Integer", "Boolean" }; - private final Class[] columnTypes = new Class[] { + private final Class[] columnTypes = { Object.class, Object.class, String.class, String.class, Integer.class, Boolean.class }; - private final boolean[] columnEditable = new boolean[] { + private final boolean[] columnEditable = { false, true, true, true, true, true }; - private final Object[][] rows = new Object[][] { + private final Object[][] rows = { { "item 1", "item 1b", "January", "July", 123, null }, { "item 2", "item 2b", "February", "August", 456, true }, { "item 3", null, "March", null, null, null }, diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java index 6460617d..301be31c 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java @@ -942,7 +942,7 @@ public class FlatContainerTest TabPlacement( int value ) { this.value = value; } - }; + } //---- enum TabIconPlacement ---------------------------------------------- @@ -957,7 +957,7 @@ public class FlatContainerTest TabIconPlacement( int value ) { this.value = value; } - }; + } //---- class Tab1Panel ---------------------------------------------------- diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java index 675e7871..62e054cc 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java @@ -133,7 +133,7 @@ public class FlatPaintingStringTest return (float) -(y - (int) y); }; - float[] scaleFactors = new float[] { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 3f, 3.5f, 4f }; + float[] scaleFactors = { 1f, 1.25f, 1.5f, 1.75f, 2f, 2.25f, 2.5f, 3f, 3.5f, 4f }; for( float scaleFactor : scaleFactors ) { add( new JLabel( String.valueOf( scaleFactor ) ), "newLine" ); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssContainerTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssContainerTest.java index e444071b..47d36450 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssContainerTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssContainerTest.java @@ -708,7 +708,7 @@ public class FlatJideOssContainerTest TabPlacement( int value ) { this.value = value; } - }; + } //---- enum JideTabAlignment ---------------------------------------------- @@ -721,7 +721,7 @@ public class FlatJideOssContainerTest JideTabAlignment( int value ) { this.value = value; } - }; + } //---- enum JideTabResizeMode --------------------------------------------- @@ -736,7 +736,7 @@ public class FlatJideOssContainerTest JideTabResizeMode( int value ) { this.value = value; } - }; + } //---- class Tab1Panel ---------------------------------------------------- diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorOverlay.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorOverlay.java index f3584a5f..dc44e79d 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorOverlay.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorOverlay.java @@ -174,7 +174,7 @@ class FlatThemeEditorOverlay // resolve lazy value if( value instanceof LazyValue ) { - Object[] pValue = new Object[] { value }; + Object[] pValue = { value }; FlatLaf.runWithUIDefaultsGetter( key -> { return (key instanceof String) ? textArea.propertiesSupport.getParsedProperty( (String) key )