remove DataStorage class and use SaveData from api/data

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

@@ -1,7 +1,7 @@
 package org.micromanager.lightsheetmanager.api;
 
+import org.micromanager.lightsheetmanager.api.data.SaveMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultAutofocusSettings;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 
 /**
  * Base acquisition settings for all microscopes.
@@ -43,7 +43,7 @@ interface Builder<T extends Builder<T>>  {
          *
          * @param saveMode the save mode
          */
-        T saveMode(final DataStorage.SaveMode saveMode);
+        T saveMode(final SaveMode saveMode);
 
         /**
          * Returns the autofocus settings builder.
@@ -108,7 +108,7 @@ interface Builder<T extends Builder<T>>  {
      *
      * @return the save mode of the acquisition.
      */
-    DataStorage.SaveMode saveMode();
+    SaveMode saveMode();
 
     /**
      * Returns the autofocus settings.

src/main/java/org/micromanager/lightsheetmanager/api/data/SaveMode.java

@@ -1,7 +1,6 @@
 package org.micromanager.lightsheetmanager.api.data;
 
 import org.micromanager.data.Datastore;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 
 public enum SaveMode {
     SINGLEPLANE_TIFF_SERIES("Single Plane TIFF"),
@@ -14,7 +13,7 @@ public enum SaveMode {
         text_ = text;
     }
 
-    public static Datastore.SaveMode convert(final DataStorage.SaveMode mode) {
+    public static Datastore.SaveMode convert(final SaveMode mode) {
         switch (mode) {
             case ND_TIFF:
                 return Datastore.SaveMode.ND_TIFF;

src/main/java/org/micromanager/lightsheetmanager/api/internal/BaseAcquisitionSettings.java

@@ -11,7 +11,7 @@
 import org.micromanager.lightsheetmanager.api.StageScanSettings;
 import org.micromanager.lightsheetmanager.api.TimingSettings;
 import org.micromanager.lightsheetmanager.api.VolumeSettings;
-import org.micromanager.lightsheetmanager.model.DataStorage;
+import org.micromanager.lightsheetmanager.api.data.SaveMode;
 
 /**
  * Base acquisition settings for all microscopes.
@@ -24,7 +24,7 @@ public abstract static class Builder<T extends Builder<T>> implements Acquisitio
         private String saveNamePrefix_ = "Experiment";
         private boolean saveDuringAcq_ = false;
         private boolean demoMode_ = false;
-        private DataStorage.SaveMode saveMode_ = DataStorage.SaveMode.ND_TIFF;
+        private SaveMode saveMode_ = SaveMode.ND_TIFF;
 
         private DefaultAutofocusSettings.Builder afBuilder_ = DefaultAutofocusSettings.builder();
         private ChannelSettings.Builder channelBuilder_ = DefaultChannelSettings.builder();
@@ -92,7 +92,7 @@ public T demoMode(final boolean state) {
          * @param saveMode the save mode
          */
         @Override
-        public T saveMode(final DataStorage.SaveMode saveMode) {
+        public T saveMode(final SaveMode saveMode) {
             saveMode_ = saveMode;
             return self();
         }
@@ -133,7 +133,7 @@ public ChannelSettings.Builder channelBuilder() {
     private final String saveDirectory_;
     private final boolean saveDuringAcq_;
     private final boolean demoMode_;
-    private final DataStorage.SaveMode saveMode_;
+    private final SaveMode saveMode_;
 
     private final DefaultAutofocusSettings autofocus_;
     private final ChannelSettings channels_;
@@ -200,7 +200,7 @@ public boolean demoMode() {
      * @return the save mode
      */
     @Override
-    public DataStorage.SaveMode saveMode() {
+    public SaveMode saveMode() {
         return saveMode_;
     }
 

src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java

@@ -4,6 +4,7 @@
 import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
 import org.micromanager.lightsheetmanager.api.AcquisitionSettings;
+import org.micromanager.lightsheetmanager.api.data.SaveMode;
 import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings;
 import org.micromanager.lightsheetmanager.gui.components.Button;
 import org.micromanager.lightsheetmanager.gui.components.CheckBox;
@@ -13,7 +14,6 @@
 import org.micromanager.lightsheetmanager.gui.components.TextField;
 import org.micromanager.lightsheetmanager.gui.data.Icons;
 import org.micromanager.lightsheetmanager.gui.utils.DialogUtils;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 import org.micromanager.lightsheetmanager.model.SettingsAdapter;
 import org.micromanager.lightsheetmanager.model.utils.FileUtils;
 
@@ -32,7 +32,7 @@ public class SavePanel extends Panel implements SettingsListener {
     private Button btnBrowse_;
     private Button btnOpen_;
 
-    private ComboBox<DataStorage.SaveMode> cbxSaveMode_;
+    private ComboBox<SaveMode> cbxSaveMode_;
     private CheckBox cbxSaveWhileAcquiring_;
 
     private Button btnSaveSettings_;
@@ -108,7 +108,7 @@ public void createUserInterface() {
         btnBrowse_ = new Button("...", 26, 20);
         btnOpen_ = new Button(Icons.FOLDER, 26, 20);
 
-        cbxSaveMode_ = new ComboBox<>(DataStorage.SaveMode.values(),
+        cbxSaveMode_ = new ComboBox<>(SaveMode.values(),
                 acqSettings.saveMode(), 110, 20);
 
         cbxSaveWhileAcquiring_ = new CheckBox("Save images during acquisition",

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java

@@ -20,7 +20,6 @@
 import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings;
 import org.micromanager.lightsheetmanager.gui.tabs.acquisition.DurationPanel;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 import org.micromanager.lightsheetmanager.model.autofocus.AutofocusAdapter;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 import org.micromanager.lightsheetmanager.model.devices.cameras.CameraBase;
@@ -49,7 +48,6 @@ public abstract class AcquisitionEngine implements AcquisitionManager, MMAcquist
 
     private final AutofocusAdapter autofocus_;
 
-    private DataStorage data_; // TODO: use this, has enum that needs moved/deleted?
     protected Datastore datastore_;
     protected Pipeline curPipeline_;
     protected long nextWakeTime_ = -1;
@@ -63,7 +61,6 @@ public AcquisitionEngine(final LightSheetManager model) {
         studio_ = model.studio();
         core_ = model.core();
 
-        data_ = new DataStorage(studio_);
         autofocus_ = new AutofocusAdapter(model_);
 
         // default settings

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDispim.java

@@ -18,9 +18,9 @@
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.api.data.ChannelMode;
+import org.micromanager.lightsheetmanager.api.data.SaveMode;
 import org.micromanager.lightsheetmanager.api.internal.DispimAcquisitionSettings;
 import org.micromanager.lightsheetmanager.api.internal.DefaultTimingSettings;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 import org.micromanager.lightsheetmanager.model.utils.FileUtils;
 import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.PLogicDispim;
@@ -189,11 +189,11 @@ boolean run() {
 
         DefaultDatastore result = new DefaultDatastore(studio_);
         try {
-            if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
+            if (acqSettings_.saveMode() == SaveMode.ND_TIFF) {
                 DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
-            } else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
+            } else if (acqSettings_.saveMode() == SaveMode.MULTIPAGE_TIFF) {
                 DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);
-            } else if (acqSettings_.saveMode() == DataStorage.SaveMode.SINGLEPLANE_TIFF_SERIES) {
+            } else if (acqSettings_.saveMode() == SaveMode.SINGLEPLANE_TIFF_SERIES) {
                 DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.SINGLEPLANE_TIFF_SERIES);
             } else {
                 studio_.logs().showError("Unsupported save mode: " + acqSettings_.saveMode());
@@ -571,8 +571,7 @@ void finish() {
                     acqSettings_.saveDirectory(), acqSettings_.saveNamePrefix());
             try {
                 // convert from DataStorage.SaveMode to Datastore.SaveMode
-                final Datastore.SaveMode saveMode =
-                        DataStorage.SaveMode.convert(acqSettings_.saveMode());
+                final Datastore.SaveMode saveMode = SaveMode.convert(acqSettings_.saveMode());
                 datastore_.save(saveMode, savePath);
             } catch (Exception e) {
                 model_.studio().logs().showError("could not save the acquisition data to: \n" + savePath);

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java

@@ -20,10 +20,10 @@
 import org.micromanager.lightsheetmanager.api.data.CameraLibrary;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.api.data.ChannelMode;
+import org.micromanager.lightsheetmanager.api.data.SaveMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultTimingSettings;
 import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings;
 import org.micromanager.lightsheetmanager.gui.utils.DialogUtils;
-import org.micromanager.lightsheetmanager.model.DataStorage;
 import org.micromanager.lightsheetmanager.LightSheetManager;
 import org.micromanager.lightsheetmanager.model.PLogicScape;
 import org.micromanager.lightsheetmanager.model.devices.DeviceAdapter;
@@ -261,11 +261,11 @@ boolean run() {
 
         // This sets the preferred save mode for DefaultDatastore, this value
         // is used in the MMAcquisition constructor to set the Storage object.
-        if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
+        if (acqSettings_.saveMode() == SaveMode.ND_TIFF) {
             DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
-        } else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
+        } else if (acqSettings_.saveMode() == SaveMode.MULTIPAGE_TIFF) {
             DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);
-        } else if (acqSettings_.saveMode() == DataStorage.SaveMode.SINGLEPLANE_TIFF_SERIES) {
+        } else if (acqSettings_.saveMode() == SaveMode.SINGLEPLANE_TIFF_SERIES) {
             DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.SINGLEPLANE_TIFF_SERIES);
         } else {
             studio_.logs().showError("Unsupported save mode: " + acqSettings_.saveMode());
@@ -796,8 +796,7 @@ void finish() {
                     acqSettings_.saveDirectory(), acqSettings_.saveNamePrefix());
             try {
                 // convert from DataStorage.SaveMode to Datastore.SaveMode
-                final Datastore.SaveMode saveMode =
-                        DataStorage.SaveMode.convert(acqSettings_.saveMode());
+                final Datastore.SaveMode saveMode = SaveMode.convert(acqSettings_.saveMode());
                 datastore_.save(saveMode, savePath);
             } catch (Exception e) {
                 model_.studio().logs().showError("could not save the acquisition data to: \n" + savePath);