updated paths for mmcorej

micro-manager · Apr 7, 2020 · 0d2d194 · 0d2d194
1 parent 08863d1
commit 0d2d194
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/org/micromanager/acqj/api/AcqEngMetadata.java b/src/main/java/org/micromanager/acqj/api/AcqEngMetadata.java
@@ -24,9 +24,9 @@
 import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.acqj.internal.acqengj.Engine;
 import org.micromanager.acqj.internal.acqengj.AffineTransformUtils;
 

diff --git a/src/main/java/org/micromanager/acqj/api/Acquisition.java b/src/main/java/org/micromanager/acqj/api/Acquisition.java
@@ -27,8 +27,8 @@
 import java.util.concurrent.TimeUnit;
 import mmcorej.CMMCore;
 import mmcorej.TaggedImage;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.acqj.internal.acqengj.Engine;
 
 /**

diff --git a/src/main/java/org/micromanager/acqj/api/AcquisitionEvent.java b/src/main/java/org/micromanager/acqj/api/AcquisitionEvent.java
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONException;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.acqj.api.mda.XYStagePosition;
 import org.micromanager.acqj.internal.acqengj.AffineTransformUtils;
 import org.micromanager.acqj.internal.acqengj.Engine;

diff --git a/src/main/java/org/micromanager/acqj/api/AcquisitionInterface.java b/src/main/java/org/micromanager/acqj/api/AcquisitionInterface.java
@@ -6,7 +6,7 @@
 package org.micromanager.acqj.api;
 
 import java.util.Iterator;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 
 /**
  * General interface for acquisitions

diff --git a/src/main/java/org/micromanager/acqj/api/DataSink.java b/src/main/java/org/micromanager/acqj/api/DataSink.java
@@ -1,7 +1,7 @@
 package org.micromanager.acqj.api;
 
 import mmcorej.TaggedImage;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 
 /**
  * Where the acquisition sends data to. Conventionally would be a

diff --git a/src/main/java/org/micromanager/acqj/api/mda/MultiDAcquisition.java b/src/main/java/org/micromanager/acqj/api/mda/MultiDAcquisition.java
@@ -6,7 +6,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.acqj.api.AcqEngMetadata;
 import org.micromanager.acqj.api.AcquisitionEvent;
 import org.micromanager.acqj.internal.acqengj.AcquisitionEventIterator;

diff --git a/src/main/java/org/micromanager/acqj/api/mda/XYStagePosition.java b/src/main/java/org/micromanager/acqj/api/mda/XYStagePosition.java
@@ -21,8 +21,8 @@
 import java.util.ArrayList;
 import java.util.Objects;
 import mmcorej.CMMCore;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import mmcorej.org.json.JSONArray;
+import mmcorej.org.json.JSONObject;
 import org.micromanager.acqj.internal.acqengj.Engine;
 import org.micromanager.acqj.internal.acqengj.Engine;
 import org.micromanager.acqj.internal.acqengj.AffineTransformUtils;