From b8baf50a28bbbd3ccfe3777e0c81b48db30550c3 Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 22:21:50 +0930 Subject: [PATCH 1/6] Fix for wrong class used in logger --- .../java/net/rptools/maptool/model/library/LibraryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java index 3cd08864e4..0b6f15be69 100644 --- a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java +++ b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java @@ -42,7 +42,7 @@ public class LibraryManager { /** Class for logging messages. */ - private static final Logger log = LogManager.getLogger(AppActions.class); + private static final Logger log = LogManager.getLogger(LibraryManager.class); /** The reserved library name prefixes. */ private static final Set RESERVED_PREFIXES = From e13b6f4cffd56e75a2157ce2f9c1abc5ee788f94 Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 22:32:45 +0930 Subject: [PATCH 2/6] test location --- .../maptool/model/library/builtin/BuiltInLibraryManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java b/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java index 71bb983f78..5b7249b836 100644 --- a/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java +++ b/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java @@ -138,6 +138,7 @@ public void loadBuiltIns() { return; } + MapTool.showInformation(uri.toString()); try (var fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) { var resourcePath = fs.getPath(ClassPathAddOnLibrary.BUILTIN_LIB_CLASSPATH_DIR); var libs = From 6449e1e39ff26a1dbfa3595bc22ab1d65e04c2ad Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 22:33:28 +0930 Subject: [PATCH 3/6] spotless apply --- .../java/net/rptools/maptool/model/library/LibraryManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java index 0b6f15be69..3bd991ecdc 100644 --- a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java +++ b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java @@ -23,7 +23,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import net.rptools.maptool.client.AppActions; import net.rptools.maptool.client.MapTool; import net.rptools.maptool.client.MapToolMacroContext; import net.rptools.maptool.events.MapToolEventBus; From 3c699e39b6537e35b844112170fbe6657ca8178a Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 22:52:12 +0930 Subject: [PATCH 4/6] spotless apply --- build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d4ef6de20a..a8683e886f 100644 --- a/build.gradle +++ b/build.gradle @@ -217,7 +217,8 @@ runtime { 'jdk.unsupported.desktop', 'jdk.xml.dom', 'jdk.crypto.cryptoki', - 'jdk.crypto.ec' + 'jdk.crypto.ec', + 'jdk.zipfs' ] @@ -231,7 +232,9 @@ runtime { "--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED", "--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED", "--add-opens=java.desktop/javax.swing=ALL-UNNAMED","--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED", - "--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED"] + "--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED", + "--add-opens jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED" + ] imageOptions = [] imageName = project.name + developerRelease From 7ee9b1018209494719e27777a1d2ea80ef412dd1 Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 22:52:30 +0930 Subject: [PATCH 5/6] add zipfs to package --- .../maptool/model/library/builtin/BuiltInLibraryManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java b/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java index 5b7249b836..71bb983f78 100644 --- a/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java +++ b/src/main/java/net/rptools/maptool/model/library/builtin/BuiltInLibraryManager.java @@ -138,7 +138,6 @@ public void loadBuiltIns() { return; } - MapTool.showInformation(uri.toString()); try (var fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) { var resourcePath = fs.getPath(ClassPathAddOnLibrary.BUILTIN_LIB_CLASSPATH_DIR); var libs = From 73c8549ffd54570bf0afb19fd9e8eee9cecf3976 Mon Sep 17 00:00:00 2001 From: cwisniew Date: Sat, 30 Sep 2023 23:07:21 +0930 Subject: [PATCH 6/6] remove incorrect opens --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a8683e886f..e9481073a9 100644 --- a/build.gradle +++ b/build.gradle @@ -232,8 +232,7 @@ runtime { "--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED", "--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED", "--add-opens=java.desktop/javax.swing=ALL-UNNAMED","--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED", - "--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED", - "--add-opens jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED" + "--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED" ] imageOptions = []