Skip to content

Commit 0112bf0

Browse files
committed
refactor: Reformat code
1 parent eaff777 commit 0112bf0

File tree

100 files changed

+1720
-1696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1720
-1696
lines changed

apps/ikonli-browser/ikonli-browser.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ if (rootProject.javafx_platform == 'mac') {
134134
} else if (rootProject.javafx_platform == 'win') {
135135
zuluHome = project.file("${buildDir}/jdks/zulu21Windows/${zuluVersion}-${zuluPlatform}_x64")
136136
}
137-
System.properties['badass.jlink.java.home'] = zuluHome.absolutePath
137+
System.properties['badass.jlink.java.home'] = zuluHome.absolutePath
138138
System.properties['badass.jlink.jpackage.home'] = zuluHome.absolutePath
139139

140140
jdks {

apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/AboutDialog.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public static void show() {
3333

3434
alert.getDialogPane().getScene()
3535
.getStylesheets().addAll(
36-
IkonBrowser.class.getResource("common.css").toExternalForm(),
37-
BootstrapFX.bootstrapFXStylesheet());
36+
IkonBrowser.class.getResource("common.css").toExternalForm(),
37+
BootstrapFX.bootstrapFXStylesheet());
3838
alert.getDialogPane().lookupButton(ButtonType.OK)
3939
.getStyleClass().addAll("btn", "btn-primary");
4040
alert.getDialogPane().getStyleClass().add("dialog-content");

apps/ikonli-browser/src/main/java/org/kordamp/ikonli/browser/Launcher.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public static void main(String[] args) {
2929
}
3030

3131
private static boolean printVersion(String[] args) {
32-
if (args != null && args.length > 0) {
32+
if (args != null) {
3333
for (String arg : args) {
34-
if ("-version" .equals(arg) || "--version" .equals(arg)) {
34+
if ("-version".equals(arg) || "--version".equals(arg)) {
3535
System.out.println("Ikonli Browser " + Versions.IKONLI_VERSION);
3636
return true;
3737
}

apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/browser.css

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
-fx-background-color: #120caf, linear-gradient(#1f52ff 10%, #120caf 30%, #1f52ff 100%);
1717
-fx-border-color: #120caf;
1818
}
19+
1920
.internal-window,
2021
.internal-window .internal-window-titlebar {
2122
-fx-background-color: #1f52ff, linear-gradient(#5ca6ff 10%, #1f52ff 30%, #5ca6ff 100%);

apps/ikonli-browser/src/main/resources/org/kordamp/ikonli/browser/versions.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# limitations under the License.
1717
#
1818

19-
ikonli_version = ${ikonli_version}
19+
ikonli_version=${ikonli_version}

apps/sampler-javafx/sampler-javafx.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ plugins {
2020
}
2121

2222
application {
23-
mainModule = 'org.kordamp.ikonli.sampler.javafx'
24-
mainClass = 'org.kordamp.ikonli.sampler.javafx.Sampler'
23+
mainModule = 'org.kordamp.ikonli.sampler.javafx'
24+
mainClass = 'org.kordamp.ikonli.sampler.javafx.Sampler'
2525
}
2626

2727
dependencies {

apps/sampler-swing/sampler-swing.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ apply plugin: 'application'
1919

2020
application {
2121
mainModule = 'org.kordamp.ikonli.sampler.swing'
22-
mainClass = 'org.kordamp.ikonli.sampler.swing.Sampler'
22+
mainClass = 'org.kordamp.ikonli.sampler.swing.Sampler'
2323
}
2424

2525
dependencies {

apps/sampler-swing/src/main/java/org/kordamp/ikonli/sampler/swing/Sampler.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@
2121
import org.kordamp.ikonli.IkonProvider;
2222
import org.kordamp.ikonli.swing.FontIcon;
2323

24-
import javax.swing.*;
25-
import java.awt.*;
24+
import javax.swing.JFrame;
25+
import javax.swing.JLabel;
26+
import javax.swing.JPanel;
27+
import javax.swing.JScrollPane;
28+
import javax.swing.JTabbedPane;
29+
import javax.swing.SwingUtilities;
30+
import javax.swing.WindowConstants;
31+
import java.awt.Dimension;
32+
import java.awt.GridLayout;
2633
import java.util.EnumSet;
2734
import java.util.Map;
2835
import java.util.ServiceLoader;

core/ikonli-core/src/main/java/org/kordamp/ikonli/AbstractIkonResolver.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
*/
1818
package org.kordamp.ikonli;
1919

20-
import static java.util.Objects.requireNonNull;
21-
2220
import java.util.Arrays;
2321
import java.util.ServiceLoader;
2422
import java.util.Set;
2523
import java.util.concurrent.CopyOnWriteArraySet;
2624
import java.util.logging.Logger;
2725

26+
import static java.util.Objects.requireNonNull;
27+
2828
/**
2929
* @author Andres Almiray
3030
*/
@@ -85,7 +85,7 @@ public static ServiceLoader<IkonHandler> resolveServiceLoader() {
8585
// Check if handlers must be loaded from a ModuleLayer
8686
if (null != IkonHandler.class.getModule().getLayer()) {
8787
ServiceLoader<IkonHandler> ikonHandlerServiceLoaders = ServiceLoader.load(
88-
IkonHandler.class.getModule().getLayer(),
88+
IkonHandler.class.getModule().getLayer(),
8989
IkonHandler.class
9090
);
9191
if (ikonHandlerServiceLoaders.findFirst().isPresent()) {
@@ -94,9 +94,9 @@ public static ServiceLoader<IkonHandler> resolveServiceLoader() {
9494
}
9595

9696
ServiceLoader<IkonHandler> handlers = ServiceLoader.load(
97-
IkonHandler.class,
98-
IkonHandler.class.getClassLoader()
99-
);
97+
IkonHandler.class,
98+
IkonHandler.class.getClassLoader()
99+
);
100100
// Return if the IkonHandler.class.classLoader works or if *nothing* else works
101101
return handlers.findFirst().isPresent() ? handlers : ServiceLoader.load(IkonHandler.class);
102102
}

core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikonli.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* @author Andres Almiray
2222
*/
2323
public enum Ikonli implements Ikon {
24-
NONE("ikn-none",'\ue600');
24+
NONE("ikn-none", '\ue600');
2525

2626
public static Ikonli findByDescription(String description) {
2727
for (Ikonli font : values()) {
@@ -32,8 +32,8 @@ public static Ikonli findByDescription(String description) {
3232
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
3333
}
3434

35-
private String description;
36-
private int code;
35+
private final String description;
36+
private final int code;
3737

3838
Ikonli(String description, int code) {
3939
this.description = description;

core/ikonli-core/src/main/java/org/kordamp/ikonli/OSGiIkonResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public class OSGiIkonResolver extends AbstractIkonResolver implements IkonResolv
2828

2929
public OSGiIkonResolver() {
3030
}
31-
31+
3232
@Reference
3333
protected void setFontLoader(FontLoader fontLoader) {
3434
this.fontLoader = fontLoader;
3535
}
36-
36+
3737
@Reference(
3838
cardinality = ReferenceCardinality.MULTIPLE,
3939
policyOption = ReferencePolicyOption.GREEDY,

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/JavaFXFontLoader.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
*/
1818
package org.kordamp.ikonli.javafx;
1919

20-
import java.util.Map;
21-
import java.util.concurrent.ConcurrentHashMap;
22-
20+
import javafx.scene.text.Font;
2321
import org.kordamp.ikonli.FontLoader;
2422
import org.kordamp.ikonli.IkonHandler;
2523
import org.osgi.service.component.annotations.Component;
2624

27-
import javafx.scene.text.Font;
25+
import java.util.Map;
26+
import java.util.concurrent.ConcurrentHashMap;
2827

2928
@Component(service = FontLoader.class)
3029
public class JavaFXFontLoader implements FontLoader {

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/StackedFontIcon.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class StackedFontIcon extends StackPane implements Icon {
5454
private StyleableObjectProperty<Paint> iconColor;
5555
private double[] iconSizes = new double[0];
5656

57-
private ChangeListener<Number> iconSizeChangeListener = (v, o, n) -> setIconSizeOnChildren(n.intValue());
58-
private ChangeListener<Paint> iconColorChangeListener = (v, o, n) -> setIconColorOnChildren(n);
57+
private final ChangeListener<Number> iconSizeChangeListener = (v, o, n) -> setIconSizeOnChildren(n.intValue());
58+
private final ChangeListener<Paint> iconColorChangeListener = (v, o, n) -> setIconColorOnChildren(n);
5959

6060
public static void setIconSize(Node icon, double size) {
6161
if (icon != null && size >= 0d && size <= 1.0d) {
@@ -74,7 +74,7 @@ public static double getIconSize(Node icon) {
7474
}
7575

7676
private class NodeSizeListener implements MapChangeListener<Object, Object> {
77-
private Node node;
77+
private final Node node;
7878

7979
private NodeSizeListener(Node node) {
8080
this.node = node;

core/ikonli-javafx/tmp/SVGIcon.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,15 @@ private void resolvePaint(String iconCode, String[] parts) {
286286
}
287287

288288
private static Paint resolvePaintValue(String iconCode, String value) {
289-
try { return Color.valueOf(value); } catch (IllegalArgumentException e1) {
290-
try { return LinearGradient.valueOf(value); } catch (IllegalArgumentException e2) {
291-
try { return RadialGradient.valueOf(value); } catch (IllegalArgumentException e3) {
289+
try {
290+
return Color.valueOf(value);
291+
} catch (IllegalArgumentException e1) {
292+
try {
293+
return LinearGradient.valueOf(value);
294+
} catch (IllegalArgumentException e2) {
295+
try {
296+
return RadialGradient.valueOf(value);
297+
} catch (IllegalArgumentException e3) {
292298
throw invalidDescription(iconCode, e3);
293299
}
294300
}

core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/FontIcon.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,14 @@
2121
import org.kordamp.ikonli.IkonHandler;
2222
import org.kordamp.ikonli.IkonResolverProvider;
2323

24-
import javax.swing.*;
25-
import java.awt.*;
24+
import javax.swing.Icon;
25+
import javax.swing.ImageIcon;
26+
import java.awt.Color;
27+
import java.awt.Component;
28+
import java.awt.Font;
29+
import java.awt.Graphics;
30+
import java.awt.Graphics2D;
31+
import java.awt.RenderingHints;
2632
import java.awt.image.BufferedImage;
2733

2834
import static java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment;

core/ikonli-swing/src/main/java/org/kordamp/ikonli/swing/SwingFontLoader.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
*/
1818
package org.kordamp.ikonli.swing;
1919

20+
import org.kordamp.ikonli.FontLoader;
21+
import org.kordamp.ikonli.IkonHandler;
22+
import org.osgi.service.component.annotations.Component;
23+
2024
import java.awt.Font;
2125
import java.awt.FontFormatException;
2226
import java.awt.GraphicsEnvironment;
@@ -25,10 +29,6 @@
2529
import java.util.Map;
2630
import java.util.concurrent.ConcurrentHashMap;
2731

28-
import org.kordamp.ikonli.FontLoader;
29-
import org.kordamp.ikonli.IkonHandler;
30-
import org.osgi.service.component.annotations.Component;
31-
3232
@Component(service = FontLoader.class)
3333
public class SwingFontLoader implements FontLoader {
3434
private static final Map<String, Font> FONTS = new ConcurrentHashMap<>();

icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogos.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public static BoxiconsLogos findByDescription(String description) {
159159
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
160160
}
161161

162-
private String description;
163-
private int code;
162+
private final String description;
163+
private final int code;
164164

165165
BoxiconsLogos(String description, int code) {
166166
this.description = description;

icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegular.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,8 @@ public static BoxiconsRegular findByDescription(String description) {
783783
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
784784
}
785785

786-
private String description;
787-
private int code;
786+
private final String description;
787+
private final int code;
788788

789789
BoxiconsRegular(String description, int code) {
790790
this.description = description;

icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolid.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,8 @@ public static BoxiconsSolid findByDescription(String description) {
657657
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
658658
}
659659

660-
private String description;
661-
private int code;
660+
private final String description;
661+
private final int code;
662662

663663
BoxiconsSolid(String description, int code) {
664664
this.description = description;

icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/Bpmn.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ public static Bpmn findByDescription(String description) {
140140
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
141141
}
142142

143-
private String description;
144-
private int code;
143+
private final String description;
144+
private final int code;
145145

146146
Bpmn(String description, int code) {
147147
this.description = description;

icon-packs/ikonli-bytedance-pack/src/main/java/module-info.java

+17-16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18+
1819
import org.kordamp.ikonli.bytedance.BytedanceIconsBoldALIkonHandler;
1920
import org.kordamp.ikonli.bytedance.BytedanceIconsBoldALIkonProvider;
2021
import org.kordamp.ikonli.bytedance.BytedanceIconsBoldMZIkonHandler;
@@ -56,22 +57,22 @@
5657
exports org.kordamp.ikonli.bytedance;
5758

5859
provides org.kordamp.ikonli.IkonHandler
59-
with BytedanceIconsThinALIkonHandler,
60-
BytedanceIconsThinMZIkonHandler,
61-
BytedanceIconsRegularALIkonHandler,
62-
BytedanceIconsRegularMZIkonHandler,
63-
BytedanceIconsBoldALIkonHandler,
64-
BytedanceIconsBoldMZIkonHandler,
65-
BytedanceIconsExtraBoldALIkonHandler,
66-
BytedanceIconsExtraBoldMZIkonHandler;
60+
with BytedanceIconsThinALIkonHandler,
61+
BytedanceIconsThinMZIkonHandler,
62+
BytedanceIconsRegularALIkonHandler,
63+
BytedanceIconsRegularMZIkonHandler,
64+
BytedanceIconsBoldALIkonHandler,
65+
BytedanceIconsBoldMZIkonHandler,
66+
BytedanceIconsExtraBoldALIkonHandler,
67+
BytedanceIconsExtraBoldMZIkonHandler;
6768
provides org.kordamp.ikonli.IkonProvider
68-
with BytedanceIconsThinALIkonProvider,
69-
BytedanceIconsThinMZIkonProvider,
70-
BytedanceIconsRegularALIkonProvider,
71-
BytedanceIconsRegularMZIkonProvider,
72-
BytedanceIconsBoldALIkonProvider,
73-
BytedanceIconsBoldMZIkonProvider,
74-
BytedanceIconsExtraBoldALIkonProvider,
75-
BytedanceIconsExtraBoldMZIkonProvider;
69+
with BytedanceIconsThinALIkonProvider,
70+
BytedanceIconsThinMZIkonProvider,
71+
BytedanceIconsRegularALIkonProvider,
72+
BytedanceIconsRegularMZIkonProvider,
73+
BytedanceIconsBoldALIkonProvider,
74+
BytedanceIconsBoldMZIkonProvider,
75+
BytedanceIconsExtraBoldALIkonProvider,
76+
BytedanceIconsExtraBoldMZIkonProvider;
7677

7778
}

icon-packs/ikonli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldAL.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1528,8 +1528,8 @@ public static BytedanceIconsBoldAL findByDescription(String description) {
15281528
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
15291529
}
15301530

1531-
private String description;
1532-
private int code;
1531+
private final String description;
1532+
private final int code;
15331533

15341534
BytedanceIconsBoldAL(String description, int code) {
15351535
this.description = description;

icon-packs/ikonli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsBoldMZ.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1196,8 +1196,8 @@ public static BytedanceIconsBoldMZ findByDescription(String description) {
11961196
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
11971197
}
11981198

1199-
private String description;
1200-
private int code;
1199+
private final String description;
1200+
private final int code;
12011201

12021202
BytedanceIconsBoldMZ(String description, int code) {
12031203
this.description = description;

icon-packs/ikonli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldAL.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.kordamp.ikonli.bytedance;
1919

2020
import org.kordamp.ikonli.Ikon;
21+
2122
/**
2223
* @author LeeWyatt
2324
*/
@@ -1527,8 +1528,8 @@ public static BytedanceIconsExtraBoldAL findByDescription(String description) {
15271528
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
15281529
}
15291530

1530-
private String description;
1531-
private int code;
1531+
private final String description;
1532+
private final int code;
15321533

15331534
BytedanceIconsExtraBoldAL(String description, int code) {
15341535
this.description = description;

icon-packs/ikonli-bytedance-pack/src/main/java/org/kordamp/ikonli/bytedance/BytedanceIconsExtraBoldMZ.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1196,8 +1196,8 @@ public static BytedanceIconsExtraBoldMZ findByDescription(String description) {
11961196
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
11971197
}
11981198

1199-
private String description;
1200-
private int code;
1199+
private final String description;
1200+
private final int code;
12011201

12021202
BytedanceIconsExtraBoldMZ(String description, int code) {
12031203
this.description = description;

0 commit comments

Comments
 (0)