Merge branch 'develop' into ICU4J-Implementation

Author: bubblobill

.gitignore

@@ -23,6 +23,7 @@ out/
 \${sys:appHome}/
 build-resources/wikiDocExtraction/*.txt
 build-resources/wikiDocExtraction/*.xml
+/run/
 
 
 # Automatically Generated

build.gradle

@@ -92,18 +92,37 @@ ext {
     println "OS Detected: " + osdetector.os
 }
 
+def modulesToOpen = [
+        'java.desktop/java.awt',
+        'java.desktop/java.awt.geom',
+        'java.desktop/sun.awt.geom',
+        'java.base/java.util',
+        'javafx.web/javafx.scene.web',
+        'javafx.web/com.sun.webkit',
+        'javafx.web/com.sun.webkit.dom',
+        'java.base/java.lang',
+        'java.desktop/sun.awt',
+        'java.desktop/sun.java2d',
+        'java.desktop/javax.swing',
+        'java.desktop/sun.awt.shell',
+]
+def jarManifestAttributes = [
+        'Implementation-Title': project.name + developerRelease,
+        'Implementation-Version': tagVersion,
+        'Implementation-Vendor': vendor,
+        'Git-Commit': revision,
+        'Git-Commit-SHA': revisionFull,
+        'Built-By': System.getProperty('user.name'),
+        'Built-Date': new Date(),
+        'Built-JDK': System.getProperty('java.version'),
+        'Source-Compatibility': project.java.sourceCompatibility,
+        'Target-Compatibility': project.java.targetCompatibility,
+        'Main-Class': project.application.mainClass,
+        'Add-Opens': modulesToOpen.join(' '),
+]
 def javaArgs = [
-        "-Xss8M", "-Dsun.java2d.d3d=false",
-        "-Dpolyglot.engine.WarnInterpreterOnly=false",
-        "-Djava.util.Arrays.useLegacyMergeSort=true",
-        "-DMAPTOOL_DATADIR=.maptool-" + vendor.toLowerCase(),
-        "--add-opens=java.desktop/java.awt=ALL-UNNAMED", "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED",
-        "--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.base/java.lang=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.awt=ALL-UNNAMED", "--add-opens=java.desktop/sun.java2d=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"]
+        "-Xss8M",
+] + modulesToOpen.collect { '--add-opens=' + it + '=ALL-UNNAMED' }
 
 // Used by gradle assemble & run tasks
 application {
@@ -137,7 +156,6 @@ javafx {
 }
 
 run {
-    args = ['-v=' + appSemVer]
     // Add -Dlog4j2.debug to see log4j2 details
     // Add  -Djavax.net.debug=all to debug networking issues
 
@@ -419,11 +437,6 @@ dependencies {
     implementation(libs.rptools.maptool.addons)
     implementation(libs.rptools.dice.roller)
     implementation(libs.noiselib)
-
-    // libgdx
-    implementation(libs.bundles.gdx)
-    implementation(variantOf(libs.gdx.platform) { classifier('natives-desktop')})
-    implementation(variantOf(libs.gdx.freetype.platform) { classifier('natives-desktop')})
 }
 
 processResources {
@@ -451,36 +464,16 @@ shadowJar {
     archiveClassifier = null
 
     manifest {
-        attributes 'Implementation-Title': project.name + developerRelease,
-                'Implementation-Version': tagVersion,
-                'Implementation-Vendor': vendor,
-                'Git-Commit': revision,
-                'Git-Commit-SHA': revisionFull,
-                'Built-By': System.getProperty('user.name'),
-                'Built-Date': new Date(),
-                'Built-JDK': System.getProperty('java.version'),
-                'Source-Compatibility': project.java.sourceCompatibility,
-                'Target-Compatibility': project.java.targetCompatibility,
-                'Main-Class': project.application.mainClass,
-                'Multi-Release': true
+        attributes jarManifestAttributes
+        attributes 'Multi-Release': true
     }
 
     exclude 'module-info.class' //This is to make sure maptool doesn't become a module by including module-info of dependencies. Probably needs to be fixed before we go to jdk 11+
 }
 
 jar {
     manifest {
-        attributes 'Implementation-Title': project.name + developerRelease,
-                'Implementation-Version': tagVersion,
-                'Implementation-Vendor': vendor,
-                'Git-Commit': revision,
-                'Git-Commit-SHA': revisionFull,
-                'Built-By': System.getProperty('user.name'),
-                'Built-Date': new Date(),
-                'Built-JDK': System.getProperty('java.version'),
-                'Source-Compatibility': project.java.sourceCompatibility,
-                'Target-Compatibility': project.java.targetCompatibility,
-                'Main-Class': project.application.mainClass
+        attributes jarManifestAttributes
     }
 }
 

common/src/main/java/net/rptools/lib/GeometryUtil.java

@@ -23,6 +23,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.locationtech.jts.algorithm.InteriorPointArea;
@@ -33,6 +34,7 @@
 import org.locationtech.jts.geom.CoordinateArrays;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.LinearRing;
 import org.locationtech.jts.geom.Location;
@@ -201,33 +203,59 @@ public static Collection<Polygon> toJtsPolygons(Shape shape) {
       // Build the polygon...
       var polygon = island.toPolygon();
       // ... then make sure it is valid, fixing it if not.
-      Geometry fixedPolygon;
+      Geometry fixedGeometry;
       try {
-        fixedPolygon = GeometryPrecisionReducer.reduce(GeometryFixer.fix(polygon), precisionModel);
+        fixedGeometry = GeometryPrecisionReducer.reduce(GeometryFixer.fix(polygon), precisionModel);
       } catch (Throwable t) {
         log.error("Failure while reducing polygon", t);
         continue;
       }
 
-      switch (fixedPolygon) {
-        case Polygon p -> polygons.add(p);
-        case MultiPolygon mp -> {
-          for (var n = 0; n < mp.getNumGeometries(); ++n) {
-            polygons.add((Polygon) mp.getGeometryN(n));
+      /*
+       * Although `fixedGeometry` is usually a `Polygon` or a `MultiPolygon`, it _could_ be some
+       * other `Geometry` or even an arbitrary `GeometryCollection`. We can only work with polygonal
+       * elements, so we first need to flatten our geometry to a list and then pick out only the
+       * polygons.
+       */
+
+      var flattened = new ArrayList<Geometry>();
+      flatten(fixedGeometry, flattened::add);
+
+      for (var geometry : flattened) {
+        if (geometry instanceof Polygon p) {
+          if (!p.isEmpty()) {
+            polygons.add(p);
           }
+        } else {
+          log.error(
+              "Found unexpected geometry after fixing polygon: {}. Skipping", geometry.getClass());
         }
-        default ->
-            log.error(
-                "Found unexpected geometry after fixing polygon: {}. Skipping",
-                fixedPolygon.getClass());
       }
     }
 
-    polygons.removeIf(Polygon::isEmpty);
-
     return polygons;
   }
 
+  /**
+   * Recursively flattens a geometry by replacing any collection components with their children.
+   *
+   * <p>Any discovered non-collection geometry is added to {@code output}.
+   *
+   * @param geometry The geometry to flatten. If this is not a collection,
+   * @param output The place to write the non-collection geometries.
+   */
+  public static void flatten(Geometry geometry, Consumer<Geometry> output) {
+    for (var n = 0; n < geometry.getNumGeometries(); ++n) {
+      var child = geometry.getGeometryN(n);
+      if (child instanceof GeometryCollection childCollection) {
+        // Recurse on collections so we get their children.
+        flatten(childCollection, output);
+      } else {
+        output.accept(child);
+      }
+    }
+  }
+
   public static Point2D coordinateToPoint2D(Coordinate coordinate) {
     return new Point2D.Double(coordinate.getX(), coordinate.getY());
   }

common/src/test/java/net/rptools/lib/GeometryUtilTest.java

@@ -835,6 +835,109 @@ private static Iterable<Arguments> areaProvider() {
     }
     // endregion
 
+    // region A square "donut" with a defective bump-out at the top-right corner.
+    {
+      final var path = new Path2D.Double();
+      path.moveTo(1800.0000000000000000, 2000.0000000000000000);
+      path.lineTo(1800.0000000000000000, 2100.0000000000000000);
+      path.lineTo(1700.0000000000000000, 2100.0000000000000000);
+      path.lineTo(1700.0000000000000000, 2000.0000000000000000);
+      path.closePath();
+
+      path.moveTo(1900.0000000000000000, 1900.0000000000000000);
+      path.lineTo(1600.0000000000000000, 1900.0000000000000000);
+      path.lineTo(1600.0000000000000000, 2200.0000000000000000);
+      path.lineTo(1900.0000000000000000, 2200.0000000000000000);
+      path.lineTo(1900.0000000000000000, 2000.0000000000000000);
+      path.lineTo(1991.8686523437500000, 2000.0000000000000000);
+      path.lineTo(1991.9971923828125000, 1998.3947753906250000);
+      path.lineTo(1991.2067871093750000, 1991.4079589843750000);
+      path.lineTo(1990.7553710937500000, 1984.2075195312500000);
+      path.lineTo(1990.1141357421875000, 1981.7492675781250000);
+      path.lineTo(1989.8403320312500000, 1979.3294677734375000);
+      path.lineTo(1987.7099609375000000, 1972.5334472656250000);
+      path.lineTo(1985.9122314453125000, 1965.6418457031250000);
+      path.lineTo(1984.8612060546875000, 1963.4451904296875000);
+      path.lineTo(1984.1013183593750000, 1961.0209960937500000);
+      path.lineTo(1980.6657714843750000, 1954.6768798828125000);
+      path.lineTo(1977.6309814453125000, 1948.3341064453125000);
+      path.lineTo(1976.1545410156250000, 1946.3464355468750000);
+      path.lineTo(1974.8978271484375000, 1944.0256347656250000);
+      path.lineTo(1970.4443359375000000, 1938.6584472656250000);
+      path.lineTo(1966.1066894531250000, 1932.8183593750000000);
+      path.lineTo(1964.0657958984375000, 1930.9709472656250000);
+      path.lineTo(1962.3472900390625000, 1928.8999023437500000);
+      path.lineTo(1957.2095947265625000, 1924.7651367187500000);
+      path.lineTo(1951.5350341796875000, 1919.6286621093750000);
+      path.lineTo(1948.8482666015625000, 1918.0358886718750000);
+      path.lineTo(1948.2611083984375000, 1917.5633544921875000);
+      path.lineTo(1948.2611055629925000, 1917.5633569530470000);
+      path.lineTo(1948.2611055629923000, 1917.5633569530470000);
+      path.lineTo(1946.5672607421875000, 1916.2001953125000000);
+      path.lineTo(1945.5327255706209000, 1915.6659069632760000);
+      path.lineTo(1945.5327231053059000, 1915.6659038816322000);
+      path.lineTo(1945.5327231053063000, 1915.6659038816322000);
+      path.lineTo(1940.7324218750000000, 1913.1867675781250000);
+      path.lineTo(1940.7324147182750000, 1913.1867740816188000);
+      path.lineTo(1940.7324147182755000, 1913.1867740816188000);
+      path.lineTo(1940.2384033203125000, 1912.9316406250000000);
+      path.lineTo(1934.1110839843750000, 1909.2990722656250000);
+      path.lineTo(1914.0823129507212000, 1900.0000000000000000);
+      path.closePath();
+
+      final var area = new Area(path);
+
+      final var polygon =
+          createPrecisePolygon(
+              new Coordinate[] {
+                new Coordinate(1900, 2200),
+                new Coordinate(1900, 2000),
+                new Coordinate(1991.86865, 2000),
+                new Coordinate(1991.99719, 1998.39478),
+                new Coordinate(1991.20679, 1991.40796),
+                new Coordinate(1990.75537, 1984.20752),
+                new Coordinate(1990.11414, 1981.74927),
+                new Coordinate(1989.84033, 1979.32947),
+                new Coordinate(1987.70996, 1972.53345),
+                new Coordinate(1985.91223, 1965.64185),
+                new Coordinate(1984.86121, 1963.44519),
+                new Coordinate(1984.10132, 1961.021),
+                new Coordinate(1980.66577, 1954.67688),
+                new Coordinate(1977.63098, 1948.33411),
+                new Coordinate(1976.15454, 1946.34644),
+                new Coordinate(1974.89783, 1944.02563),
+                new Coordinate(1970.44434, 1938.65845),
+                new Coordinate(1966.10669, 1932.81836),
+                new Coordinate(1964.0658, 1930.97095),
+                new Coordinate(1962.34729, 1928.8999),
+                new Coordinate(1957.20959, 1924.76514),
+                new Coordinate(1951.53503, 1919.62866),
+                new Coordinate(1948.84827, 1918.03589),
+                new Coordinate(1948.26111, 1917.56336),
+                new Coordinate(1946.56726, 1916.2002),
+                new Coordinate(1945.53273, 1915.66591),
+                new Coordinate(1945.53272, 1915.6659),
+                new Coordinate(1940.73242, 1913.18677),
+                new Coordinate(1940.73241, 1913.18677),
+                new Coordinate(1940.2384, 1912.93164),
+                new Coordinate(1934.11108, 1909.29907),
+                new Coordinate(1914.08231, 1900),
+                new Coordinate(1600, 1900),
+                new Coordinate(1600, 2200),
+                new Coordinate(1900, 2200),
+              },
+              new Coordinate[] {
+                new Coordinate(1700, 2100),
+                new Coordinate(1700, 2000),
+                new Coordinate(1800, 2000),
+                new Coordinate(1800, 2100),
+                new Coordinate(1700, 2100),
+              });
+
+      argumentsList.add(argumentSet("Point-like reduced geometry", area, List.of(polygon)));
+    }
+    // endregion
+
     return argumentsList;
   }
 

gradle/libs.versions.toml

@@ -11,7 +11,6 @@ jai-imageio = "1.4.0"
 graalvm-js = "21.2.0"
 pdfbox = "3.0.0"
 protoc = "4.31.1"
-gdx = "1.13.5"
 
 [libraries]
 findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" }
@@ -156,16 +155,6 @@ intellij-forms-runtime = { group = "com.jetbrains.intellij.java", name = "java-g
 # layout for forms created in code
 miglayout-swing = { group = "com.miglayout", name = "miglayout-swing", version = "11.4.2" }
 
-gdx = { group = "com.badlogicgames.gdx", name = "gdx", version.ref = "gdx" }
-gdx-backend-lwjgl = { group = "com.badlogicgames.gdx", name = "gdx-backend-lwjgl", version.ref = "gdx" }
-gdx-platform = { group = "com.badlogicgames.gdx", name = "gdx-platform", version.ref = "gdx" }
-gdx-freetype = { group = "com.badlogicgames.gdx", name = "gdx-freetype", version.ref = "gdx" }
-gdx-freetype-platform = { group = "com.badlogicgames.gdx", name = "gdx-freetype-platform", version.ref = "gdx" }
-gdx-video = { group = "com.badlogicgames.gdx-video", name = "gdx-video", version = "1.3.3" }
-gdx-video-lwjgl3 = { group = "com.badlogicgames.gdx-video", name = "gdx-video-lwjgl3", version = "1.3.3" }
-libgdx-jogl-backend = { group = "com.github.thelsing", name = "libgdx-jogl-backend", version = "becdde406e" }
-earlygrey-shapedrawer = { group = "space.earlygrey", name = "shapedrawer", version = "2.6.0" }
-
 # RPTools libs
 # default resources (token, textures etc.)
 rptools-maptool-resources = { group = "com.github.RPTools", name = "maptool-resources", version = "1.6.0" }
@@ -219,8 +208,6 @@ handlebars = ["handlebars", "handlebars-helpers", "handlebars-jackson-helper"]
 junit = ["junit-api", "junit-engine", "junit-params"]
 jai-imageio = ["jai-imageio-core", "jai-imageio-jpeg"]
 graalvm-js = ["graalvm-js", "graalvm-js-scriptengine"]
-gdx = ["gdx", "gdx-backend-lwjgl", "gdx-platform", "gdx-freetype", "gdx-freetype-platform",
-       "gdx-video", "gdx-video-lwjgl3", "libgdx-jogl-backend", "earlygrey-shapedrawer"]
 
 [plugins]
 git-version = { id = "com.palantir.git-version", version = "4.0.0" }