From 0d2d1949e1c9fab5eab6bb78295788d0b6fb85aa Mon Sep 17 00:00:00 2001
From: Henry Pinkard <henry.pinkard@gmail.com>
Date: Tue, 7 Apr 2020 08:11:11 -0700
Subject: [PATCH] updated paths for mmcorej

---
 src/main/java/org/micromanager/acqj/api/AcqEngMetadata.java | 6 +++---
 src/main/java/org/micromanager/acqj/api/Acquisition.java    | 4 ++--
 .../java/org/micromanager/acqj/api/AcquisitionEvent.java    | 6 +++---
 .../org/micromanager/acqj/api/AcquisitionInterface.java     | 2 +-
 src/main/java/org/micromanager/acqj/api/DataSink.java       | 2 +-
 .../org/micromanager/acqj/api/mda/MultiDAcquisition.java    | 2 +-
 .../java/org/micromanager/acqj/api/mda/XYStagePosition.java | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/micromanager/acqj/api/AcqEngMetadata.java b/src/main/java/org/micromanager/acqj/api/AcqEngMetadata.java
index b04fa8f..1538241 100644
--- 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
index 4fa83c4..fad1a33 100644
--- 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
index aa2f389..0782fd6 100644
--- 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
index ed18ccd..50100aa 100644
--- 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
index 523b9b6..8c857c5 100644
--- 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
index 651a14f..3697d11 100644
--- 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
index 2bf198b..9bfefd0 100644
--- 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;