Move common acquisition settings onto BaseAcquisitionSettings

src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettings.java

@@ -1,5 +1,7 @@
 package org.micromanager.lightsheetmanager.api;
 
+import org.micromanager.lightsheetmanager.api.data.CameraData;
+import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.SaveMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAutofocusSettings;
 
@@ -45,6 +47,62 @@ interface Builder<T extends Builder<T>>  {
          */
         T saveMode(final SaveMode saveMode);
 
+        /**
+         * Sets the camera mode.
+         *
+         * @param mode the camera mode
+         * @return {@code this} builder
+         */
+        T cameraMode(final CameraMode mode);
+
+        /**
+         * Sets the imaging camera order.
+         *
+         * @param order the imaging camera order
+         * @return {@code this} builder
+         */
+        T imagingCameraOrder(final CameraData[] order);
+
+        /**
+         * Sets the acquisition to use multiple positions.
+         *
+         * @param state true to use multiple positions
+         * @return {@code this} builder
+         */
+        T useMultiplePositions(final boolean state);
+
+        /**
+         * Sets the delay after a move when using multiple positions.
+         *
+         * @param postMoveDelay the delay in milliseconds
+         * @return {@code this} builder
+         */
+        T postMoveDelay(final int postMoveDelay);
+
+        /**
+         * Sets the acquisition to use time points.
+         *
+         * @param state true to use time points
+         * @return {@code this} builder
+         */
+        T useTimePoints(final boolean state);
+
+        /**
+         * Sets the number of time points.
+         *
+         * @param numTimePoints the number of time points
+         * @return {@code this} builder
+         */
+        T numTimePoints(final int numTimePoints);
+
+        /**
+         * Sets the time point interval between time points in seconds.
+         *
+         * @param timePointInterval the time point interval in seconds
+         * @return {@code this} builder
+         */
+        T timePointInterval(final double timePointInterval);
+
         /**
          * Returns the autofocus settings builder.
          *
@@ -112,6 +170,55 @@ interface Builder<T extends Builder<T>>  {
      */
     SaveMode saveMode();
 
+    /**
+     * Returns the camera mode.
+     *
+     * @return the camera mode.
+     */
+    CameraMode cameraMode();
+
+    /**
+     * Returns the imaging camera order.
+     *
+     * @return the imaging camera order
+     */
+    CameraData[] imagingCameraOrder();
+
+    /**
+     * Returns true if using multiple positions.
+     *
+     * @return true if using multiple positions.
+     */
+    boolean isUsingMultiplePositions();
+
+    /**
+     * Returns the post move delay in milliseconds.
+     *
+     * @return the post move delay in milliseconds.
+     */
+    int postMoveDelay();
+
+    /**
+     * Returns true if using time points.
+     *
+     * @return true if using time points.
+     */
+    boolean isUsingTimePoints();
+
+    /**
+     * Returns the number of time points.
+     *
+     * @return the number of time points.
+     */
+    int numTimePoints();
+
+    /**
+     * Returns the time point interval in seconds.
+     *
+     * @return the time point interval in seconds.
+     */
+    double timePointInterval();
+
     /**
      * Returns the autofocus settings.
      *

src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsDispim.java

@@ -1,7 +1,5 @@
 package org.micromanager.lightsheetmanager.api;
 
-import org.micromanager.lightsheetmanager.api.data.CameraData;
-import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 
 /**
@@ -72,34 +70,6 @@ public interface AcquisitionSettingsDispim extends AcquisitionSettings {
      */
     AcquisitionMode acquisitionMode();
 
-    /**
-     * Returns the camera mode.
-     *
-     * @return the camera mode.
-     */
-    CameraMode cameraMode();
-
-    /**
-     * Returns the imaging camera order.
-     *
-     * @return the imaging camera order
-     */
-    CameraData[] imagingCameraOrder();
-
-    /**
-     * Returns true if using time points.
-     *
-     * @return true if using time points.
-     */
-    boolean isUsingTimePoints();
-
-    /**
-     * Returns true if using multiple positions.
-     *
-     * @return true if using multiple positions.
-     */
-    boolean isUsingMultiplePositions();
-
     /**
      * Returns true if using hardware time points.
      *
@@ -114,27 +84,6 @@ public interface AcquisitionSettingsDispim extends AcquisitionSettings {
      */
     boolean isUsingAdvancedTiming();
 
-    /**
-     * Returns the number of time points.
-     *
-     * @return the number of time points.
-     */
-    int numTimePoints();
-
-    /**
-     * Returns the time point interval in seconds.
-     *
-     * @return the time point interval in seconds.
-     */
-    double timePointInterval();
-
-    /**
-     * Returns the post move delay in milliseconds.
-     *
-     * @return the post move delay in milliseconds.
-     */
-    int postMoveDelay();
-
     double liveScanPeriod();
 
     interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionSettings.Builder<T> {
@@ -147,38 +96,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
          */
         T acquisitionMode(final AcquisitionMode acqMode);
 
-        /**
-         * Sets the camera mode.
-         *
-         * @param cameraMode the camera mode.
-         * @return {@code this} builder
-         */
-        T cameraMode(final CameraMode cameraMode);
-
-        /**
-         * Sets the imaging camera order.
-         *
-         * @param order the imaging camera order
-         * @return {@code this} builder
-         */
-        T imagingCameraOrder(final CameraData[] order);
-
-        /**
-         * Sets the acquisition to use time points.
-         *
-         * @param state true to use time points
-         * @return {@code this} builder
-         */
-        T useTimePoints(final boolean state);
-
-        /**
-         * Sets the acquisition to use multiple positions.
-         *
-         * @param state true to use multiple positions
-         * @return {@code this} builder
-         */
-        T useMultiplePositions(final boolean state);
-
         /**
          * Sets the acquisition to use hardware time points.
          *
@@ -195,30 +112,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
          */
         T useAdvancedTiming(final boolean state);
 
-        /**
-         * Sets the number of time points.
-         *
-         * @param numTimePoints the number of time points
-         * @return {@code this} builder
-         */
-        T numTimePoints(final int numTimePoints);
-
-        /**
-         * Sets the time point interval between time points in seconds.
-         *
-         * @param timePointInterval the time point interval in seconds
-         * @return {@code this} builder
-         */
-        T timePointInterval(final double timePointInterval);
-
-        /**
-         * Sets the delay after a move when using multiple positions.
-         *
-         * @param postMoveDelay the delay in milliseconds
-         * @return {@code this} builder
-         */
-        T postMoveDelay(final int postMoveDelay);
-
         T liveScanPeriod(final double liveScanPeriod);
 
         /**