Merge pull request #5926 from bubblobill/shape_id_fix

Fix Drawing ID not unique on shape.draw()

Author: cwisniew

build.gradle

@@ -360,7 +360,7 @@ dependencies {
     implementation(libs.okhttp)
 
     implementation(libs.bundles.imageio)
-    implementation(libs.batik)
+    implementation(libs.bundles.batik)
     implementation(libs.bundles.pdfbox)
     implementation(libs.bcmail)
     implementation(libs.bundles.jai.imageio)

common/build.gradle

@@ -16,7 +16,7 @@ dependencies {
     implementation(libs.gson)
 
     implementation(libs.bundles.imageio)
-    implementation(libs.batik)
+    implementation(libs.bundles.batik)
     implementation(libs.jsvg)
 
     implementation(libs.apache.commons.io)

gradle/libs.versions.toml

@@ -52,7 +52,11 @@ imageio-tiff = { group = "com.twelvemonkeys.imageio", name = "imageio-tiff", ver
 imageio-batik = { group = "com.twelvemonkeys.imageio", name = "imageio-batik", version.ref = "imageio" }
 imageio-tga = { group = "com.twelvemonkeys.imageio", name = "imageio-tga", version.ref = "imageio" }
 imageio-bmp = { group = "com.twelvemonkeys.imageio", name = "imageio-bmp", version.ref = "imageio" }
-batik = { group = "org.apache.xmlgraphics", name = "batik-all", version = "1.19" }
+
+batik-all = { group = "org.apache.xmlgraphics", name = "batik-all", version = "1.19" }
+batik-awt = { group = "org.apache.xmlgraphics", name="batik-awt-util", version = "1.19" }
+batik-transcoder = { group = "org.apache.xmlgraphics", name="batik-transcoder", version = "1.19" }
+
 # PDF image extraction
 pdfbox = { group = "org.apache.pdfbox", name = "pdfbox", version.ref = "pdfbox" }
 pdfbox-tools = { group = "org.apache.pdfbox", name = "pdfbox-tools", version.ref = "pdfbox" }
@@ -191,6 +195,7 @@ imageio = [
   "imageio-tga",
   "imageio-bmp",
 ]
+batik = ["batik-all", "batik-awt", "batik-transcoder"]
 pdfbox = ["pdfbox", "pdfbox-tools"]
 jide = [
   "jide-common",

src/main/java/net/rptools/maptool/client/functions/ShapeFunctions.java

@@ -576,7 +576,7 @@ private Object drawShape(
         pen.setEraser(penObject.get("eraser").getAsBoolean());
       }
     }
-    DrawnElement drawnElement = new DrawnElement(CACHED_SHAPES.get(shapeName), pen);
+    DrawnElement drawnElement = new DrawnElement(shapeDrawable.copy(), pen);
     drawnElement.setPen(pen);
 
     MapTool.serverCommand()

src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java

@@ -47,7 +47,7 @@ protected AbstractDrawing(GUID id) {
 
   protected AbstractDrawing(AbstractDrawing other) {
     // The only thing we don't preserve is the ID.
-    this.id = other.id;
+    this.id = new GUID();
     this.layer = other.layer;
     this.name = other.name;
   }