Generalised emulation packages to emul.* (was emul.java.*)

webfx-project · Nov 29, 2023 · dd45762 · dd45762
1 parent 7815e4a
commit dd45762
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/dev/webfx/cli/modulefiles/DevGwtModuleFile.java b/src/main/java/dev/webfx/cli/modulefiles/DevGwtModuleFile.java
@@ -108,14 +108,14 @@ public boolean updateDocument(Document document) {
                                 .sorted()
                                 .forEach(p -> {
                                     // In general, we add <source path="..."/> for each package. Exception is made with
-                                    // emul.java.* packages (coming from webfx-platform-javabase-emul-gwt module) that
-                                    // are actually relocated to java.* packages in GWT super sources. So for such
-                                    // packages, we add <super-source path="" includes="java/..."/> instead.
-                                    boolean javaEmul = p.startsWith("emul.java");
-                                    Element sourceElement = document.createElement(javaEmul ? "super-source" : "source");
-                                    if (javaEmul)
+                                    // emul.xxx.* packages (coming from webfx-platform-javabase-emul-gwt module) that
+                                    // are actually relocated to xxx.* packages in GWT super sources. So for such
+                                    // packages, we add <super-source path="" includes="xxx/..."/> instead.
+                                    boolean isEmulPackage = p.startsWith("emul.");
+                                    Element sourceElement = document.createElement(isEmulPackage ? "super-source" : "source");
+                                    if (isEmulPackage)
                                         sourceElement.setAttribute("includes", p.substring(5).replaceAll("\\.", "/") + "/");
-                                    sourceElement.setAttribute("path", javaEmul ? "" : p.replaceAll("\\.", "/"));
+                                    sourceElement.setAttribute("path", isEmulPackage ? "" : p.replaceAll("\\.", "/"));
                                     nodeAppenderIfNotOnlyComment.accept(sourceElement);
                                 });
                         resourcePackages

diff --git a/src/main/resources/dev/webfx/cli/version/dev/version.ini b/src/main/resources/dev/webfx/cli/version/dev/version.ini
@@ -1,2 +1,2 @@
 version=0.1.0-SNAPSHOT
-build.timestamp=2023-11-21 14:47
+build.timestamp=2023-11-29 17:25