From 64fc42eccdca37bc4efe83c0c69d1637ee900b1a Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Mon, 9 Nov 2020 14:10:36 +0100 Subject: [PATCH] IkonHandler impls should read their font resource instead --- .../main/java/org/kordamp/ikonli/javafx/IkonResolver.java | 5 ++--- docs/guide/src/docs/asciidoc/authoring.adoc | 3 ++- .../antdesignicons/AntDesignIconsFilledIkonHandler.java | 3 ++- .../antdesignicons/AntDesignIconsOutlinedIkonHandler.java | 3 ++- .../kordamp/ikonli/boxicons/BoxiconsLogosIkonHandler.java | 3 ++- .../kordamp/ikonli/boxicons/BoxiconsRegularIkonHandler.java | 3 ++- .../kordamp/ikonli/boxicons/BoxiconsSolidIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/bpmn/BpmnIkonHandler.java | 3 ++- .../kordamp/ikonli/captainicon/CaptainiconIkonHandler.java | 3 ++- .../kordamp/ikonli/carbonicons/CarboniconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/codicons/CodiconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/coreui/CoreUiBrandsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/coreui/CoreUiFreeIkonHandler.java | 3 ++- .../org/kordamp/ikonli/dashicons/DashiconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/devicons/DeviconsIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/elusive/ElusiveIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/entypo/EntypoIkonHandler.java | 3 ++- .../org/kordamp/ikonli/evaicons/EvaiconsIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/feather/FeatherIkonHandler.java | 3 ++- .../org/kordamp/ikonli/fileicons/FileIconsIkonHandler.java | 3 ++- .../kordamp/ikonli/fluentui/FluentUiFilledALIkonHandler.java | 3 ++- .../kordamp/ikonli/fluentui/FluentUiFilledMZIkonHandler.java | 3 ++- .../ikonli/fluentui/FluentUiRegularALIkonHandler.java | 3 ++- .../ikonli/fluentui/FluentUiRegularMZIkonHandler.java | 3 ++- .../kordamp/ikonli/fontawesome/FontAwesomeIkonHandler.java | 3 ++- .../ikonli/fontawesome5/FontAwesomeBrandsIkonHandler.java | 3 ++- .../ikonli/fontawesome5/FontAwesomeRegularIkonHandler.java | 3 ++- .../ikonli/fontawesome5/FontAwesomeSolidIkonHandler.java | 3 ++- .../org/kordamp/ikonli/fontelico/FontelicoIkonHandler.java | 3 ++- .../org/kordamp/ikonli/foundation/FoundationIkonHandler.java | 3 ++- .../org/kordamp/ikonli/hawcons/HawconsFilledIkonHandler.java | 3 ++- .../org/kordamp/ikonli/hawcons/HawconsStrokeIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/icomoon/IcomoonIkonHandler.java | 3 ++- .../org/kordamp/ikonli/ionicons/IoniconsIkonHandler.java | 3 ++- .../kordamp/ikonli/ionicons4/Ionicons4IOSIkonHandler.java | 3 ++- .../kordamp/ikonli/ionicons4/Ionicons4LogoIkonHandler.java | 3 ++- .../ikonli/ionicons4/Ionicons4MaterialIkonHandler.java | 3 ++- .../src/main/java/org/kordamp/ikonli/jam/JamIkonHandler.java | 3 ++- .../ikonli/ligaturesymbols/LigatureSymbolsIkonHandler.java | 3 ++- .../ikonli/lineawesome/LineAwesomeBrandsIkonHandler.java | 3 ++- .../ikonli/lineawesome/LineAwesomeRegularIkonHandler.java | 3 ++- .../ikonli/lineawesome/LineAwesomeSolidIkonHandler.java | 3 ++- .../org/kordamp/ikonli/linecons/LineconsIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/maki2/Maki2IkonHandler.java | 3 ++- .../org/kordamp/ikonli/mapicons/MapiconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/material/MaterialIkonHandler.java | 3 ++- .../org/kordamp/ikonli/material2/Material2ALIkonHandler.java | 3 ++- .../org/kordamp/ikonli/material2/Material2MZIkonHandler.java | 3 ++- .../ikonli/material2/Material2OutlinedALIkonHandler.java | 3 ++- .../ikonli/material2/Material2OutlinedMZIkonHandler.java | 3 ++- .../ikonli/material2/Material2RoundALIkonHandler.java | 3 ++- .../ikonli/material2/Material2RoundMZIkonHandler.java | 3 ++- .../ikonli/material2/Material2SharpALIkonHandler.java | 3 ++- .../ikonli/material2/Material2SharpMZIkonHandler.java | 3 ++- .../ikonli/materialdesign/MaterialDesignIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignAIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignBIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignCIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignDIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignEIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignFIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignGIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignHIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignIIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignJIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignKIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignLIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignMIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignNIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignOIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignPIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignQIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignRIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignSIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignTIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignUIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignVIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignWIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignXIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignYIkonHandler.java | 3 ++- .../ikonli/materialdesign2/MaterialDesignZIkonHandler.java | 3 ++- .../org/kordamp/ikonli/medicons/MediconsIkonHandler.java | 3 ++- .../kordamp/ikonli/metrizeicons/MetrizeIconsIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/microns/MicronsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/ociicons/OciiconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/octicons/OcticonsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/openiconic/OpeniconicIkonHandler.java | 3 ++- .../kordamp/ikonli/paymentfont/PaymentFontIkonHandler.java | 3 ++- .../ikonli/prestashopicons/PrestaShopIconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/remixicon/RemixiconALIkonHandler.java | 3 ++- .../org/kordamp/ikonli/remixicon/RemixiconMZIkonHandler.java | 3 ++- .../ikonli/runestroicons/RunestroiconsIkonHandler.java | 3 ++- .../kordamp/ikonli/simpleicons/SimpleIconsIkonHandler.java | 3 ++- .../ikonli/simplelineicons/SimpleLineIconsIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/subway/SubwayIkonHandler.java | 3 ++- .../java/org/kordamp/ikonli/themify/ThemifyIkonHandler.java | 3 ++- .../org/kordamp/ikonli/typicons/TypiconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/unicons/UniconsLineIkonHandler.java | 3 ++- .../kordamp/ikonli/unicons/UniconsMonochromeIkonHandler.java | 3 ++- .../org/kordamp/ikonli/unicons/UniconsSolidIkonHandler.java | 3 ++- .../kordamp/ikonli/weathericons/WeatherIconsIkonHandler.java | 3 ++- .../org/kordamp/ikonli/websymbols/WebsymbolsIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/whhg/WhhgALIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/whhg/WhhgMZIkonHandler.java | 3 ++- .../main/java/org/kordamp/ikonli/win10/Win10IkonHandler.java | 3 ++- .../org/kordamp/ikonli/zondicons/ZondiconsIkonHandler.java | 3 ++- 107 files changed, 214 insertions(+), 109 deletions(-) diff --git a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java index 63c552be0..e7ac85d91 100644 --- a/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java +++ b/core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/IkonResolver.java @@ -32,11 +32,10 @@ public class IkonResolver extends AbstractIkonResolver { static { INSTANCE = new IkonResolver(); - ClassLoader classLoader = IkonResolver.class.getClassLoader(); - ServiceLoader loader = ServiceLoader.load(IkonHandler.class, classLoader); + ServiceLoader loader = ServiceLoader.load(IkonHandler.class.getModule().getLayer(), IkonHandler.class); for (IkonHandler handler : loader) { HANDLERS.add(handler); - handler.setFont(Font.loadFont(classLoader.getResource(handler.getFontResourcePath()).toExternalForm(), 16)); + handler.setFont(Font.loadFont(handler.getFontResourcePath(), 16)); } } diff --git a/docs/guide/src/docs/asciidoc/authoring.adoc b/docs/guide/src/docs/asciidoc/authoring.adoc index f9a82172f..5ad46d423 100644 --- a/docs/guide/src/docs/asciidoc/authoring.adoc +++ b/docs/guide/src/docs/asciidoc/authoring.adoc @@ -76,7 +76,8 @@ public class MyIconIkonHandler extends AbstractIkonHandler { @Override public String getFontResourcePath() { - return "META-INF/resources/myicon/1.2.3/fonts/myicon.ttf"; // <3> + return getClass().getResource("/META-INF/resources/myicon/1.2.3/fonts/myicon.ttf") + .toExternalFrom(); // <3> } @Override diff --git a/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsFilledIkonHandler.java b/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsFilledIkonHandler.java index 182082695..27932a83b 100644 --- a/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsFilledIkonHandler.java +++ b/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsFilledIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/antdesignicons/4.0.0/fonts/AntDesign-Icons-Filled.ttf"; + return getClass().getResource("/META-INF/resources/antdesignicons/4.0.0/fonts/AntDesign-Icons-Filled.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsOutlinedIkonHandler.java b/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsOutlinedIkonHandler.java index a19bf5ff0..e88d9b4c7 100644 --- a/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsOutlinedIkonHandler.java +++ b/icon-packs/ikonli-antdesignicons-pack/src/main/java/org/kordamp/ikonli/antdesignicons/AntDesignIconsOutlinedIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/antdesignicons/4.0.0/fonts/AntDesign-Icons-Outlined.ttf"; + return getClass().getResource("/META-INF/resources/antdesignicons/4.0.0/fonts/AntDesign-Icons-Outlined.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogosIkonHandler.java b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogosIkonHandler.java index 137097f71..34c3c1f54 100644 --- a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogosIkonHandler.java +++ b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsLogosIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf"; + return getClass().getResource("/META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegularIkonHandler.java b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegularIkonHandler.java index d30bbbb01..5f2a21a17 100644 --- a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegularIkonHandler.java +++ b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsRegularIkonHandler.java @@ -34,7 +34,8 @@ public org.kordamp.ikonli.Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf"; + return getClass().getResource("/META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolidIkonHandler.java b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolidIkonHandler.java index 9b9c9d452..cedbed3e0 100644 --- a/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolidIkonHandler.java +++ b/icon-packs/ikonli-boxicons-pack/src/main/java/org/kordamp/ikonli/boxicons/BoxiconsSolidIkonHandler.java @@ -34,7 +34,8 @@ public org.kordamp.ikonli.Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf"; + return getClass().getResource("/META-INF/resources/boxicons/2.0.7/fonts/boxicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/BpmnIkonHandler.java b/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/BpmnIkonHandler.java index a46b16bf1..65850735a 100644 --- a/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/BpmnIkonHandler.java +++ b/icon-packs/ikonli-bpmn-pack/src/main/java/org/kordamp/ikonli/bpmn/BpmnIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/bpmn/0.10.0/fonts/bpmn.ttf"; + return getClass().getResource("/META-INF/resources/bpmn/0.10.0/fonts/bpmn.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-captainicon-pack/src/main/java/org/kordamp/ikonli/captainicon/CaptainiconIkonHandler.java b/icon-packs/ikonli-captainicon-pack/src/main/java/org/kordamp/ikonli/captainicon/CaptainiconIkonHandler.java index aa49a73d2..d01317e2b 100644 --- a/icon-packs/ikonli-captainicon-pack/src/main/java/org/kordamp/ikonli/captainicon/CaptainiconIkonHandler.java +++ b/icon-packs/ikonli-captainicon-pack/src/main/java/org/kordamp/ikonli/captainicon/CaptainiconIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/captainicon/20140501/fonts/captainicon.ttf"; + return getClass().getResource("/META-INF/resources/captainicon/20140501/fonts/captainicon.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-carbonicons-pack/src/main/java/org/kordamp/ikonli/carbonicons/CarboniconsIkonHandler.java b/icon-packs/ikonli-carbonicons-pack/src/main/java/org/kordamp/ikonli/carbonicons/CarboniconsIkonHandler.java index adbc42de1..e88b32a7a 100644 --- a/icon-packs/ikonli-carbonicons-pack/src/main/java/org/kordamp/ikonli/carbonicons/CarboniconsIkonHandler.java +++ b/icon-packs/ikonli-carbonicons-pack/src/main/java/org/kordamp/ikonli/carbonicons/CarboniconsIkonHandler.java @@ -34,7 +34,8 @@ public org.kordamp.ikonli.Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/carbonicons/10.23.2/fonts/Carbon-Icons.ttf"; + return getClass().getResource("/META-INF/resources/carbonicons/10.23.2/fonts/Carbon-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-codicons-pack/src/main/java/org/kordamp/ikonli/codicons/CodiconsIkonHandler.java b/icon-packs/ikonli-codicons-pack/src/main/java/org/kordamp/ikonli/codicons/CodiconsIkonHandler.java index c28964cb4..254346441 100644 --- a/icon-packs/ikonli-codicons-pack/src/main/java/org/kordamp/ikonli/codicons/CodiconsIkonHandler.java +++ b/icon-packs/ikonli-codicons-pack/src/main/java/org/kordamp/ikonli/codicons/CodiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/codicons/0.0.12/fonts/codicon.ttf"; + return getClass().getResource("/META-INF/resources/codicons/0.0.12/fonts/codicon.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiBrandsIkonHandler.java b/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiBrandsIkonHandler.java index e84154b46..5f2a95974 100644 --- a/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiBrandsIkonHandler.java +++ b/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiBrandsIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/coreui/2.0.0-beta.5/fonts/CoreUI-Icons-Brand.ttf"; + return getClass().getResource("/META-INF/resources/coreui/2.0.0-beta.5/fonts/CoreUI-Icons-Brand.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiFreeIkonHandler.java b/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiFreeIkonHandler.java index ad2a047b9..66050afaf 100644 --- a/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiFreeIkonHandler.java +++ b/icon-packs/ikonli-coreui-pack/src/main/java/org/kordamp/ikonli/coreui/CoreUiFreeIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/coreui/2.0.0-beta.5/fonts/CoreUI-Icons-Free.ttf"; + return getClass().getResource("/META-INF/resources/coreui/2.0.0-beta.5/fonts/CoreUI-Icons-Free.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-dashicons-pack/src/main/java/org/kordamp/ikonli/dashicons/DashiconsIkonHandler.java b/icon-packs/ikonli-dashicons-pack/src/main/java/org/kordamp/ikonli/dashicons/DashiconsIkonHandler.java index 28550f417..645fbb967 100644 --- a/icon-packs/ikonli-dashicons-pack/src/main/java/org/kordamp/ikonli/dashicons/DashiconsIkonHandler.java +++ b/icon-packs/ikonli-dashicons-pack/src/main/java/org/kordamp/ikonli/dashicons/DashiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/dashicons/20200504/fonts/dashicons.ttf"; + return getClass().getResource("/META-INF/resources/dashicons/20200504/fonts/dashicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-devicons-pack/src/main/java/org/kordamp/ikonli/devicons/DeviconsIkonHandler.java b/icon-packs/ikonli-devicons-pack/src/main/java/org/kordamp/ikonli/devicons/DeviconsIkonHandler.java index 977e49fbf..460e9c3fa 100644 --- a/icon-packs/ikonli-devicons-pack/src/main/java/org/kordamp/ikonli/devicons/DeviconsIkonHandler.java +++ b/icon-packs/ikonli-devicons-pack/src/main/java/org/kordamp/ikonli/devicons/DeviconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/devicons/1.8.0/fonts/devicons.ttf"; + return getClass().getResource("/META-INF/resources/devicons/1.8.0/fonts/devicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-elusive-pack/src/main/java/org/kordamp/ikonli/elusive/ElusiveIkonHandler.java b/icon-packs/ikonli-elusive-pack/src/main/java/org/kordamp/ikonli/elusive/ElusiveIkonHandler.java index 59e29b53f..c8c73e7d8 100644 --- a/icon-packs/ikonli-elusive-pack/src/main/java/org/kordamp/ikonli/elusive/ElusiveIkonHandler.java +++ b/icon-packs/ikonli-elusive-pack/src/main/java/org/kordamp/ikonli/elusive/ElusiveIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/elusive/2.0/fonts/Elusive-Icons.ttf"; + return getClass().getResource("/META-INF/resources/elusive/2.0/fonts/Elusive-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-entypo-pack/src/main/java/org/kordamp/ikonli/entypo/EntypoIkonHandler.java b/icon-packs/ikonli-entypo-pack/src/main/java/org/kordamp/ikonli/entypo/EntypoIkonHandler.java index 29bab5100..8bf49d312 100644 --- a/icon-packs/ikonli-entypo-pack/src/main/java/org/kordamp/ikonli/entypo/EntypoIkonHandler.java +++ b/icon-packs/ikonli-entypo-pack/src/main/java/org/kordamp/ikonli/entypo/EntypoIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/entypo/1.0/fonts/Entypo.ttf"; + return getClass().getResource("/META-INF/resources/entypo/1.0/fonts/Entypo.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-evaicons-pack/src/main/java/org/kordamp/ikonli/evaicons/EvaiconsIkonHandler.java b/icon-packs/ikonli-evaicons-pack/src/main/java/org/kordamp/ikonli/evaicons/EvaiconsIkonHandler.java index 744324365..3e649f39b 100644 --- a/icon-packs/ikonli-evaicons-pack/src/main/java/org/kordamp/ikonli/evaicons/EvaiconsIkonHandler.java +++ b/icon-packs/ikonli-evaicons-pack/src/main/java/org/kordamp/ikonli/evaicons/EvaiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/evaicons/1.1.3/fonts/Evaicons.ttf"; + return getClass().getResource("/META-INF/resources/evaicons/1.1.3/fonts/Evaicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-feather-pack/src/main/java/org/kordamp/ikonli/feather/FeatherIkonHandler.java b/icon-packs/ikonli-feather-pack/src/main/java/org/kordamp/ikonli/feather/FeatherIkonHandler.java index c9ce7c232..8c8b0c58e 100644 --- a/icon-packs/ikonli-feather-pack/src/main/java/org/kordamp/ikonli/feather/FeatherIkonHandler.java +++ b/icon-packs/ikonli-feather-pack/src/main/java/org/kordamp/ikonli/feather/FeatherIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/feather/4.28/fonts/feather.ttf"; + return getClass().getResource("/META-INF/resources/feather/4.28/fonts/feather.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fileicons-pack/src/main/java/org/kordamp/ikonli/fileicons/FileIconsIkonHandler.java b/icon-packs/ikonli-fileicons-pack/src/main/java/org/kordamp/ikonli/fileicons/FileIconsIkonHandler.java index 9b7271088..27f89a466 100644 --- a/icon-packs/ikonli-fileicons-pack/src/main/java/org/kordamp/ikonli/fileicons/FileIconsIkonHandler.java +++ b/icon-packs/ikonli-fileicons-pack/src/main/java/org/kordamp/ikonli/fileicons/FileIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fileicons/2.1.44/fonts/File-Icons.ttf"; + return getClass().getResource("/META-INF/resources/fileicons/2.1.44/fonts/File-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledALIkonHandler.java b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledALIkonHandler.java index c2cfd0821..f20b23b93 100644 --- a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledALIkonHandler.java +++ b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Filled.ttf"; + return getClass().getResource("/META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Filled.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledMZIkonHandler.java b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledMZIkonHandler.java index 956d1b09f..f8b37f4b2 100644 --- a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledMZIkonHandler.java +++ b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiFilledMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Filled.ttf"; + return getClass().getResource("/META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Filled.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularALIkonHandler.java b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularALIkonHandler.java index 0da3124ac..e52b42547 100644 --- a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularALIkonHandler.java +++ b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Regular.ttf"; + return getClass().getResource("/META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Regular.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularMZIkonHandler.java b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularMZIkonHandler.java index 7ef0415a3..e453aba51 100644 --- a/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularMZIkonHandler.java +++ b/icon-packs/ikonli-fluentui-pack/src/main/java/org/kordamp/ikonli/fluentui/FluentUiRegularMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Regular.ttf"; + return getClass().getResource("/META-INF/resources/fluentui/1.1.74/fonts/FluentSystemIcons-Regular.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fontawesome-pack/src/main/java/org/kordamp/ikonli/fontawesome/FontAwesomeIkonHandler.java b/icon-packs/ikonli-fontawesome-pack/src/main/java/org/kordamp/ikonli/fontawesome/FontAwesomeIkonHandler.java index 5911edc50..d4213b974 100644 --- a/icon-packs/ikonli-fontawesome-pack/src/main/java/org/kordamp/ikonli/fontawesome/FontAwesomeIkonHandler.java +++ b/icon-packs/ikonli-fontawesome-pack/src/main/java/org/kordamp/ikonli/fontawesome/FontAwesomeIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fontawesome/4.7.0/fonts/fontawesome-webfont.ttf"; + return getClass().getResource("/META-INF/resources/fontawesome/4.7.0/fonts/fontawesome-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeBrandsIkonHandler.java b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeBrandsIkonHandler.java index 49e967beb..13da0bfb6 100644 --- a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeBrandsIkonHandler.java +++ b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeBrandsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fontawesome5/5.15.1/fonts/fa-brands-400.ttf"; + return getClass().getResource("/META-INF/resources/fontawesome5/5.15.1/fonts/fa-brands-400.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeRegularIkonHandler.java b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeRegularIkonHandler.java index 625175dee..57ca992db 100644 --- a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeRegularIkonHandler.java +++ b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeRegularIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fontawesome5/5.15.1/fonts/fa-regular-400.ttf"; + return getClass().getResource("/META-INF/resources/fontawesome5/5.15.1/fonts/fa-regular-400.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeSolidIkonHandler.java b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeSolidIkonHandler.java index 73b04c52e..2551e00c2 100644 --- a/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeSolidIkonHandler.java +++ b/icon-packs/ikonli-fontawesome5-pack/src/main/java/org/kordamp/ikonli/fontawesome5/FontAwesomeSolidIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fontawesome5/5.15.1/fonts/fa-solid-900.ttf"; + return getClass().getResource("/META-INF/resources/fontawesome5/5.15.1/fonts/fa-solid-900.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-fontelico-pack/src/main/java/org/kordamp/ikonli/fontelico/FontelicoIkonHandler.java b/icon-packs/ikonli-fontelico-pack/src/main/java/org/kordamp/ikonli/fontelico/FontelicoIkonHandler.java index fe7b1d7bb..0263aa5aa 100644 --- a/icon-packs/ikonli-fontelico-pack/src/main/java/org/kordamp/ikonli/fontelico/FontelicoIkonHandler.java +++ b/icon-packs/ikonli-fontelico-pack/src/main/java/org/kordamp/ikonli/fontelico/FontelicoIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/fontelico/0.0/fonts/fontelico.ttf"; + return getClass().getResource("/META-INF/resources/fontelico/0.0/fonts/fontelico.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-foundation-pack/src/main/java/org/kordamp/ikonli/foundation/FoundationIkonHandler.java b/icon-packs/ikonli-foundation-pack/src/main/java/org/kordamp/ikonli/foundation/FoundationIkonHandler.java index c973d8cf3..21b72f646 100644 --- a/icon-packs/ikonli-foundation-pack/src/main/java/org/kordamp/ikonli/foundation/FoundationIkonHandler.java +++ b/icon-packs/ikonli-foundation-pack/src/main/java/org/kordamp/ikonli/foundation/FoundationIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/foundation/3.0/fonts/foundation-icons.ttf"; + return getClass().getResource("/META-INF/resources/foundation/3.0/fonts/foundation-icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsFilledIkonHandler.java b/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsFilledIkonHandler.java index 4d897eeba..0a1cb2f4f 100644 --- a/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsFilledIkonHandler.java +++ b/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsFilledIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/hawcons/20140708/fonts/hawconsfilled.ttf"; + return getClass().getResource("/META-INF/resources/hawcons/20140708/fonts/hawconsfilled.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsStrokeIkonHandler.java b/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsStrokeIkonHandler.java index b28e12bd6..5150e7798 100644 --- a/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsStrokeIkonHandler.java +++ b/icon-packs/ikonli-hawcons-pack/src/main/java/org/kordamp/ikonli/hawcons/HawconsStrokeIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/hawcons/20140708/fonts/hawconsstroke.ttf"; + return getClass().getResource("/META-INF/resources/hawcons/20140708/fonts/hawconsstroke.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-icomoon-pack/src/main/java/org/kordamp/ikonli/icomoon/IcomoonIkonHandler.java b/icon-packs/ikonli-icomoon-pack/src/main/java/org/kordamp/ikonli/icomoon/IcomoonIkonHandler.java index 89a734b71..b746dd07d 100644 --- a/icon-packs/ikonli-icomoon-pack/src/main/java/org/kordamp/ikonli/icomoon/IcomoonIkonHandler.java +++ b/icon-packs/ikonli-icomoon-pack/src/main/java/org/kordamp/ikonli/icomoon/IcomoonIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/icomoon/0.0/fonts/icomoon.ttf"; + return getClass().getResource("/META-INF/resources/icomoon/0.0/fonts/icomoon.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ionicons-pack/src/main/java/org/kordamp/ikonli/ionicons/IoniconsIkonHandler.java b/icon-packs/ikonli-ionicons-pack/src/main/java/org/kordamp/ikonli/ionicons/IoniconsIkonHandler.java index 01d8e2461..26a60f7a9 100644 --- a/icon-packs/ikonli-ionicons-pack/src/main/java/org/kordamp/ikonli/ionicons/IoniconsIkonHandler.java +++ b/icon-packs/ikonli-ionicons-pack/src/main/java/org/kordamp/ikonli/ionicons/IoniconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ionicons/2.0.1/fonts/ionicons.ttf"; + return getClass().getResource("/META-INF/resources/ionicons/2.0.1/fonts/ionicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4IOSIkonHandler.java b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4IOSIkonHandler.java index 986a04837..3f8db5cb4 100644 --- a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4IOSIkonHandler.java +++ b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4IOSIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf"; + return getClass().getResource("/META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4LogoIkonHandler.java b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4LogoIkonHandler.java index 7b3af9748..2868e9045 100644 --- a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4LogoIkonHandler.java +++ b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4LogoIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf"; + return getClass().getResource("/META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4MaterialIkonHandler.java b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4MaterialIkonHandler.java index bfbdad06c..390fdcce4 100644 --- a/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4MaterialIkonHandler.java +++ b/icon-packs/ikonli-ionicons4-pack/src/main/java/org/kordamp/ikonli/ionicons4/Ionicons4MaterialIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf"; + return getClass().getResource("/META-INF/resources/ionicons4/4.1.2/fonts/ionicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-jamicons-pack/src/main/java/org/kordamp/ikonli/jam/JamIkonHandler.java b/icon-packs/ikonli-jamicons-pack/src/main/java/org/kordamp/ikonli/jam/JamIkonHandler.java index dcd4979a6..9108d64ae 100644 --- a/icon-packs/ikonli-jamicons-pack/src/main/java/org/kordamp/ikonli/jam/JamIkonHandler.java +++ b/icon-packs/ikonli-jamicons-pack/src/main/java/org/kordamp/ikonli/jam/JamIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/jam/3.0.0/fonts/Jam-Icons.ttf"; + return getClass().getResource("/META-INF/resources/jam/3.0.0/fonts/Jam-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ligaturesymbols-pack/src/main/java/org/kordamp/ikonli/ligaturesymbols/LigatureSymbolsIkonHandler.java b/icon-packs/ikonli-ligaturesymbols-pack/src/main/java/org/kordamp/ikonli/ligaturesymbols/LigatureSymbolsIkonHandler.java index 0a28929d9..cb69feb28 100644 --- a/icon-packs/ikonli-ligaturesymbols-pack/src/main/java/org/kordamp/ikonli/ligaturesymbols/LigatureSymbolsIkonHandler.java +++ b/icon-packs/ikonli-ligaturesymbols-pack/src/main/java/org/kordamp/ikonli/ligaturesymbols/LigatureSymbolsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ligaturesymbols/2.11/fonts/LigatureSymbols-2.11.ttf"; + return getClass().getResource("/META-INF/resources/ligaturesymbols/2.11/fonts/LigatureSymbols-2.11.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeBrandsIkonHandler.java b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeBrandsIkonHandler.java index dfabd9d24..f41eb67e1 100644 --- a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeBrandsIkonHandler.java +++ b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeBrandsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/lineawesome/1.3.0/fonts/la-brands-400.ttf"; + return getClass().getResource("/META-INF/resources/lineawesome/1.3.0/fonts/la-brands-400.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeRegularIkonHandler.java b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeRegularIkonHandler.java index 240af1521..c3eac5f2b 100644 --- a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeRegularIkonHandler.java +++ b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeRegularIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/lineawesome/1.3.0/fonts/la-regular-400.ttf"; + return getClass().getResource("/META-INF/resources/lineawesome/1.3.0/fonts/la-regular-400.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeSolidIkonHandler.java b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeSolidIkonHandler.java index 327d2e787..5dc6b1d7d 100644 --- a/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeSolidIkonHandler.java +++ b/icon-packs/ikonli-lineawesome-pack/src/main/java/org/kordamp/ikonli/lineawesome/LineAwesomeSolidIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/lineawesome/1.3.0/fonts/la-solid-900.ttf"; + return getClass().getResource("/META-INF/resources/lineawesome/1.3.0/fonts/la-solid-900.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-linecons-pack/src/main/java/org/kordamp/ikonli/linecons/LineconsIkonHandler.java b/icon-packs/ikonli-linecons-pack/src/main/java/org/kordamp/ikonli/linecons/LineconsIkonHandler.java index dfa50557e..190ad7a54 100644 --- a/icon-packs/ikonli-linecons-pack/src/main/java/org/kordamp/ikonli/linecons/LineconsIkonHandler.java +++ b/icon-packs/ikonli-linecons-pack/src/main/java/org/kordamp/ikonli/linecons/LineconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/linecons/0.0/fonts/linecons.ttf"; + return getClass().getResource("/META-INF/resources/linecons/0.0/fonts/linecons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-maki-pack/src/main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java b/icon-packs/ikonli-maki-pack/src/main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java index f8faaa4f4..19b2251a0 100644 --- a/icon-packs/ikonli-maki-pack/src/main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java +++ b/icon-packs/ikonli-maki-pack/src/main/java/org/kordamp/ikonli/maki/MakiIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/maki/0.5.0/fonts/maki.ttf"; + return getClass().getResource("/META-INF/resources/maki/0.5.0/fonts/maki.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-maki2-pack/src/main/java/org/kordamp/ikonli/maki2/Maki2IkonHandler.java b/icon-packs/ikonli-maki2-pack/src/main/java/org/kordamp/ikonli/maki2/Maki2IkonHandler.java index c2ede939b..7407f1360 100644 --- a/icon-packs/ikonli-maki2-pack/src/main/java/org/kordamp/ikonli/maki2/Maki2IkonHandler.java +++ b/icon-packs/ikonli-maki2-pack/src/main/java/org/kordamp/ikonli/maki2/Maki2IkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/maki2/6.2.0/fonts/maki2.ttf"; + return getClass().getResource("/META-INF/resources/maki2/6.2.0/fonts/maki2.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-mapicons-pack/src/main/java/org/kordamp/ikonli/mapicons/MapiconsIkonHandler.java b/icon-packs/ikonli-mapicons-pack/src/main/java/org/kordamp/ikonli/mapicons/MapiconsIkonHandler.java index e92ec353f..82e90f6fb 100644 --- a/icon-packs/ikonli-mapicons-pack/src/main/java/org/kordamp/ikonli/mapicons/MapiconsIkonHandler.java +++ b/icon-packs/ikonli-mapicons-pack/src/main/java/org/kordamp/ikonli/mapicons/MapiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/mapicons/3.0.0/fonts/map-icons.ttf"; + return getClass().getResource("/META-INF/resources/mapicons/3.0.0/fonts/map-icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material-pack/src/main/java/org/kordamp/ikonli/material/MaterialIkonHandler.java b/icon-packs/ikonli-material-pack/src/main/java/org/kordamp/ikonli/material/MaterialIkonHandler.java index 72d94542c..aa6b1a3c3 100644 --- a/icon-packs/ikonli-material-pack/src/main/java/org/kordamp/ikonli/material/MaterialIkonHandler.java +++ b/icon-packs/ikonli-material-pack/src/main/java/org/kordamp/ikonli/material/MaterialIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material/50/fonts/MaterialIcons-Regular.ttf"; + return getClass().getResource("/META-INF/resources/material/50/fonts/MaterialIcons-Regular.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2ALIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2ALIkonHandler.java index 676dd50ac..0faf34de6 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2ALIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2ALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2MZIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2MZIkonHandler.java index 4539bffb0..bf8da4f9f 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2MZIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2MZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedALIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedALIkonHandler.java index bd86c3b68..8e5fe6e40 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedALIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Outlined.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Outlined.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedMZIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedMZIkonHandler.java index ef8540659..3c106903d 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedMZIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2OutlinedMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Outlined.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Outlined.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundALIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundALIkonHandler.java index 44019b373..f71784cc0 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundALIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Round.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Round.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundMZIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundMZIkonHandler.java index 29bcf9006..2183de5b3 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundMZIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2RoundMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Round.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Round.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpALIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpALIkonHandler.java index 1a78afcc0..2d5469e68 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpALIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Sharp.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Sharp.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpMZIkonHandler.java b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpMZIkonHandler.java index 4e247063b..fe9394103 100644 --- a/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpMZIkonHandler.java +++ b/icon-packs/ikonli-material2-pack/src/main/java/org/kordamp/ikonli/material2/Material2SharpMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/material2/20200820/fonts/MaterialIcons-Sharp.ttf"; + return getClass().getResource("/META-INF/resources/material2/20200820/fonts/MaterialIcons-Sharp.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign-pack/src/main/java/org/kordamp/ikonli/materialdesign/MaterialDesignIkonHandler.java b/icon-packs/ikonli-materialdesign-pack/src/main/java/org/kordamp/ikonli/materialdesign/MaterialDesignIkonHandler.java index db349dae6..0e3eb7b34 100644 --- a/icon-packs/ikonli-materialdesign-pack/src/main/java/org/kordamp/ikonli/materialdesign/MaterialDesignIkonHandler.java +++ b/icon-packs/ikonli-materialdesign-pack/src/main/java/org/kordamp/ikonli/materialdesign/MaterialDesignIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons/1.7.22/fonts/MaterialDesignIcons.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons/1.7.22/fonts/MaterialDesignIcons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignAIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignAIkonHandler.java index 0950efabe..f91c8cd3d 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignAIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignAIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignBIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignBIkonHandler.java index 69a57252f..98ad04415 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignBIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignBIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignCIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignCIkonHandler.java index 7a608d4f4..8d1e01cc0 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignCIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignCIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignDIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignDIkonHandler.java index c1ddafa62..f49d2ab9f 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignDIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignDIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignEIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignEIkonHandler.java index 656137926..36b05d559 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignEIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignEIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignFIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignFIkonHandler.java index 90287c6c0..0bf5bf602 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignFIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignFIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignGIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignGIkonHandler.java index 5c80d3b2d..f449a6361 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignGIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignGIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignHIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignHIkonHandler.java index 2292f82a7..56de318d4 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignHIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignHIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignIIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignIIkonHandler.java index ee082146e..88da77c62 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignIIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignIIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignJIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignJIkonHandler.java index 1411126a4..888128a45 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignJIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignJIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignKIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignKIkonHandler.java index 8ba782aaa..b8d109109 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignKIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignKIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignLIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignLIkonHandler.java index 0397114b5..f218277a3 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignLIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignLIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignMIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignMIkonHandler.java index ab6986428..fcaa04d4f 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignMIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignMIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignNIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignNIkonHandler.java index 600cb9307..179303f61 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignNIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignNIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignOIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignOIkonHandler.java index 91da2d556..71ae6b21b 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignOIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignOIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignPIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignPIkonHandler.java index 2e099f8f3..bb3830e44 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignPIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignPIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignQIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignQIkonHandler.java index 4d9d89f0a..41293fbed 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignQIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignQIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignRIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignRIkonHandler.java index b00765042..7a8919721 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignRIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignRIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignSIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignSIkonHandler.java index 90c9f2812..9c559bee6 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignSIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignSIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignTIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignTIkonHandler.java index 6cd57ef0f..118153c35 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignTIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignTIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignUIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignUIkonHandler.java index 3a94fb120..744d3bbbf 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignUIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignUIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignVIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignVIkonHandler.java index c35e76de4..c862b9f72 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignVIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignVIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignWIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignWIkonHandler.java index c4c0d8015..be4d1b1e2 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignWIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignWIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignXIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignXIkonHandler.java index e2d594c0f..d75c7a9ed 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignXIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignXIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignYIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignYIkonHandler.java index 31dd0bf80..15c3ff4fb 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignYIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignYIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignZIkonHandler.java b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignZIkonHandler.java index 1973227fa..83962bf41 100644 --- a/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignZIkonHandler.java +++ b/icon-packs/ikonli-materialdesign2-pack/src/main/java/org/kordamp/ikonli/materialdesign2/MaterialDesignZIkonHandler.java @@ -40,7 +40,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf"; + return getClass().getResource("/META-INF/resources/materialdesignicons2/5.8.55/fonts/materialdesignicons-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-medicons-pack/src/main/java/org/kordamp/ikonli/medicons/MediconsIkonHandler.java b/icon-packs/ikonli-medicons-pack/src/main/java/org/kordamp/ikonli/medicons/MediconsIkonHandler.java index 27101aee3..9bcb56d12 100644 --- a/icon-packs/ikonli-medicons-pack/src/main/java/org/kordamp/ikonli/medicons/MediconsIkonHandler.java +++ b/icon-packs/ikonli-medicons-pack/src/main/java/org/kordamp/ikonli/medicons/MediconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/medicons/20170612/fonts/webfont-medical-icons.ttf"; + return getClass().getResource("/META-INF/resources/medicons/20170612/fonts/webfont-medical-icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-metrizeicons-pack/src/main/java/org/kordamp/ikonli/metrizeicons/MetrizeIconsIkonHandler.java b/icon-packs/ikonli-metrizeicons-pack/src/main/java/org/kordamp/ikonli/metrizeicons/MetrizeIconsIkonHandler.java index f0680fa21..5fabd2754 100644 --- a/icon-packs/ikonli-metrizeicons-pack/src/main/java/org/kordamp/ikonli/metrizeicons/MetrizeIconsIkonHandler.java +++ b/icon-packs/ikonli-metrizeicons-pack/src/main/java/org/kordamp/ikonli/metrizeicons/MetrizeIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/metrizeicons/0.0/fonts/Metrize-Icons.ttf"; + return getClass().getResource("/META-INF/resources/metrizeicons/0.0/fonts/Metrize-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-microns-pack/src/main/java/org/kordamp/ikonli/microns/MicronsIkonHandler.java b/icon-packs/ikonli-microns-pack/src/main/java/org/kordamp/ikonli/microns/MicronsIkonHandler.java index 9dcd79490..2d71be573 100644 --- a/icon-packs/ikonli-microns-pack/src/main/java/org/kordamp/ikonli/microns/MicronsIkonHandler.java +++ b/icon-packs/ikonli-microns-pack/src/main/java/org/kordamp/ikonli/microns/MicronsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/microns/1.0.8/fonts/microns.ttf"; + return getClass().getResource("/META-INF/resources/microns/1.0.8/fonts/microns.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-ociicons-pack/src/main/java/org/kordamp/ikonli/ociicons/OciiconsIkonHandler.java b/icon-packs/ikonli-ociicons-pack/src/main/java/org/kordamp/ikonli/ociicons/OciiconsIkonHandler.java index bae6f23e4..783571f57 100644 --- a/icon-packs/ikonli-ociicons-pack/src/main/java/org/kordamp/ikonli/ociicons/OciiconsIkonHandler.java +++ b/icon-packs/ikonli-ociicons-pack/src/main/java/org/kordamp/ikonli/ociicons/OciiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/ociicons/1.0/fonts/ociicons.ttf"; + return getClass().getResource("/META-INF/resources/ociicons/1.0/fonts/ociicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-octicons-pack/src/main/java/org/kordamp/ikonli/octicons/OcticonsIkonHandler.java b/icon-packs/ikonli-octicons-pack/src/main/java/org/kordamp/ikonli/octicons/OcticonsIkonHandler.java index 5ac65b89d..c4c1a2522 100644 --- a/icon-packs/ikonli-octicons-pack/src/main/java/org/kordamp/ikonli/octicons/OcticonsIkonHandler.java +++ b/icon-packs/ikonli-octicons-pack/src/main/java/org/kordamp/ikonli/octicons/OcticonsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/octicons/11.0.0/fonts/octicons.ttf"; + return getClass().getResource("/META-INF/resources/octicons/11.0.0/fonts/octicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-openiconic-pack/src/main/java/org/kordamp/ikonli/openiconic/OpeniconicIkonHandler.java b/icon-packs/ikonli-openiconic-pack/src/main/java/org/kordamp/ikonli/openiconic/OpeniconicIkonHandler.java index 504f19a7c..4acf9cf09 100644 --- a/icon-packs/ikonli-openiconic-pack/src/main/java/org/kordamp/ikonli/openiconic/OpeniconicIkonHandler.java +++ b/icon-packs/ikonli-openiconic-pack/src/main/java/org/kordamp/ikonli/openiconic/OpeniconicIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/openiconic/1.1.0/fonts/open-iconic.ttf"; + return getClass().getResource("/META-INF/resources/openiconic/1.1.0/fonts/open-iconic.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-paymentfont-pack/src/main/java/org/kordamp/ikonli/paymentfont/PaymentFontIkonHandler.java b/icon-packs/ikonli-paymentfont-pack/src/main/java/org/kordamp/ikonli/paymentfont/PaymentFontIkonHandler.java index 473a35ee9..e809a7c60 100755 --- a/icon-packs/ikonli-paymentfont-pack/src/main/java/org/kordamp/ikonli/paymentfont/PaymentFontIkonHandler.java +++ b/icon-packs/ikonli-paymentfont-pack/src/main/java/org/kordamp/ikonli/paymentfont/PaymentFontIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/paymentfont/1.2.5/fonts/paymentfont-webfont.ttf"; + return getClass().getResource("/META-INF/resources/paymentfont/1.2.5/fonts/paymentfont-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-prestashopicons-pack/src/main/java/org/kordamp/ikonli/prestashopicons/PrestaShopIconsIkonHandler.java b/icon-packs/ikonli-prestashopicons-pack/src/main/java/org/kordamp/ikonli/prestashopicons/PrestaShopIconsIkonHandler.java index 3e889938a..a14120733 100644 --- a/icon-packs/ikonli-prestashopicons-pack/src/main/java/org/kordamp/ikonli/prestashopicons/PrestaShopIconsIkonHandler.java +++ b/icon-packs/ikonli-prestashopicons-pack/src/main/java/org/kordamp/ikonli/prestashopicons/PrestaShopIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/prestashopicons/0.8.0/fonts/prestashop-icon-font.ttf"; + return getClass().getResource("/META-INF/resources/prestashopicons/0.8.0/fonts/prestashop-icon-font.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconALIkonHandler.java b/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconALIkonHandler.java index 1428e8703..a751c648d 100644 --- a/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconALIkonHandler.java +++ b/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/remixicon/2.5.0/fonts/remixicon.ttf"; + return getClass().getResource("/META-INF/resources/remixicon/2.5.0/fonts/remixicon.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconMZIkonHandler.java b/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconMZIkonHandler.java index 5307aba47..82a02a942 100644 --- a/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconMZIkonHandler.java +++ b/icon-packs/ikonli-remixicon-pack/src/main/java/org/kordamp/ikonli/remixicon/RemixiconMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/remixicon/2.5.0/fonts/remixicon.ttf"; + return getClass().getResource("/META-INF/resources/remixicon/2.5.0/fonts/remixicon.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-runestroicons-pack/src/main/java/org/kordamp/ikonli/runestroicons/RunestroiconsIkonHandler.java b/icon-packs/ikonli-runestroicons-pack/src/main/java/org/kordamp/ikonli/runestroicons/RunestroiconsIkonHandler.java index 17ddc3a39..3cc6abdae 100644 --- a/icon-packs/ikonli-runestroicons-pack/src/main/java/org/kordamp/ikonli/runestroicons/RunestroiconsIkonHandler.java +++ b/icon-packs/ikonli-runestroicons-pack/src/main/java/org/kordamp/ikonli/runestroicons/RunestroiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/runestroicons/5.6/fonts/runestroicons.ttf"; + return getClass().getResource("/META-INF/resources/runestroicons/5.6/fonts/runestroicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-simpleicons-pack/src/main/java/org/kordamp/ikonli/simpleicons/SimpleIconsIkonHandler.java b/icon-packs/ikonli-simpleicons-pack/src/main/java/org/kordamp/ikonli/simpleicons/SimpleIconsIkonHandler.java index 4871f822a..536e13f1f 100644 --- a/icon-packs/ikonli-simpleicons-pack/src/main/java/org/kordamp/ikonli/simpleicons/SimpleIconsIkonHandler.java +++ b/icon-packs/ikonli-simpleicons-pack/src/main/java/org/kordamp/ikonli/simpleicons/SimpleIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/simpleicons/3.12.2/fonts/Simple-Icons.ttf"; + return getClass().getResource("/META-INF/resources/simpleicons/3.12.2/fonts/Simple-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-simplelineicons-pack/src/main/java/org/kordamp/ikonli/simplelineicons/SimpleLineIconsIkonHandler.java b/icon-packs/ikonli-simplelineicons-pack/src/main/java/org/kordamp/ikonli/simplelineicons/SimpleLineIconsIkonHandler.java index 4b47c4f04..b93b622f8 100644 --- a/icon-packs/ikonli-simplelineicons-pack/src/main/java/org/kordamp/ikonli/simplelineicons/SimpleLineIconsIkonHandler.java +++ b/icon-packs/ikonli-simplelineicons-pack/src/main/java/org/kordamp/ikonli/simplelineicons/SimpleLineIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/simplelineicons/2.5.4/fonts/Simple-Line-Icons.ttf"; + return getClass().getResource("/META-INF/resources/simplelineicons/2.5.4/fonts/Simple-Line-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-subway-pack/src/main/java/org/kordamp/ikonli/subway/SubwayIkonHandler.java b/icon-packs/ikonli-subway-pack/src/main/java/org/kordamp/ikonli/subway/SubwayIkonHandler.java index f3e66c662..9bf56c190 100644 --- a/icon-packs/ikonli-subway-pack/src/main/java/org/kordamp/ikonli/subway/SubwayIkonHandler.java +++ b/icon-packs/ikonli-subway-pack/src/main/java/org/kordamp/ikonli/subway/SubwayIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/subway/20201108/fonts/Subway-Icons.ttf"; + return getClass().getResource("/META-INF/resources/subway/20201108/fonts/Subway-Icons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-themify-pack/src/main/java/org/kordamp/ikonli/themify/ThemifyIkonHandler.java b/icon-packs/ikonli-themify-pack/src/main/java/org/kordamp/ikonli/themify/ThemifyIkonHandler.java index 3e44e12b2..224d1a1dd 100644 --- a/icon-packs/ikonli-themify-pack/src/main/java/org/kordamp/ikonli/themify/ThemifyIkonHandler.java +++ b/icon-packs/ikonli-themify-pack/src/main/java/org/kordamp/ikonli/themify/ThemifyIkonHandler.java @@ -53,7 +53,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/themify/1.0.1/fonts/themify.ttf"; + return getClass().getResource("/META-INF/resources/themify/1.0.1/fonts/themify.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-typicons-pack/src/main/java/org/kordamp/ikonli/typicons/TypiconsIkonHandler.java b/icon-packs/ikonli-typicons-pack/src/main/java/org/kordamp/ikonli/typicons/TypiconsIkonHandler.java index ce04f4db7..85e149f74 100644 --- a/icon-packs/ikonli-typicons-pack/src/main/java/org/kordamp/ikonli/typicons/TypiconsIkonHandler.java +++ b/icon-packs/ikonli-typicons-pack/src/main/java/org/kordamp/ikonli/typicons/TypiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/typicons/2.0.7/fonts/typicons.ttf"; + return getClass().getResource("/META-INF/resources/typicons/2.0.7/fonts/typicons.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsLineIkonHandler.java b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsLineIkonHandler.java index 7ab21d423..bd6373808 100644 --- a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsLineIkonHandler.java +++ b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsLineIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/unicons/20201106/fonts/Unicons-Line.ttf"; + return getClass().getResource("/META-INF/resources/unicons/20201106/fonts/Unicons-Line.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsMonochromeIkonHandler.java b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsMonochromeIkonHandler.java index f2ae6dad8..490aa78fd 100644 --- a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsMonochromeIkonHandler.java +++ b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsMonochromeIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/unicons/20201106/fonts/Unicons-Monochrome.ttf"; + return getClass().getResource("/META-INF/resources/unicons/20201106/fonts/Unicons-Monochrome.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsSolidIkonHandler.java b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsSolidIkonHandler.java index 4bd3a77bc..b62cd0f41 100644 --- a/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsSolidIkonHandler.java +++ b/icon-packs/ikonli-unicons-pack/src/main/java/org/kordamp/ikonli/unicons/UniconsSolidIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/unicons/20201106/fonts/Unicons-Solid.ttf"; + return getClass().getResource("/META-INF/resources/unicons/20201106/fonts/Unicons-Solid.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-weathericons-pack/src/main/java/org/kordamp/ikonli/weathericons/WeatherIconsIkonHandler.java b/icon-packs/ikonli-weathericons-pack/src/main/java/org/kordamp/ikonli/weathericons/WeatherIconsIkonHandler.java index 19bb132a6..0120d9cc7 100644 --- a/icon-packs/ikonli-weathericons-pack/src/main/java/org/kordamp/ikonli/weathericons/WeatherIconsIkonHandler.java +++ b/icon-packs/ikonli-weathericons-pack/src/main/java/org/kordamp/ikonli/weathericons/WeatherIconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/weathericons/2.0.10/fonts/weathericons-regular-webfont.ttf"; + return getClass().getResource("/META-INF/resources/weathericons/2.0.10/fonts/weathericons-regular-webfont.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-websymbols-pack/src/main/java/org/kordamp/ikonli/websymbols/WebsymbolsIkonHandler.java b/icon-packs/ikonli-websymbols-pack/src/main/java/org/kordamp/ikonli/websymbols/WebsymbolsIkonHandler.java index fcf5d10d3..ac1c79e0d 100644 --- a/icon-packs/ikonli-websymbols-pack/src/main/java/org/kordamp/ikonli/websymbols/WebsymbolsIkonHandler.java +++ b/icon-packs/ikonli-websymbols-pack/src/main/java/org/kordamp/ikonli/websymbols/WebsymbolsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/websymbols/0.0/fonts/websymbols.ttf"; + return getClass().getResource("/META-INF/resources/websymbols/0.0/fonts/websymbols.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgALIkonHandler.java b/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgALIkonHandler.java index 58544b2ad..a61910db2 100644 --- a/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgALIkonHandler.java +++ b/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgALIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/whhg/20201105/fonts/webhostinghub-glyphs.ttf"; + return getClass().getResource("/META-INF/resources/whhg/20201105/fonts/webhostinghub-glyphs.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgMZIkonHandler.java b/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgMZIkonHandler.java index e05a710fa..a3fea5820 100644 --- a/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgMZIkonHandler.java +++ b/icon-packs/ikonli-whhg-pack/src/main/java/org/kordamp/ikonli/whhg/WhhgMZIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/whhg/20201105/fonts/webhostinghub-glyphs.ttf"; + return getClass().getResource("/META-INF/resources/whhg/20201105/fonts/webhostinghub-glyphs.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-win10-pack/src/main/java/org/kordamp/ikonli/win10/Win10IkonHandler.java b/icon-packs/ikonli-win10-pack/src/main/java/org/kordamp/ikonli/win10/Win10IkonHandler.java index 4bd536b77..c16eacfd8 100644 --- a/icon-packs/ikonli-win10-pack/src/main/java/org/kordamp/ikonli/win10/Win10IkonHandler.java +++ b/icon-packs/ikonli-win10-pack/src/main/java/org/kordamp/ikonli/win10/Win10IkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/win10/1.0.1/fonts/icons8-win10.ttf"; + return getClass().getResource("/META-INF/resources/win10/1.0.1/fonts/icons8-win10.ttf") + .toExternalForm(); } @Override diff --git a/icon-packs/ikonli-zondicons-pack/src/main/java/org/kordamp/ikonli/zondicons/ZondiconsIkonHandler.java b/icon-packs/ikonli-zondicons-pack/src/main/java/org/kordamp/ikonli/zondicons/ZondiconsIkonHandler.java index d188605b8..17cd1fc52 100644 --- a/icon-packs/ikonli-zondicons-pack/src/main/java/org/kordamp/ikonli/zondicons/ZondiconsIkonHandler.java +++ b/icon-packs/ikonli-zondicons-pack/src/main/java/org/kordamp/ikonli/zondicons/ZondiconsIkonHandler.java @@ -39,7 +39,8 @@ public Ikon resolve(String description) { @Override public String getFontResourcePath() { - return "META-INF/resources/zondicons/20170712/fonts/Zondicons.ttf"; + return getClass().getResource("/META-INF/resources/zondicons/20170712/fonts/Zondicons.ttf") + .toExternalForm(); } @Override