Merge pull request #72 from bogovicj/n5-2025March

chore/refactor: update n5-universe

Author: StephanPreibisch

pom.xml

@@ -119,6 +119,9 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
 		<n5-google-cloud.version>4.1.0</n5-google-cloud.version>
 		<n5-zarr.version>1.3.1</n5-zarr.version>
 		<n5-aws-s3.version>4.1.1</n5-aws-s3.version>-->
+
+		<n5-universe.version>2.1.0</n5-universe.version>
+
 	</properties>
 
 	<repositories>

src/main/java/net/preibisch/mvrecon/fiji/datasetmanager/FileListDatasetDefinition.java

@@ -63,7 +63,7 @@
 
 import javax.swing.JLabel;
 
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import bdv.export.ExportMipmapInfo;
 import bdv.export.ProgressWriter;

src/main/java/net/preibisch/mvrecon/fiji/plugin/resave/ParametersResaveN5Api.java

@@ -32,7 +32,7 @@
 import java.util.stream.Collectors;
 
 import org.janelia.saalfeldlab.n5.Compression;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import bdv.export.ExportMipmapInfo;
 import bdv.export.ProposeMipmaps;

src/main/java/net/preibisch/mvrecon/fiji/plugin/resave/Resave_N5Api.java

@@ -40,7 +40,7 @@
 import org.janelia.saalfeldlab.n5.Compression;
 import org.janelia.saalfeldlab.n5.DataType;
 import org.janelia.saalfeldlab.n5.N5Writer;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import bdv.export.ExportMipmapInfo;
 import bdv.export.ProgressWriter;

src/main/java/net/preibisch/mvrecon/fiji/spimdata/explorer/popup/ResavePopup.java

@@ -35,7 +35,7 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import bdv.export.ExportMipmapInfo;
 import bdv.export.ProgressWriter;

src/main/java/net/preibisch/mvrecon/fiji/spimdata/imgloaders/AllenOMEZarrLoader.java

@@ -25,7 +25,7 @@
 import java.net.URI;
 import java.util.Map;
 
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import bdv.ViewerSetupImgLoader;
 import bdv.img.n5.N5ImageLoader;

src/main/java/net/preibisch/mvrecon/fiji/spimdata/imgloaders/OMEZarrAttibutes.java

@@ -30,7 +30,7 @@
 import org.janelia.saalfeldlab.n5.DatasetAttributes;
 import org.janelia.saalfeldlab.n5.N5Reader;
 import org.janelia.saalfeldlab.n5.universe.N5Factory;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 import org.janelia.saalfeldlab.n5.universe.metadata.axes.Axis;
 import org.janelia.saalfeldlab.n5.universe.metadata.ome.ngff.v04.OmeNgffMultiScaleMetadata;
 import org.janelia.saalfeldlab.n5.universe.metadata.ome.ngff.v04.OmeNgffMultiScaleMetadata.OmeNgffDataset;

src/main/java/net/preibisch/mvrecon/fiji/spimdata/interestpoints/InterestPointsN5.java

@@ -36,7 +36,7 @@
 import org.janelia.saalfeldlab.n5.N5Reader;
 import org.janelia.saalfeldlab.n5.N5Writer;
 import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import mpicbg.spim.data.sequence.ViewId;
 import net.imglib2.RandomAccess;

src/main/java/net/preibisch/mvrecon/fiji/spimdata/pointspreadfunctions/PointSpreadFunction.java

@@ -29,7 +29,7 @@
 import org.janelia.saalfeldlab.n5.N5Reader;
 import org.janelia.saalfeldlab.n5.N5Writer;
 import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 
 import mpicbg.spim.data.sequence.ViewId;
 import net.imglib2.img.Img;

src/main/java/net/preibisch/mvrecon/process/export/ExportN5Api.java

@@ -42,7 +42,7 @@
 import org.janelia.saalfeldlab.n5.N5Writer;
 import org.janelia.saalfeldlab.n5.hdf5.N5HDF5Writer;
 import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
-import org.janelia.saalfeldlab.n5.universe.N5Factory.StorageFormat;
+import org.janelia.saalfeldlab.n5.universe.StorageFormat;
 import org.janelia.saalfeldlab.n5.universe.metadata.ome.ngff.v04.OmeNgffMultiScaleMetadata;
 
 import bdv.export.ExportMipmapInfo;