diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 855e77998..52e66407c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: # test against # - Java 8 (minimum requirement) # - Java LTS versions (11, 17, ...) - # - lastest Java version(s) + # - latest Java version(s) java: - 8 - 11 # LTS diff --git a/README.md b/README.md index 7e26ab56e..de41d31f0 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ build script: artifactId: flatlaf version: (see button below) -Otherwise download `flatlaf-.jar` here: +Otherwise, download `flatlaf-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf) @@ -141,7 +141,6 @@ details and downloads. Buzz ---- -- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf) - [FlatLaf 3.1 (and 3.0) announcement on Reddit](https://www.reddit.com/r/java/comments/12xgrsu/flatlaf_31_and_30_swing_look_and_feel/) - [FlatLaf 1.0 announcement on Reddit](https://www.reddit.com/r/java/comments/lsbcwe/flatlaf_10_swing_look_and_feel/) - [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/) diff --git a/buildSrc/src/main/java/ReorderJarEntries.java b/buildSrc/src/main/java/ReorderJarEntries.java index 457dae9b2..14fb2c69f 100644 --- a/buildSrc/src/main/java/ReorderJarEntries.java +++ b/buildSrc/src/main/java/ReorderJarEntries.java @@ -45,7 +45,7 @@ public static void reorderJarEntries( File jarFile ) // 1st pass: copy .properties files copyFiles( zipOutStream, jarFile, name -> name.endsWith( ".properties" ) ); - // 2st pass: copy other files + // 2nd pass: copy other files copyFiles( zipOutStream, jarFile, name -> !name.endsWith( ".properties" ) ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java index ce06ad1b3..e36b4fb4c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java @@ -33,7 +33,7 @@ public interface FlatClientProperties //---- JButton ------------------------------------------------------------ /** - * Specifies type of a button. + * Specifies type of button. *

* Components {@link javax.swing.JButton} and {@link javax.swing.JToggleButton}
* Value type {@link java.lang.String}
@@ -421,10 +421,10 @@ public interface FlatClientProperties String TITLE_BAR_SHOW_TITLE = "JRootPane.titleBarShowTitle"; /** - * Specifies whether the "iconfify" button should be shown in the window title bar + * Specifies whether the "iconify" button should be shown in the window title bar * (requires enabled window decorations). Default is {@code true}. *

- * Setting this shows/hides the "iconfify" button + * Setting this shows/hides the "iconify" button * for the {@code JFrame} that contains the root pane. *

* Component {@link javax.swing.JRootPane}
@@ -506,7 +506,7 @@ public interface FlatClientProperties * On macOS, Java supports this out of the box. *

* Note that this client property must be set before the window becomes displayable. - * Otherwise an {@link IllegalComponentStateException} is thrown. + * Otherwise, an {@link IllegalComponentStateException} is thrown. *

* Component {@link javax.swing.JRootPane}
* Value type {@link java.lang.String}
@@ -952,7 +952,7 @@ public interface FlatClientProperties String TABBED_PANE_TAB_ICON_PLACEMENT = "JTabbedPane.tabIconPlacement"; /** - * Specifies the rotation of the tabs (title, icon, etc). + * Specifies the rotation of the tabs (title, icon, etc.). *

* Component {@link javax.swing.JTabbedPane}
* Value type {@link java.lang.Integer} or {@link java.lang.String}
@@ -980,7 +980,7 @@ public interface FlatClientProperties * Tabs are rotated depending on tab placement. *

* For top and bottom tab placement, the tabs are not rotated.
- * For left tab placement, the tabs are rotated counter clockwise.
+ * For left tab placement, the tabs are rotated counter-clockwise.
* For right tab placement, the tabs are rotated clockwise. * * @see #TABBED_PANE_TAB_ROTATION @@ -989,7 +989,7 @@ public interface FlatClientProperties String TABBED_PANE_TAB_ROTATION_AUTO = "auto"; /** - * Tabs are rotated counter clockwise. + * Tabs are rotated counter-clockwise. * * @see #TABBED_PANE_TAB_ROTATION * @since 3.3 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java index 58a26ff10..a0a83767b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java @@ -71,7 +71,7 @@ private static void initBasicInputMaps( UIDefaults defaults ) { ); } - // join ltr and rtl bindings to fix up/down/etc keys in right-to-left component orientation + // join ltr and rtl bindings to fix up/down/etc. keys in right-to-left component orientation Object[] bindings = (Object[]) defaults.get( "PopupMenu.selectedWindowInputMapBindings" ); Object[] rtlBindings = (Object[]) defaults.get( "PopupMenu.selectedWindowInputMapBindings.RightToLeft" ); if( bindings != null && rtlBindings != null ) { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java index d1a7c1302..6b360fdfe 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java @@ -183,7 +183,7 @@ public interface FlatSystemProperties * in system properties {@code sun.boot.library.path} and {@code java.library.path}. * (supported since FlatLaf 2.6) *

- * If the native library can not loaded from the given path (or via {@link System#loadLibrary(String)}), + * If the native library can not be loaded from the given path (or via {@link System#loadLibrary(String)}), * then the embedded native library is extracted to the temporary directory and loaded from there. * * @since 2 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java index 5bb234fb5..99ed8e111 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java @@ -203,7 +203,7 @@ private static String mapFcName( String name ) { * Gets the default font for KDE from KDE configuration files. * * The Swing fonts are not updated when the user changes system font size - * (System Settings > Fonts > Force Font DPI). A application restart is necessary. + * (System Settings > Fonts > Force Font DPI). An application restart is necessary. * This is the same behavior as in native KDE applications. * * The "display scale factor" (kdeglobals: [KScreen] > ScaleFactor) is not used diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java index 7c8486947..d4b4515d3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java @@ -172,7 +172,7 @@ private void menuSelectionChanged() { targetTopY = popupLocation.y; targetBottomY = popupLocation.y + popupSize.height; - // install own event queue to supress mouse events when mouse is moved within safe triangle + // install own event queue to suppress mouse events when mouse is moved within safe triangle if( subMenuEventQueue == null ) subMenuEventQueue = new SubMenuEventQueue(); 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 4330c0a4c..a57b4fbe7 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 @@ -90,7 +90,7 @@ protected void paintIcon( Component c, Graphics2D g ) { closeSize.width, closeSize.height, closeArc, closeArc ); } - // set cross color + // set color of cross Color fg = FlatButtonUI.buttonStateColor( c, closeForeground, null, null, closeHoverForeground, closePressedForeground ); g.setColor( FlatUIUtils.deriveColor( fg, c.getForeground() ) ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java index bce89b952..c3ce6b69a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java @@ -57,11 +57,11 @@ protected void paintIcon( Component c, Graphics2D g ) { double arc = 1.5; double arc2 = 0.5; path = FlatUIUtils.createPath( false, - // bottom-left of opend part + // bottom-left of opened part 2,13.5, - // top-left of opend part + // top-left of opened part FlatUIUtils.ROUNDED, 4.5,7.5, arc, - // top-right of opend part + // top-right of opened part FlatUIUtils.ROUNDED, 15.5,7.5, arc2, // bottom-right diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java index bf0122d4f..87afd2098 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java @@ -71,7 +71,7 @@ protected void paintIcon( Component c, Graphics2D g ) { protected void paintBackground( Component c, Graphics2D g ) { Color background = FlatButtonUI.buttonStateColor( c, null, null, null, hoverBackground, pressedBackground ); if( background != null ) { - // disable antialiasing for background rectangle painting to avoid blury edges when scaled (e.g. at 125% or 175%) + // disable antialiasing for background rectangle painting to avoid blurry edges when scaled (e.g. at 125% or 175%) Object oldHint = g.getRenderingHint( RenderingHints.KEY_ANTIALIASING ); g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF ); 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 d04277501..0d5039cdd 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 @@ -926,7 +926,7 @@ protected Rectangle computePopupBounds( int px, int py, int pw, int ph ) { protected void configurePopup() { super.configurePopup(); - // make opaque to avoid that background shines thru border (e.g. at 150% scaling) + // make opaque to avoid that background shines through border (e.g. at 150% scaling) setOpaque( true ); // set popup border @@ -944,7 +944,7 @@ void updateStyle() { if( popupBackground != null ) list.setBackground( popupBackground ); - // set popup background because it may shine thru when scaled (e.g. at 150%) + // set popup background because it may shine through when scaled (e.g. at 150%) // use non-UIResource to avoid that it is overwritten when making // popup visible (see JPopupMenu.setInvoker()) in theme editor preview setBackground( FlatUIUtils.nonUIResource( list.getBackground() ) ); @@ -1090,7 +1090,7 @@ private static class CellPaddingBorder } // using synchronized to avoid problems with code that modifies combo box - // (model, selection, etc) not on AWT thread (which should be not done) + // (model, selection, etc.) not on AWT thread (which should be not done) synchronized void install( Component c, int focusWidth ) { if( !(c instanceof JComponent) ) return; @@ -1242,7 +1242,7 @@ public void actionPerformed( ActionEvent e ) { * Key selection manager that delegates to the default manager. * Shows the popup if Space key is pressed and "typed characters" buffer is empty. * If items contain spaces (e.g. "a b") it is still possible to select them - * by pressing keys a, Space and b. + * by pressing keys 'a', 'Space' and 'b'. */ private class FlatKeySelectionManager implements JComboBox.KeySelectionManager, UIResource 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 4f093b96e..57635398b 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 @@ -411,7 +411,7 @@ protected void paintCellSelection( Graphics g, int row, int x, int y, int width, int leftIndex = locationToIndex( list, new Point( r.x - 1, r.y ) ); int rightIndex = locationToIndex( list, new Point( r.x + r.width, r.y ) ); - // special handling for the case that last column contains less cells than the other columns + // special handling for the case that last column contains fewer cells than the other columns boolean ltr = list.getComponentOrientation().isLeftToRight(); if( !ltr && leftIndex >= 0 && leftIndex != row && leftIndex == locationToIndex( list, new Point( r.x - 1, r.y - 1 ) ) ) leftIndex = -1; diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java index b119a4f7b..0fb7c3c26 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLibrary.java @@ -78,7 +78,7 @@ else if( SystemInfo.isX86_64 ) // // To avoid this, flatlaf.dll is not linked to jawt.dll, // which avoids loading jawt.dll when flatlaf.dll is loaded. - // Instead flatlaf.dll dynamically loads jawt.dll when first used, + // Instead, flatlaf.dll dynamically loads jawt.dll when first used, // which is guaranteed after AWT initialization. } else if( SystemInfo.isMacOS_10_14_Mojave_orLater && (SystemInfo.isAARCH64 || SystemInfo.isX86_64) ) { 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 c58e3798d..b0404e905 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 @@ -263,7 +263,7 @@ public Dimension getPreferredSize( JComponent c ) { @Override public void paint( Graphics g, JComponent c ) { - // fill background even if not opaque if + // fill background even if not opaque and if: // - contentAreaFilled is true and // - if background color is different to default background color // (this paints selection if using the component as cell renderer) 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 cb1b7c6c1..6f6becc06 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 @@ -245,7 +245,7 @@ protected PropertyChangeListener createPropertyChangeListener() { // because scroll bars do not receive mouse exited event. // The scroll pane, including its scroll bars, is not part // of the component hierarchy and does not receive mouse events - // directly. Instead LWComponentPeer receives mouse events + // directly. Instead, LWComponentPeer receives mouse events // and delegates them to peers, but entered/exited events // are sent only for the whole scroll pane. // Exited event is only sent when mouse leaves scroll pane. 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 581c9994a..4a202f86b 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 @@ -484,7 +484,7 @@ protected void installHiddenTabsNavigation() { // At this point, BasicTabbedPaneUI already has installed // TabbedPaneScrollLayout (in super.createLayoutManager()) and - // ScrollableTabSupport, ScrollableTabViewport, ScrollableTabPanel, etc + // ScrollableTabSupport, ScrollableTabViewport, ScrollableTabPanel, etc. // (in super.installComponents()). // install own layout manager that delegates to original layout manager 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 1ff4ce484..5e28a54d3 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 @@ -183,7 +183,7 @@ protected void installDefaults() { else table.addPropertyChangeListener( new FlatTablePropertyWatcher() ); - // installl boolean renderer + // install boolean renderer oldBooleanRenderer = table.getDefaultRenderer( Boolean.class ); if( oldBooleanRenderer instanceof UIResource ) table.setDefaultRenderer( Boolean.class, new FlatBooleanRenderer() ); @@ -222,11 +222,11 @@ protected void uninstallDefaults() { if( watcher != null ) watcher.enabled = true; - // uninstalll boolean renderer + // uninstall boolean renderer if( table.getDefaultRenderer( Boolean.class ) instanceof FlatBooleanRenderer ) { if( oldBooleanRenderer instanceof Component ) { - // because the old renderer component was not attached to any component hierearchy, - // its UI was not yet updated and it is necessary to do it here + // because the old renderer component was not attached to any component hierarchy, + // its UI was not yet updated, and it is necessary to do it here SwingUtilities.updateComponentTreeUI( (Component) oldBooleanRenderer ); } table.setDefaultRenderer( Boolean.class, oldBooleanRenderer ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java index fa17357e8..4beae363f 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java @@ -1264,7 +1264,7 @@ public void windowStateChanged( WindowEvent e ) { public void mouseClicked( MouseEvent e ) { // on Linux, when using native library, the mouse clicked event // is usually not sent and maximize/restore is done in mouse pressed event - // this check is here for the case that a mouse clicked event comes thru for some reason + // this check is here for the case that a mouse clicked event comes through for some reason if( linuxNativeMove && SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) { // see comment in mousePressed() if( lastSingleClickWhen != 0 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() ) { 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 da41b7644..fed908b1d 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 @@ -729,7 +729,7 @@ public static void paintOutline( Graphics2D g, float x, float y, float w, float } /** - * Creates a (rounded) rectangle used to paint components (border, background, etc). + * Creates a (rounded) rectangle used to paint components (border, background, etc.). * The given arc diameter is limited to min(width,height). */ public static Shape createComponentRectangle( float x, float y, float w, float h, float arc ) { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/FontUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/FontUtils.java index 91aa240dd..8bd63bcbe 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/FontUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/FontUtils.java @@ -80,7 +80,7 @@ public static void registerFontFamilyLoader( String family, Runnable loader ) { /** * Loads a font family previously registered via {@link #registerFontFamilyLoader(String, Runnable)}. - * If the family is already loaded or no londer is registered for that family, nothing happens. + * If the family is already loaded or no loader is registered for that family, nothing happens. */ public static void loadFontFamily( String family ) { if( !hasLoaders() ) @@ -109,7 +109,7 @@ public static boolean installFont( URL url ) { } /** - * Returns all font familiy names available in the graphics environment. + * Returns all font family names available in the graphics environment. * This invokes {@link GraphicsEnvironment#getAvailableFontFamilyNames()} and * appends families registered for lazy loading via {@link #registerFontFamilyLoader(String, Runnable)} * to the result. diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java index 9706d0180..f318d8ef2 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java @@ -204,7 +204,7 @@ public static float computeFontScaleFactor( Font font ) { if( SystemInfo.isWindows ) { // Special handling for Windows to be compatible with OS scaling, // which distinguish between "screen scaling" and "text scaling". - // - Windows "screen scaling" scales everything (text, icon, gaps, etc) + // - Windows "screen scaling" scales everything (text, icon, gaps, etc.) // and may have different scaling factors for each screen. // - Windows "text scaling" increases only the font size, but on all screens. // 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 37921f538..769bd3349 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 @@ -204,7 +204,7 @@ private void addDefaultTabsNoContent( JTabbedPane tabbedPane, int count ) { private void closeButtonStyleChanged() { // WARNING: // Do not use this trick to style individual tabbed panes in own code. - // Instead use one styling for all tabbed panes in your application. + // Instead, use one styling for all tabbed panes in your application. if( circleCloseButton.isSelected() ) { UIManager.put( "TabbedPane.closeArc", 999 ); UIManager.put( "TabbedPane.closeCrossFilledSize", 5.5f ); diff --git a/flatlaf-extras/README.md b/flatlaf-extras/README.md index 55e386642..ef66e83d4 100644 --- a/flatlaf-extras/README.md +++ b/flatlaf-extras/README.md @@ -33,7 +33,7 @@ build script: artifactId: flatlaf-extras version: (see button below) -Otherwise download `flatlaf-extras-.jar` here: +Otherwise, download `flatlaf-extras-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras) diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java index b46d26f4e..bc0a6fae1 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java @@ -133,8 +133,8 @@ public void removeNotify() { } /** - * Starts an animation that shows the snapshot (created by {@link #showSnapshot()} - * with an decreasing alpha. At the end, the snapshot is removed and the new UI is shown. + * Starts an animation that shows the snapshot (created by {@link #showSnapshot()}) + * with a decreasing alpha. At the end, the snapshot is removed and the new UI is shown. * Invoke after updating UI. */ public static void hideSnapshotWithAnimation() { 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 49e565341..d0d620cb2 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 @@ -119,7 +119,7 @@ private static void setHandler( String setHandlerMethodName, String handlerClass (proxy, method, args) -> { // Use invokeLater to release the listener firing for the case // that the action listener shows a modal dialog. - // This (hopefully) prevents application hunging. + // This (hopefully) prevents application hanging. EventQueue.invokeLater( () -> { handler.run(); } ); 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 761176039..2d461722c 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 @@ -87,7 +87,7 @@ public class FlatSVGIcon * in the tag {@code } are used as icon size. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -106,7 +106,7 @@ public FlatSVGIcon( String name ) { * in the tag {@code } are used as icon size. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -124,7 +124,7 @@ public FlatSVGIcon( String name, ClassLoader classLoader ) { * The icon is scaled if the given size is different to the size specified in the SVG file. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -144,7 +144,7 @@ public FlatSVGIcon( String name, int width, int height ) { * The icon is scaled if the given size is different to the size specified in the SVG file. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -166,7 +166,7 @@ public FlatSVGIcon( String name, int width, int height, ClassLoader classLoader * by the given scale factor. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -187,7 +187,7 @@ public FlatSVGIcon( String name, float scale ) { * by the given scale factor. *

* If using Java modules, the package containing the icon must be opened in {@code module-info.java}. - * Otherwise use {@link #FlatSVGIcon(URL)}. + * Otherwise, use {@link #FlatSVGIcon(URL)}. *

* This is cheap operation because the icon is only loaded when used. * @@ -259,7 +259,7 @@ public FlatSVGIcon( File file ) { *

* The input stream is loaded, parsed and closed immediately. * - * @param in the input stream for reading a SVG resource + * @param in the input stream for reading an SVG resource * @throws IOException if an I/O exception occurs * @since 2 */ diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGUtils.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGUtils.java index bb546fa72..bf09fbc93 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGUtils.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGUtils.java @@ -46,10 +46,10 @@ public class FlatSVGUtils * then a single multi-resolution image is returned that creates images on demand * for requested sizes from SVG. * This has the advantage that only images for used sizes are created. - * Also if unusual sizes are requested (e.g. 18x18), then they are created from SVG. + * Also, if unusual sizes are requested (e.g. 18x18), then they are created from SVG. *

* If using Java modules, the package containing the SVG must be opened in {@code module-info.java}. - * Otherwise use {@link #createWindowIconImages(URL)}. + * Otherwise, use {@link #createWindowIconImages(URL)}. * * @param svgName the name of the SVG resource (a '/'-separated path) * @return list of icon images with different sizes (16x16, 20x20, 24x24, 28x28, 32x32, 48x48 and 64x64) @@ -69,7 +69,7 @@ public static List createWindowIconImages( String svgName ) { * then a single multi-resolution image is returned that creates images on demand * for requested sizes from SVG. * This has the advantage that only images for used sizes are created. - * Also if unusual sizes are requested (e.g. 18x18), then they are created from SVG. + * Also, if unusual sizes are requested (e.g. 18x18), then they are created from SVG. *

* This method is useful if using Java modules and the package containing the SVG * is not opened in {@code module-info.java}. @@ -92,7 +92,7 @@ public static List createWindowIconImages( URL svgUrl ) { // any size is created on demand when // MultiResolutionImage.getResolutionVariant(double destImageWidth, double destImageHeight) // is invoked. - // This sizes are only used by MultiResolutionImage.getResolutionVariants(). + // These sizes are only used by MultiResolutionImage.getResolutionVariants(). new Dimension( 16, 16 ), // 100% new Dimension( 20, 20 ), // 125% new Dimension( 24, 24 ), // 150% @@ -120,7 +120,7 @@ public static List createWindowIconImages( URL svgUrl ) { * Creates a buffered image and renders the given SVG into it. *

* If using Java modules, the package containing the SVG must be opened in {@code module-info.java}. - * Otherwise use {@link #svg2image(URL, int, int)}. + * Otherwise, use {@link #svg2image(URL, int, int)}. * * @param svgName the name of the SVG resource (a '/'-separated path) * @param width the width of the image @@ -154,7 +154,7 @@ public static BufferedImage svg2image( URL svgUrl, int width, int height ) { * Creates a buffered image and renders the given SVG into it. *

* If using Java modules, the package containing the SVG must be opened in {@code module-info.java}. - * Otherwise use {@link #svg2image(URL, float)}. + * Otherwise, use {@link #svg2image(URL, float)}. * * @param svgName the name of the SVG resource (a '/'-separated path) * @param scaleFactor the amount by which the SVG size is scaled diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java index 75b2f13d4..e969918e5 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java @@ -557,7 +557,7 @@ private void initComponents() { // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents panel = new JPanel(); filterPanel = new JPanel(); - flterLabel = new JLabel(); + filterLabel = new JLabel(); filterField = new FlatTextField(); valueTypeLabel = new JLabel(); valueTypeField = new JComboBox<>(); @@ -580,11 +580,11 @@ private void initComponents() { ((GridBagLayout)filterPanel.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4}; ((GridBagLayout)filterPanel.getLayout()).rowWeights = new double[] {0.0, 1.0E-4}; - //---- flterLabel ---- - flterLabel.setText("Filter:"); - flterLabel.setLabelFor(filterField); - flterLabel.setDisplayedMnemonic('F'); - filterPanel.add(flterLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + //---- filterLabel ---- + filterLabel.setText("Filter:"); + filterLabel.setLabelFor(filterField); + filterLabel.setDisplayedMnemonic('F'); + filterPanel.add(filterLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 10), 0, 0)); @@ -668,7 +668,7 @@ public void mousePressed(MouseEvent e) { // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables private JPanel panel; private JPanel filterPanel; - private JLabel flterLabel; + private JLabel filterLabel; private FlatTextField filterField; private JLabel valueTypeLabel; private JComboBox valueTypeField; diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd index d81ca8639..b3c8589b6 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd @@ -15,7 +15,7 @@ new FormModel { } ) { name: "filterPanel" add( new FormComponent( "javax.swing.JLabel" ) { - name: "flterLabel" + name: "filterLabel" "text": "Filter:" "labelFor": new FormReference( "filterField" ) "displayedMnemonic": 70 diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatButton.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatButton.java index 4b2907755..530ec3dd6 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatButton.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatButton.java @@ -33,14 +33,14 @@ public class FlatButton public enum ButtonType { none, square, roundRect, tab, help, toolBarButton, borderless } /** - * Returns type of a button. + * Returns type of button. */ public ButtonType getButtonType() { return getClientPropertyEnumString( BUTTON_TYPE, ButtonType.class, null, ButtonType.none ); } /** - * Specifies type of a button. + * Specifies type of button. */ public void setButtonType( ButtonType buttonType ) { if( buttonType == ButtonType.none ) diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatFormattedTextField.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatFormattedTextField.java index c3aa88265..736d8275e 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatFormattedTextField.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatFormattedTextField.java @@ -106,7 +106,7 @@ public JComponent getLeadingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ @@ -135,7 +135,7 @@ public JComponent getTrailingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatPasswordField.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatPasswordField.java index 7c36be76a..3f0b2f696 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatPasswordField.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatPasswordField.java @@ -106,7 +106,7 @@ public JComponent getLeadingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ @@ -135,7 +135,7 @@ public JComponent getTrailingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ 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 a79288f10..5b344de9b 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 @@ -105,7 +105,7 @@ public JComponent getLeadingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ @@ -134,7 +134,7 @@ public JComponent getTrailingComponent() { * The component should be not opaque because the text field border is painted * slightly inside the usually visible border in some cases. * E.g. when focused (in some themes) or when an outline color is specified - * (see {@link #setOutline(Object)}. + * (see {@link #setOutline(Object)}). * * @since 2 */ diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatToggleButton.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatToggleButton.java index b8eca0178..f3f52f906 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatToggleButton.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatToggleButton.java @@ -31,14 +31,14 @@ public class FlatToggleButton implements FlatComponentExtension, FlatStyleableComponent { /** - * Returns type of a button. + * Returns type of button. */ public ButtonType getButtonType() { return getClientPropertyEnumString( BUTTON_TYPE, ButtonType.class, null, ButtonType.none ); } /** - * Specifies type of a button. + * Specifies type of button. */ public void setButtonType( ButtonType buttonType ) { if( buttonType == ButtonType.none ) diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTriStateCheckBox.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTriStateCheckBox.java index 90964dbdf..f98044718 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTriStateCheckBox.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatTriStateCheckBox.java @@ -30,8 +30,8 @@ *

* The initial state is {@link State#INDETERMINATE}. *

- * By default the third state is allowed and clicking on the checkbox cycles thru all - * three states. If you want that the user can cycle only thru two states, disallow + * By default, the third state is allowed and clicking on the checkbox cycles through all + * three states. If you want that the user can cycle only through two states, disallow * intermediate state using {@link #setAllowIndeterminate(boolean)}. Then you can still * set the indeterminate state via API if necessary, but the user can not. *

diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/resources/EmptyPackage.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/resources/EmptyPackage.java index f231e6896..483b50532 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/resources/EmptyPackage.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/resources/EmptyPackage.java @@ -18,8 +18,8 @@ /** * The only purpose of this file is to add a .class file to this package to make it non-empty. - * Otherwise the compiler outputs a warning because this package is opend in module-info.java. - * Also when using --patch-module (e.g. from an IDE), an error would occur for empty packages. + * Otherwise, the compiler outputs a warning because this package is opened in module-info.java. + * Also, when using --patch-module (e.g. from an IDE), an error would occur for empty packages. * * @author Karl Tauber */ diff --git a/flatlaf-fonts/flatlaf-fonts-inter/README.md b/flatlaf-fonts/flatlaf-fonts-inter/README.md index 639b3cd48..eff1ca712 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/README.md +++ b/flatlaf-fonts/flatlaf-fonts-inter/README.md @@ -100,6 +100,6 @@ build script: artifactId: flatlaf-fonts-inter version: (see button below) -Otherwise download `flatlaf-fonts-inter-.jar` here: +Otherwise, download `flatlaf-fonts-inter-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-inter/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-inter) diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md index e63d13e37..50dfef3d0 100644 --- a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/README.md @@ -81,6 +81,6 @@ build script: artifactId: flatlaf-fonts-jetbrains-mono version: (see button below) -Otherwise download `flatlaf-fonts-jetbrains-mono-.jar` here: +Otherwise, download `flatlaf-fonts-jetbrains-mono-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-jetbrains-mono/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-jetbrains-mono) diff --git a/flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md b/flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md index bb673ed0d..0f419be42 100644 --- a/flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md +++ b/flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md @@ -81,6 +81,6 @@ build script: artifactId: flatlaf-fonts-roboto-mono version: (see button below) -Otherwise download `flatlaf-fonts-roboto-mono-.jar` here: +Otherwise, download `flatlaf-fonts-roboto-mono-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto-mono/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto-mono) diff --git a/flatlaf-fonts/flatlaf-fonts-roboto/README.md b/flatlaf-fonts/flatlaf-fonts-roboto/README.md index ddd7dab8d..316e7c5cf 100644 --- a/flatlaf-fonts/flatlaf-fonts-roboto/README.md +++ b/flatlaf-fonts/flatlaf-fonts-roboto/README.md @@ -97,6 +97,6 @@ build script: artifactId: flatlaf-fonts-roboto version: (see button below) -Otherwise download `flatlaf-fonts-roboto-.jar` here: +Otherwise, download `flatlaf-fonts-roboto-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto) diff --git a/flatlaf-intellij-themes/README.md b/flatlaf-intellij-themes/README.md index 01eaf527b..9a69d332b 100644 --- a/flatlaf-intellij-themes/README.md +++ b/flatlaf-intellij-themes/README.md @@ -20,7 +20,7 @@ build script: artifactId: flatlaf-intellij-themes version: (see button below) -Otherwise download `flatlaf-intellij-themes-.jar` here: +Otherwise, download `flatlaf-intellij-themes-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-intellij-themes/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-intellij-themes) diff --git a/flatlaf-jide-oss/README.md b/flatlaf-jide-oss/README.md index a683b0b9d..32ed2679c 100644 --- a/flatlaf-jide-oss/README.md +++ b/flatlaf-jide-oss/README.md @@ -35,7 +35,7 @@ build script: artifactId: flatlaf-jide-oss version: (see button below) -Otherwise download `flatlaf-jide-oss-.jar` here: +Otherwise, download `flatlaf-jide-oss-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-jide-oss/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-jide-oss) diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java index 532a95b42..60b5da361 100644 --- a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java +++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java @@ -477,7 +477,7 @@ protected void paintTabSelection( Graphics g, int tabPlacement, int x, int y, i } /** - * Actually does the nearly the same as super.paintContentBorder() but + * Actually does nearly the same as super.paintContentBorder() but * - not invoking paintContentBorder*Edge() methods * - repaint selection */ diff --git a/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java index 7fc493212..c7a5ec23d 100644 --- a/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java +++ b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java @@ -122,7 +122,7 @@ public boolean hasCustomDecoration( Window window ) { } /** - * Tell the window whether the application wants use custom decorations. + * Tell the window whether the application wants to use custom decorations. * If {@code true}, the Windows 10 title bar is hidden (including minimize, * maximize and close buttons), but not the resize borders (including drop shadow). */ diff --git a/flatlaf-swingx/README.md b/flatlaf-swingx/README.md index b1b02e772..0951e3c1c 100644 --- a/flatlaf-swingx/README.md +++ b/flatlaf-swingx/README.md @@ -4,7 +4,7 @@ FlatLaf addon for SwingX This addon for FlatLaf adds support for **some** widely used SwingX components. Many SwingX components that do not use UI delegates (e.g. `JXButton`, `JXLabel`, -`JXList`, `JXStatusBar`, etc) work with FlatLaf without adaptation. +`JXList`, `JXStatusBar`, etc.) work with FlatLaf without adaptation. Following SwingX components, which use UI delegates, are currently supported by this addon: @@ -35,7 +35,7 @@ build script: artifactId: flatlaf-swingx version: (see button below) -Otherwise download `flatlaf-swingx-.jar` here: +Otherwise, download `flatlaf-swingx-.jar` here: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-swingx/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-swingx) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java index 8af6622f9..54d91a7ec 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java @@ -837,7 +837,7 @@ public int filterRGB(int x, int y, int rgb) { // Calculate the average. // Sun's formula: Math.min(1.0f, (1f - avg) / (100.0f / 35.0f) + avg); - // The following formula uses less operations and hence is faster. + // The following formula uses fewer operations and hence is faster. avg = Math.min(1.0f, 0.35f + 0.65f * avg); // Convert back into RGB. return (int) (alpha * 255f) << 24 | diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java index e44e8ffd7..ebe6738c4 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java @@ -217,7 +217,7 @@ private void replaceAll() { context.setReplaceWith( replaceField.getText() ); // make sure that search wrap is disabled because otherwise it is easy - // to have endeless loop when replacing e.g. "a" with "aa" + // to have endless loop when replacing e.g. "a" with "aa" boolean oldSearchWrap = context.getSearchWrap(); context.setSearchWrap( false ); diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java index 4ab19a790..aa8ba9d4d 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java @@ -401,7 +401,7 @@ private File[] getPropertiesFiles( File dir ) { if( !themesDir.isDirectory() ) return propertiesFiles; - // get files from "themes" sub-directory + // get files from "themes" subdirectory File[] themesFiles = getPropertiesFiles( themesDir ); File[] allFiles = new File[propertiesFiles.length + themesFiles.length]; System.arraycopy( propertiesFiles, 0, allFiles, 0, propertiesFiles.length );