Merge pull request #325 from bls337/main

use <> for iterators

Author: bls337

src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java

@@ -12,7 +12,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
     public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2025";
     public static final String description = "A plugin to control various types of light sheet microscopes.";
     public static final String menuName = "Light Sheet Manager";
-    public static final String version = "0.5.0";
+    public static final String version = "0.5.1";
 
     private Studio studio_;
     private LightSheetManager model_;

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

@@ -34,7 +34,7 @@ public static Iterator<AcquisitionEvent> createTimelapseMultiChannelVolumeAcqEve
       }
       Function<AcquisitionEvent, Iterator<AcquisitionEvent>> timelapse =
               timelapse(acquisitionSettings.numTimePoints(),
-                      (double) acquisitionSettings.timePointInterval());
+                    acquisitionSettings.timePointInterval());
 
       if (acquisitionSettings.numChannels() == 1) {
          throw new RuntimeException("Expected multiple channels but only one found");
@@ -167,10 +167,10 @@ public static Iterator<AcquisitionEvent> createAcqEvents(
    }
 
    public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> cameras(String[] cameraDeviceNames) {
-      return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
+      return (AcquisitionEvent event) -> new Iterator<>() {
 
          private int cameraIndex_ = 0;
-         private String[] cameraDeviceNames_ = cameraDeviceNames;
+         private final String[] cameraDeviceNames_ = cameraDeviceNames;
 
          @Override
          public boolean hasNext() {
@@ -190,7 +190,7 @@ public AcquisitionEvent next() {
 
    public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> zStack(
            int startSliceIndex, int stopSliceIndex) {
-      return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
+      return (AcquisitionEvent event) -> new Iterator<>() {
 
          private int zIndex_ = startSliceIndex;
 
@@ -212,7 +212,7 @@ public AcquisitionEvent next() {
 
    public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> timelapse(
            int numTimePoints, Double intervalMs) {
-      return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
+      return (AcquisitionEvent event) -> new Iterator<>() {
 
          int frameIndex_ = 0;
 
@@ -243,7 +243,7 @@ public AcquisitionEvent next() {
     */
    public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> channels(
            ChannelSpec[] channelList) {
-      return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
+      return (AcquisitionEvent event) -> new Iterator<>() {
          int index = 0;
 
          @Override
@@ -289,7 +289,7 @@ public AcquisitionEvent next() {
     */
    public static Function<AcquisitionEvent, Iterator<AcquisitionEvent>> positions(
            PositionList positionList) {
-      return (AcquisitionEvent event) -> new Iterator<AcquisitionEvent>() {
+      return (AcquisitionEvent event) -> new Iterator<>() {
          int index = 0;
 
          @Override