From e59a350e3bf55dc5e830376b4ebc73a2ecd7b492 Mon Sep 17 00:00:00 2001
From: Nico Stuurman <nstuurman@altoslabs.com>
Date: Wed, 29 Nov 2023 14:55:29 -0800
Subject: [PATCH 1/2] mvn build: Update path to Swig generated file, as it
 appears to have been changed.

---
 MMCoreJ_wrap/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MMCoreJ_wrap/pom.xml b/MMCoreJ_wrap/pom.xml
index 6be3fecd5..119c3ec42 100644
--- a/MMCoreJ_wrap/pom.xml
+++ b/MMCoreJ_wrap/pom.xml
@@ -66,7 +66,7 @@
 						</goals>
 						<configuration>
 							<sources>
-                        <source>../../build/intermediates/Swig</source>
+                        <source>../build/intermediates/Swig</source>
 							</sources>
 						</configuration>
 					</execution>

From 061cdcbde7cf3a5eda4cd5b53b71bacdb33b7938 Mon Sep 17 00:00:00 2001
From: Nico Stuurman <nstuurman@altoslabs.com>
Date: Wed, 29 Nov 2023 15:11:08 -0800
Subject: [PATCH 2/2] MMCoreJ build: Move TaggeImage to a more logical place so
 that it does not need to be copied on each and every build.

---
 MMCoreJ_wrap/build.xml                                    | 4 +---
 MMCoreJ_wrap/{ => src/main/java/mmcorej}/TaggedImage.java | 0
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename MMCoreJ_wrap/{ => src/main/java/mmcorej}/TaggedImage.java (100%)

diff --git a/MMCoreJ_wrap/build.xml b/MMCoreJ_wrap/build.xml
index d2f0b5c8b..994bb5cd6 100644
--- a/MMCoreJ_wrap/build.xml
+++ b/MMCoreJ_wrap/build.xml
@@ -10,12 +10,10 @@
 	<target name="compile" depends="prepare" description="Compile Java sources">
 		<mkdir dir="${intdir}"/>
 
-		<copy todir="${srcdir}/${package}" file="TaggedImage.java"/>
-
 		<mm-javac destdir="${intdir}">
 			<src path="${json.srcdir}"/>
+			<include name="mmcorej/*"/>
 			<include name="mmcorej/org/json/**"/>
-
 			<src path="${srcdir}"/>
 			<include name="${package}/**"/>
 		</mm-javac>
diff --git a/MMCoreJ_wrap/TaggedImage.java b/MMCoreJ_wrap/src/main/java/mmcorej/TaggedImage.java
similarity index 100%
rename from MMCoreJ_wrap/TaggedImage.java
rename to MMCoreJ_wrap/src/main/java/mmcorej/TaggedImage.java