refactor: Reformat code

kordamp · Jan 27, 2025 · 0112bf0 · 0112bf0
1 parent eaff777
commit 0112bf0
Show file tree

Hide file tree

Showing 100 changed files with 1,720 additions and 1,696 deletions.
diff --git a/apps/ikonli-browser/ikonli-browser.gradle b/apps/ikonli-browser/ikonli-browser.gradle
@@ -134,7 +134,7 @@ if (rootProject.javafx_platform == 'mac') {
 } else if (rootProject.javafx_platform == 'win') {
     zuluHome = project.file("${buildDir}/jdks/zulu21Windows/${zuluVersion}-${zuluPlatform}_x64")
 }
-System.properties['badass.jlink.java.home']     = zuluHome.absolutePath
+System.properties['badass.jlink.java.home'] = zuluHome.absolutePath
 System.properties['badass.jlink.jpackage.home'] = zuluHome.absolutePath
 
 jdks {

diff --git a/apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/AboutDialog.java b/apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/AboutDialog.java
@@ -33,8 +33,8 @@ public static void show() {
 
         alert.getDialogPane().getScene()
             .getStylesheets().addAll(
-            IkonBrowser.class.getResource("common.css").toExternalForm(),
-            BootstrapFX.bootstrapFXStylesheet());
+                IkonBrowser.class.getResource("common.css").toExternalForm(),
+                BootstrapFX.bootstrapFXStylesheet());
         alert.getDialogPane().lookupButton(ButtonType.OK)
             .getStyleClass().addAll("btn", "btn-primary");
         alert.getDialogPane().getStyleClass().add("dialog-content");

diff --git a/apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/Launcher.java b/apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/Launcher.java
@@ -29,9 +29,9 @@ public static void main(String[] args) {
     }
 
     private static boolean printVersion(String[] args) {
-        if (args != null && args.length > 0) {
+        if (args != null) {
             for (String arg : args) {
-                if ("-version" .equals(arg) || "--version" .equals(arg)) {
+                if ("-version".equals(arg) || "--version".equals(arg)) {
                     System.out.println("Ikonli Browser " + Versions.IKONLI_VERSION);
                     return true;
                 }

diff --git a/apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/browser.css b/apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/browser.css
@@ -16,6 +16,7 @@
     -fx-background-color: #120caf, linear-gradient(#1f52ff 10%, #120caf 30%, #1f52ff 100%);
     -fx-border-color: #120caf;
 }
+
 .internal-window,
 .internal-window .internal-window-titlebar {
     -fx-background-color: #1f52ff, linear-gradient(#5ca6ff 10%, #1f52ff 30%, #5ca6ff 100%);

diff --git a/apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/versions.properties b/apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/versions.properties
@@ -16,4 +16,4 @@
 # limitations under the License.
 #
 
-ikonli_version = ${ikonli_version}
+ikonli_version=${ikonli_version}
diff --git a/apps/sampler-javafx/sampler-javafx.gradle b/apps/sampler-javafx/sampler-javafx.gradle
@@ -20,8 +20,8 @@ plugins {
 }
 
 application {
-  mainModule = 'org.kordamp.ikonli.sampler.javafx'
-  mainClass  = 'org.kordamp.ikonli.sampler.javafx.Sampler'
+    mainModule = 'org.kordamp.ikonli.sampler.javafx'
+    mainClass = 'org.kordamp.ikonli.sampler.javafx.Sampler'
 }
 
 dependencies {

diff --git a/apps/sampler-swing/sampler-swing.gradle b/apps/sampler-swing/sampler-swing.gradle
@@ -19,7 +19,7 @@ apply plugin: 'application'
 
 application {
     mainModule = 'org.kordamp.ikonli.sampler.swing'
-    mainClass  = 'org.kordamp.ikonli.sampler.swing.Sampler'
+    mainClass = 'org.kordamp.ikonli.sampler.swing.Sampler'
 }
 
 dependencies {

diff --git a/apps/sampler-swing/src/main/java/org/kordamp/ikonli/sampler/swing/Sampler.java b/apps/sampler-swing/src/main/java/org/kordamp/ikonli/sampler/swing/Sampler.java
@@ -21,8 +21,15 @@
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.swing.FontIcon;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import java.awt.Dimension;
+import java.awt.GridLayout;
 import java.util.EnumSet;
 import java.util.Map;
 import java.util.ServiceLoader;

diff --git a/core/ikonli-core/src/main/java/org/kordamp/ikonli/AbstractIkonResolver.java b/core/ikonli-core/src/main/java/org/kordamp/ikonli/AbstractIkonResolver.java
@@ -17,14 +17,14 @@
  */
 package org.kordamp.ikonli;
 
-import static java.util.Objects.requireNonNull;
-
 import java.util.Arrays;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Logger;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * @author Andres Almiray
  */
@@ -85,7 +85,7 @@ public static ServiceLoader<IkonHandler> resolveServiceLoader() {
         // Check if handlers must be loaded from a ModuleLayer
         if (null != IkonHandler.class.getModule().getLayer()) {
             ServiceLoader<IkonHandler> ikonHandlerServiceLoaders = ServiceLoader.load(
-                IkonHandler.class.getModule().getLayer(), 
+                IkonHandler.class.getModule().getLayer(),
                 IkonHandler.class
             );
             if (ikonHandlerServiceLoaders.findFirst().isPresent()) {
@@ -94,9 +94,9 @@ public static ServiceLoader<IkonHandler> resolveServiceLoader() {
         }
 
         ServiceLoader<IkonHandler> handlers = ServiceLoader.load(
-                IkonHandler.class, 
-                IkonHandler.class.getClassLoader()
-            );
+            IkonHandler.class,
+            IkonHandler.class.getClassLoader()
+        );
         // Return if the IkonHandler.class.classLoader works or if *nothing* else works
         return handlers.findFirst().isPresent() ? handlers : ServiceLoader.load(IkonHandler.class);
     }

diff --git a/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikonli.java b/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikonli.java
@@ -21,7 +21,7 @@
  * @author Andres Almiray
  */
 public enum Ikonli implements Ikon {
-    NONE("ikn-none",'\ue600');
+    NONE("ikn-none", '\ue600');
 
     public static Ikonli findByDescription(String description) {
         for (Ikonli font : values()) {
@@ -32,8 +32,8 @@ public static Ikonli findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     Ikonli(String description, int code) {
         this.description = description;

diff --git a/core/ikonli-core/src/main/java/org/kordamp/ikonli/OSGiIkonResolver.java b/core/ikonli-core/src/main/java/org/kordamp/ikonli/OSGiIkonResolver.java
@@ -28,12 +28,12 @@ public class OSGiIkonResolver extends AbstractIkonResolver implements IkonResolv
 
     public OSGiIkonResolver() {
     }
-    
+
     @Reference
     protected void setFontLoader(FontLoader fontLoader) {
         this.fontLoader = fontLoader;
     }
-    
+
     @Reference(
         cardinality = ReferenceCardinality.MULTIPLE,
         policyOption = ReferencePolicyOption.GREEDY,

diff --git a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/JavaFXFontLoader.java b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/JavaFXFontLoader.java
@@ -17,14 +17,13 @@
  */
 package org.kordamp.ikonli.javafx;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
+import javafx.scene.text.Font;
 import org.kordamp.ikonli.FontLoader;
 import org.kordamp.ikonli.IkonHandler;
 import org.osgi.service.component.annotations.Component;
 
-import javafx.scene.text.Font;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Component(service = FontLoader.class)
 public class JavaFXFontLoader implements FontLoader {

diff --git a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/StackedFontIcon.java b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/StackedFontIcon.java
@@ -54,8 +54,8 @@ public class StackedFontIcon extends StackPane implements Icon {
     private StyleableObjectProperty<Paint> iconColor;
     private double[] iconSizes = new double[0];
 
-    private ChangeListener<Number> iconSizeChangeListener = (v, o, n) -> setIconSizeOnChildren(n.intValue());
-    private ChangeListener<Paint> iconColorChangeListener = (v, o, n) -> setIconColorOnChildren(n);
+    private final ChangeListener<Number> iconSizeChangeListener = (v, o, n) -> setIconSizeOnChildren(n.intValue());
+    private final ChangeListener<Paint> iconColorChangeListener = (v, o, n) -> setIconColorOnChildren(n);
 
     public static void setIconSize(Node icon, double size) {
         if (icon != null && size >= 0d && size <= 1.0d) {
@@ -74,7 +74,7 @@ public static double getIconSize(Node icon) {
     }
 
     private class NodeSizeListener implements MapChangeListener<Object, Object> {
-        private Node node;
+        private final Node node;
 
         private NodeSizeListener(Node node) {
             this.node = node;

diff --git a/core/ikonli-javafx/tmp/SVGIcon.java b/core/ikonli-javafx/tmp/SVGIcon.java
@@ -286,9 +286,15 @@ private void resolvePaint(String iconCode, String[] parts) {
     }
 
     private static Paint resolvePaintValue(String iconCode, String value) {
-        try { return Color.valueOf(value); } catch (IllegalArgumentException e1) {
-            try { return LinearGradient.valueOf(value); } catch (IllegalArgumentException e2) {
-                try { return RadialGradient.valueOf(value); } catch (IllegalArgumentException e3) {
+        try {
+            return Color.valueOf(value);
+        } catch (IllegalArgumentException e1) {
+            try {
+                return LinearGradient.valueOf(value);
+            } catch (IllegalArgumentException e2) {
+                try {
+                    return RadialGradient.valueOf(value);
+                } catch (IllegalArgumentException e3) {
                     throw invalidDescription(iconCode, e3);
                 }
             }

diff --git a/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/FontIcon.java b/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/FontIcon.java
@@ -21,8 +21,14 @@
 import org.kordamp.ikonli.IkonHandler;
 import org.kordamp.ikonli.IkonResolverProvider;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 
 import static java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment;

diff --git a/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/SwingFontLoader.java b/core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/SwingFontLoader.java
@@ -17,6 +17,10 @@
  */
 package org.kordamp.ikonli.swing;
 
+import org.kordamp.ikonli.FontLoader;
+import org.kordamp.ikonli.IkonHandler;
+import org.osgi.service.component.annotations.Component;
+
 import java.awt.Font;
 import java.awt.FontFormatException;
 import java.awt.GraphicsEnvironment;
@@ -25,10 +29,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.kordamp.ikonli.FontLoader;
-import org.kordamp.ikonli.IkonHandler;
-import org.osgi.service.component.annotations.Component;
-
 @Component(service = FontLoader.class)
 public class SwingFontLoader implements FontLoader {
     private static final Map<String, Font> FONTS = new ConcurrentHashMap<>();

diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogos.java b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogos.java
@@ -159,8 +159,8 @@ public static BoxiconsLogos findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BoxiconsLogos(String description, int code) {
         this.description = description;

diff --git a/...packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegular.java b/...packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegular.java
@@ -783,8 +783,8 @@ public static BoxiconsRegular findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BoxiconsRegular(String description, int code) {
         this.description = description;

diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolid.java b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolid.java
@@ -657,8 +657,8 @@ public static BoxiconsSolid findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BoxiconsSolid(String description, int code) {
         this.description = description;

diff --git a/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/Bpmn.java b/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/Bpmn.java
@@ -140,8 +140,8 @@ public static Bpmn findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     Bpmn(String description, int code) {
         this.description = description;

diff --git a/icon-packs/ikonli-bytedance-pack/src/main/java/module-info.java b/icon-packs/ikonli-bytedance-pack/src/main/java/module-info.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import org.kordamp.ikonli.bytedance.BytedanceIconsBoldALIkonHandler;
 import org.kordamp.ikonli.bytedance.BytedanceIconsBoldALIkonProvider;
 import org.kordamp.ikonli.bytedance.BytedanceIconsBoldMZIkonHandler;
@@ -56,22 +57,22 @@
     exports org.kordamp.ikonli.bytedance;
 
     provides org.kordamp.ikonli.IkonHandler
-            with BytedanceIconsThinALIkonHandler,
-                    BytedanceIconsThinMZIkonHandler,
-                    BytedanceIconsRegularALIkonHandler,
-                    BytedanceIconsRegularMZIkonHandler,
-                    BytedanceIconsBoldALIkonHandler,
-                    BytedanceIconsBoldMZIkonHandler,
-                    BytedanceIconsExtraBoldALIkonHandler,
-                    BytedanceIconsExtraBoldMZIkonHandler;
+        with BytedanceIconsThinALIkonHandler,
+            BytedanceIconsThinMZIkonHandler,
+            BytedanceIconsRegularALIkonHandler,
+            BytedanceIconsRegularMZIkonHandler,
+            BytedanceIconsBoldALIkonHandler,
+            BytedanceIconsBoldMZIkonHandler,
+            BytedanceIconsExtraBoldALIkonHandler,
+            BytedanceIconsExtraBoldMZIkonHandler;
     provides org.kordamp.ikonli.IkonProvider
-            with BytedanceIconsThinALIkonProvider,
-                    BytedanceIconsThinMZIkonProvider,
-                    BytedanceIconsRegularALIkonProvider,
-                    BytedanceIconsRegularMZIkonProvider,
-                    BytedanceIconsBoldALIkonProvider,
-                    BytedanceIconsBoldMZIkonProvider,
-                    BytedanceIconsExtraBoldALIkonProvider,
-                    BytedanceIconsExtraBoldMZIkonProvider;
+        with BytedanceIconsThinALIkonProvider,
+            BytedanceIconsThinMZIkonProvider,
+            BytedanceIconsRegularALIkonProvider,
+            BytedanceIconsRegularMZIkonProvider,
+            BytedanceIconsBoldALIkonProvider,
+            BytedanceIconsBoldMZIkonProvider,
+            BytedanceIconsExtraBoldALIkonProvider,
+            BytedanceIconsExtraBoldMZIkonProvider;
 
 }
diff --git a/...konli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldAL.java b/...konli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldAL.java
@@ -1528,8 +1528,8 @@ public static BytedanceIconsBoldAL findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BytedanceIconsBoldAL(String description, int code) {
         this.description = description;

diff --git a/...konli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldMZ.java b/...konli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldMZ.java
@@ -1196,8 +1196,8 @@ public static BytedanceIconsBoldMZ findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BytedanceIconsBoldMZ(String description, int code) {
         this.description = description;

diff --git a/...-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldAL.java b/...-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldAL.java
@@ -18,6 +18,7 @@
 package org.kordamp.ikonli.bytedance;
 
 import org.kordamp.ikonli.Ikon;
+
 /**
  * @author LeeWyatt
  */
@@ -1527,8 +1528,8 @@ public static BytedanceIconsExtraBoldAL findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BytedanceIconsExtraBoldAL(String description, int code) {
         this.description = description;

diff --git a/...-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldMZ.java b/...-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldMZ.java
@@ -1196,8 +1196,8 @@ public static BytedanceIconsExtraBoldMZ findByDescription(String description) {
         throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
-    private String description;
-    private int code;
+    private final String description;
+    private final int code;
 
     BytedanceIconsExtraBoldMZ(String description, int code) {
         this.description = description;