Modify submodule to point to teledyne-dalsa-GigE branch of micro-manager/mmCoreAnd Devices

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "mmCoreAndDevices"]
 	path = mmCoreAndDevices
-	url=https://github.com/micro-manager/mmCoreAndDevices.git
-	branch = main
+	url=https://github.com/microcombustion/mmCoreAndDevices.git
+	branch = teledyne-dalsa-genie-GigE

mmstudio/src/main/java/org/micromanager/Application.java

@@ -41,22 +41,22 @@ public interface Application {
     * poll each device in the system for its current state, which may take
     * significant time. Compare refreshGUIFromCache().
     */
-   public void refreshGUI();
+   void refreshGUI();
 
    /**
     * Updates the GUI so that its state reflects the current state of the
     * hardware (as understood by the Micro-Manager Core). This method will
     * pull values from the Core's System State Cache, which is fast but may not
     * necessarily reflect the actual state of hardware.
     */
-   public void refreshGUIFromCache();
+   void refreshGUIFromCache();
 
    /**
     * Set the exposure time for the current channel (if any). Equivalent to
     * updating the exposure time field in the main window.
     * @param exposureMs Exposure time, in milliseconds.
     */
-   public void setExposure(double exposureMs);
+   void setExposure(double exposureMs);
 
    /**
     * Updates the exposure time associated with the given preset. If the
@@ -68,7 +68,7 @@ public interface Application {
     *        channel that should be updated.
     * @param exposure New exposure time to set.
     */
-   public void setChannelExposureTime(String channelGroup, String channel,
+   void setChannelExposureTime(String channelGroup, String channel,
            double exposure);
 
    /**
@@ -80,7 +80,7 @@ public void setChannelExposureTime(String channelGroup, String channel,
     * @param defaultExp Default value to return if no exposure time is found.
     * @return Exposure time for the channel, or the provided default value.
     */
-   public double getChannelExposureTime(String channelGroup, String channel,
+   double getChannelExposureTime(String channelGroup, String channel,
            double defaultExp);
 
    /**
@@ -93,18 +93,18 @@ public double getChannelExposureTime(String channelGroup, String channel,
     * @throws IOException If shouldOverwrite is false and there is already a
     *         file at the chosen path.
     */
-   public void saveConfigPresets(String path, boolean allowOverwrite) throws IOException;
+   void saveConfigPresets(String path, boolean allowOverwrite) throws IOException;
 
    /**
     * Pop up the dialog used to configure the autofocus settings for the
     * current autofocus device.
     */
-   public void showAutofocusDialog();
+   void showAutofocusDialog();
 
    /**
     * Display the position list dialog.
     */
-   public void showPositionList();
+   void showPositionList();
 
    /**
     * Set the default camera's ROI -- a convenience function. Will stop and
@@ -113,32 +113,32 @@ public double getChannelExposureTime(String channelGroup, String channel,
     * @param rect Rectangle defining the ROI
     * @throws Exception if there is an error in the Core when setting the ROI
     */
-   public void setROI(Rectangle rect) throws Exception;
+   void setROI(Rectangle rect) throws Exception;
 
    /**
     * Move the main Micro-Manager window to the top of the user interface.
     */
-   public void makeActive();
+   void makeActive();
 
    /**
     * Provide access to the main window of the program. This is largely
     * intended to allow client code to position their windows with respect
     * to the main window.
     * @return the main Window
     */
-   public JFrame getMainWindow();
+   JFrame getMainWindow();
 
    /**
     * Provides access to the application skin API for determining colors for
     * various GUI components.
     * @return ApplicationSkin instance.
     */
-   public ApplicationSkin skin();
+   ApplicationSkin skin();
 
    /**
     * Provides access to the application skin API for determining colors for
     * various GUI components. Identical to skin() except in name.
     * @return ApplicationSkin instance.
     */
-   public ApplicationSkin getApplicationSkin();
+   ApplicationSkin getApplicationSkin();
 }

mmstudio/src/main/java/org/micromanager/ApplicationSkin.java

@@ -41,7 +41,7 @@ public interface ApplicationSkin {
    /**
     * Available skins used by the application.
     */
-   public enum SkinMode {
+   enum SkinMode {
       DAY("Day"), 
       NIGHT("Night");
       private final String desc_;
@@ -80,54 +80,54 @@ public static SkinMode fromString(String desc) {
     * application-wide event bus.
     * @param mode The mode to use.
     */
-   public void setSkin(SkinMode mode);
+   void setSkin(SkinMode mode);
 
    /**
     * @return the current Micro-Manager skin.
     */
-   public SkinMode getSkin();
+   SkinMode getSkin();
 
    /**
     * Return the current background color for normal GUI elements.
     * @return current background color
     */
-   public Color getBackgroundColor();
+   Color getBackgroundColor();
 
    /**
     * Return the current "lighter" background color for highlighted or
     * otherwise differentiated GUI elements.
     * @return light background color
     */
-   public Color getLightBackgroundColor();
+   Color getLightBackgroundColor();
 
    /**
     * Return the current "disabled" background color.
     * @return "disabled" background color
     */
-   public Color getDisabledBackgroundColor();
+   Color getDisabledBackgroundColor();
 
    /**
     * Return the current color for enabled text.
     * @return current color for enabled text
     */
-   public Color getEnabledTextColor();
+   Color getEnabledTextColor();
 
    /**
     * Return the current color for disabled text.
     * @return current color for disabled text.
     */
-   public Color getDisabledTextColor();
+   Color getDisabledTextColor();
 
    /**
     * If the specified mode is not currently active, then we switch to that
     * mode without updating the UI. Useful if a component must be generated
     * with a nonstandard look-and-feel.
     * @param mode SkinMode to switch to (but without updating the UI)
     */
-   public void suspendToMode(SkinMode mode);
+   void suspendToMode(SkinMode mode);
 
    /**
     * Restores the mode that was active before suspendToMode was called.
     */
-   public void resume();
+   void resume();
 }

mmstudio/src/main/java/org/micromanager/PropertyManager.java

@@ -0,0 +1,47 @@
+package org.micromanager;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Provides access to PropertyMaps.  And instance of this interface is obtained
+ * through Studio.properties() and Studio.propertyManager();
+ */
+public interface PropertyManager {
+
+   /**
+    * Provides an easy way for a script to obtain a PropertyMap Builder
+    * @return PropertyMap Builder
+    */
+   PropertyMap.Builder propertyMapBuilder();
+
+   /**
+    * Returns an empty property map.
+    * @return empty property map
+    */
+   PropertyMap emptyPropertyMap();
+
+   /**
+    * Creates a property map from its JSON-serialized form.
+    * JSON format is described in {@link org.micromanager.internal.propertymap.PropertyMapJSONSerializer}
+    * @param json json formatted String to be converted into a PropertyMap
+    * @return PropertyMap result from conversion
+    * @throws IOException if {@code json} is invalid JSON or if it does not
+    * represent a valid property map
+    */
+   PropertyMap fromJSON(String json) throws IOException;
+
+   /**
+    * Create a property map from its JSON-serialized form stored in a file.
+    *
+    * JSON format is described in {@link org.micromanager.internal.propertymap.PropertyMapJSONSerializer}
+    * @param file File containing JSON serialized Properties.
+    * @return PropertyMap resulting from conversion fo JSON in file.
+    * @throws IOException if there was a problem reading {@code file} or if the
+    * file contained invalid JSON or if the JSON did not represent a valid
+    * property map
+    * @throws java.io.FileNotFoundException this subclass of {@code IOException}
+    * is thrown if {@code file} does not exist
+    */
+   PropertyMap loadJSON(File file) throws IOException;
+}

mmstudio/src/main/java/org/micromanager/PropertyMap.java

@@ -83,7 +83,7 @@ public interface PropertyMap {
     * This is only used for interchange purposes, for example when performing
     * bulk operations on property maps.
     */
-   public interface OpaqueValue {
+   interface OpaqueValue {
       /**
        * 
        * @return 

mmstudio/src/main/java/org/micromanager/PropertyMaps.java

@@ -48,8 +48,8 @@ public static PropertyMap emptyPropertyMap() {
 
    /**
     * Create a property map from its JSON-serialized form.
-    * @param json
-    * @return
+    * @param json json formatted String to be converted into a PropertyMap
+    * @return PropertyMap result from conversion
     * @throws IOException if {@code json} is invalid JSON or if it does not
     * represent a valid property map
     */