diff --git a/pom.xml b/pom.xml index f8adb6c9..5a303286 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.embl.mobie mobie-viewer-fiji - 5.5.8-SNAPSHOT + 5.5.8 diff --git a/src/main/java/org/embl/mobie/MoBIE.java b/src/main/java/org/embl/mobie/MoBIE.java index 70531515..2b7eb429 100644 --- a/src/main/java/org/embl/mobie/MoBIE.java +++ b/src/main/java/org/embl/mobie/MoBIE.java @@ -39,6 +39,7 @@ import org.embl.mobie.io.ImageDataFormat; import org.embl.mobie.io.imagedata.ImageData; import org.embl.mobie.io.util.IOHelper; +import org.embl.mobie.io.util.S3Utils; import org.embl.mobie.lib.*; import org.embl.mobie.lib.bdv.BdvViewingMode; import org.embl.mobie.lib.data.*; @@ -116,6 +117,13 @@ public MoBIE( String uri, MoBIESettings settings ) throws IOException this.settings = settings; this.projectLocation = uri; + if ( MoBIEHelper.notNullOrEmpty( settings.values.getS3AccessAndSecretKey()[0] ) ) + { + // This is not needed anymore for image data, but for other data types + // For image data this is now part of ImageDataFormat + S3Utils.setS3AccessAndSecretKey( settings.values.getS3AccessAndSecretKey() ); + } + if ( settings.values.getProjectType().equals( ProjectType.CollectionTable ) ) { IJ.log("\n# MoBIE" ); diff --git a/src/test/java/debug/DebugIssue1199.java b/src/test/java/debug/DebugIssue1199.java new file mode 100644 index 00000000..d8c10a42 --- /dev/null +++ b/src/test/java/debug/DebugIssue1199.java @@ -0,0 +1,53 @@ +/*- + * #%L + * Fiji viewer for MoBIE projects + * %% + * Copyright (C) 2018 - 2024 EMBL + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ +package debug; + +import net.imagej.ImageJ; +import org.embl.mobie.MoBIE; +import org.embl.mobie.MoBIESettings; +import org.embl.mobie.command.open.project.OpenMoBIEProjectCommand; +import org.embl.mobie.command.open.project.OpenMoBIEProjectExpertCommand; +import org.embl.mobie.command.open.project.OpenMoBIEProjectWithS3CredentialsCommand; + +import java.io.IOException; + +public class DebugIssue1199 +{ + public static void main( String[] args ) throws IOException + { + final ImageJ imageJ = new ImageJ(); + imageJ.ui().showUI(); + + OpenMoBIEProjectWithS3CredentialsCommand command = new OpenMoBIEProjectWithS3CredentialsCommand(); + command.uri = "https://s3.gwdg.de/fruitfly-larva-em"; + command.s3AccessKey = "a"; + command.s3SecretKey = "b"; + command.run(); + } +}