From 2413fbaf9ee403d3d4400eff0181e7274b6326ad Mon Sep 17 00:00:00 2001 From: Christian Tischer Date: Wed, 15 May 2024 15:20:57 +0200 Subject: [PATCH] Add legacy injector in more places... --- pom.xml | 3 +-- src/main/java/org/embl/mobie/lib/create/ProjectCreator.java | 2 +- src/main/java/org/embl/mobie/lib/hcs/HCSPattern.java | 2 ++ .../open/OpenIlastik2DImageAndSegmentationCommandTest.java | 2 +- .../open/OpenIlastikImagesAndSegmentationsCommandTest.java | 2 +- .../mobie/command/open/OpenOMEZarrHCSDatasetCommandTest.java | 2 +- .../command/open/omezarr/OpenOMEZARRFromS3CommandTest.java | 2 +- .../command/open/project/OpenMoBIEProjectCommandTest.java | 2 +- .../java/org/embl/mobie/lib/create/DatasetsCreatorTest.java | 2 ++ src/test/java/org/embl/mobie/lib/create/JSONValidator.java | 2 ++ .../org/embl/mobie/lib/create/RemoteMetadataCreatorTest.java | 2 ++ src/test/java/org/embl/mobie/lib/hcs/HCSPatternTest.java | 2 ++ 12 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f443372fe..85f0a4e63 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,7 @@ org.embl.mobie mobie-viewer-fiji - 5.0.0 - + 5.0.0-SNAPSHOT diff --git a/src/main/java/org/embl/mobie/lib/create/ProjectCreator.java b/src/main/java/org/embl/mobie/lib/create/ProjectCreator.java index 23269de47..5e54a1e19 100644 --- a/src/main/java/org/embl/mobie/lib/create/ProjectCreator.java +++ b/src/main/java/org/embl/mobie/lib/create/ProjectCreator.java @@ -47,7 +47,7 @@ */ public class ProjectCreator { - static { LegacyInjector.preinit(); } + static { net.imagej.patcher.LegacyInjector.preinit(); } private final File projectLocation; private final File projectJson; diff --git a/src/main/java/org/embl/mobie/lib/hcs/HCSPattern.java b/src/main/java/org/embl/mobie/lib/hcs/HCSPattern.java index be6d49ce7..011cab3da 100644 --- a/src/main/java/org/embl/mobie/lib/hcs/HCSPattern.java +++ b/src/main/java/org/embl/mobie/lib/hcs/HCSPattern.java @@ -44,6 +44,8 @@ public enum HCSPattern MolecularDevices, YokogawaCQ1; + static { net.imagej.patcher.LegacyInjector.preinit(); } + public static final String WELL = "W"; public static final String SITE = "S"; public static final String CHANNEL = "C"; diff --git a/src/test/java/org/embl/mobie/command/open/OpenIlastik2DImageAndSegmentationCommandTest.java b/src/test/java/org/embl/mobie/command/open/OpenIlastik2DImageAndSegmentationCommandTest.java index d24cf01fa..113048142 100644 --- a/src/test/java/org/embl/mobie/command/open/OpenIlastik2DImageAndSegmentationCommandTest.java +++ b/src/test/java/org/embl/mobie/command/open/OpenIlastik2DImageAndSegmentationCommandTest.java @@ -39,7 +39,7 @@ public class OpenIlastik2DImageAndSegmentationCommandTest { static { net.imagej.patcher.LegacyInjector.preinit(); } - @Test + //@Test public void test( ) { new ImageJ().ui().showUI(); // initialise SciJava Services diff --git a/src/test/java/org/embl/mobie/command/open/OpenIlastikImagesAndSegmentationsCommandTest.java b/src/test/java/org/embl/mobie/command/open/OpenIlastikImagesAndSegmentationsCommandTest.java index 8ecc608dc..e232fb902 100644 --- a/src/test/java/org/embl/mobie/command/open/OpenIlastikImagesAndSegmentationsCommandTest.java +++ b/src/test/java/org/embl/mobie/command/open/OpenIlastikImagesAndSegmentationsCommandTest.java @@ -39,7 +39,7 @@ public class OpenIlastikImagesAndSegmentationsCommandTest { static { net.imagej.patcher.LegacyInjector.preinit(); } - @Test + //@Test public void test( ) { new ImageJ().ui().showUI(); // initialise SciJava Services diff --git a/src/test/java/org/embl/mobie/command/open/OpenOMEZarrHCSDatasetCommandTest.java b/src/test/java/org/embl/mobie/command/open/OpenOMEZarrHCSDatasetCommandTest.java index 8cfcf7962..cca5351f2 100644 --- a/src/test/java/org/embl/mobie/command/open/OpenOMEZarrHCSDatasetCommandTest.java +++ b/src/test/java/org/embl/mobie/command/open/OpenOMEZarrHCSDatasetCommandTest.java @@ -7,7 +7,7 @@ class OpenOMEZarrHCSDatasetCommandTest { static { net.imagej.patcher.LegacyInjector.preinit(); } - @Test + //@Test public void test( ) { new ImageJ().ui().showUI(); // initialise SciJava Services diff --git a/src/test/java/org/embl/mobie/command/open/omezarr/OpenOMEZARRFromS3CommandTest.java b/src/test/java/org/embl/mobie/command/open/omezarr/OpenOMEZARRFromS3CommandTest.java index 072cc18d4..83ad027e7 100644 --- a/src/test/java/org/embl/mobie/command/open/omezarr/OpenOMEZARRFromS3CommandTest.java +++ b/src/test/java/org/embl/mobie/command/open/omezarr/OpenOMEZARRFromS3CommandTest.java @@ -6,7 +6,7 @@ class OpenOMEZARRFromS3CommandTest { - @Test + //@Test public void test( ) { OpenOMEZARRFromS3Command command = new OpenOMEZARRFromS3Command(); diff --git a/src/test/java/org/embl/mobie/command/open/project/OpenMoBIEProjectCommandTest.java b/src/test/java/org/embl/mobie/command/open/project/OpenMoBIEProjectCommandTest.java index 9c0c1e7d2..79c7292d1 100644 --- a/src/test/java/org/embl/mobie/command/open/project/OpenMoBIEProjectCommandTest.java +++ b/src/test/java/org/embl/mobie/command/open/project/OpenMoBIEProjectCommandTest.java @@ -12,7 +12,7 @@ class OpenMoBIEProjectCommandTest { static { net.imagej.patcher.LegacyInjector.preinit(); } - @Test + //@Test public void test( ) { new ImageJ().ui().showUI(); // initialise SciJava Services diff --git a/src/test/java/org/embl/mobie/lib/create/DatasetsCreatorTest.java b/src/test/java/org/embl/mobie/lib/create/DatasetsCreatorTest.java index ab69e82bb..6ac8d7cd5 100644 --- a/src/test/java/org/embl/mobie/lib/create/DatasetsCreatorTest.java +++ b/src/test/java/org/embl/mobie/lib/create/DatasetsCreatorTest.java @@ -47,6 +47,8 @@ class DatasetsCreatorTest { + static { net.imagej.patcher.LegacyInjector.preinit(); } + private ProjectCreator projectCreator; private DatasetsCreator datasetsCreator; diff --git a/src/test/java/org/embl/mobie/lib/create/JSONValidator.java b/src/test/java/org/embl/mobie/lib/create/JSONValidator.java index a9387111b..bed209f8f 100644 --- a/src/test/java/org/embl/mobie/lib/create/JSONValidator.java +++ b/src/test/java/org/embl/mobie/lib/create/JSONValidator.java @@ -43,6 +43,8 @@ public class JSONValidator { + static { net.imagej.patcher.LegacyInjector.preinit(); } + public static String datasetSchemaURL = "https://raw.githubusercontent.com/mobie/mobie.github.io/master/schema/dataset.schema.json"; public static String projectSchemaURL = "https://raw.githubusercontent.com/mobie/mobie.github.io/master/schema/project.schema.json"; public static String viewSchemaURL = "https://raw.githubusercontent.com/mobie/mobie.github.io/master/schema/view.schema.json"; diff --git a/src/test/java/org/embl/mobie/lib/create/RemoteMetadataCreatorTest.java b/src/test/java/org/embl/mobie/lib/create/RemoteMetadataCreatorTest.java index 0d3396292..f127cde2c 100644 --- a/src/test/java/org/embl/mobie/lib/create/RemoteMetadataCreatorTest.java +++ b/src/test/java/org/embl/mobie/lib/create/RemoteMetadataCreatorTest.java @@ -49,6 +49,8 @@ class RemoteMetadataCreatorTest { + static { net.imagej.patcher.LegacyInjector.preinit(); } + private ProjectCreator projectCreator; private RemoteMetadataCreator remoteMetadataCreator; private String datasetName; diff --git a/src/test/java/org/embl/mobie/lib/hcs/HCSPatternTest.java b/src/test/java/org/embl/mobie/lib/hcs/HCSPatternTest.java index 157e94bc1..60e3bb22c 100644 --- a/src/test/java/org/embl/mobie/lib/hcs/HCSPatternTest.java +++ b/src/test/java/org/embl/mobie/lib/hcs/HCSPatternTest.java @@ -34,6 +34,8 @@ class HCSPatternTest { + static { net.imagej.patcher.LegacyInjector.preinit(); } + private static String operetta = "r01c01f04p01-ch1sk1fk1fl1.tiff"; private static String incucyte = "MiaPaCa2-PhaseOriginal_A2_1_03d06h40m.tif"; private static String moldev = "MIP-2P-2sub_C05_s1_w146C9B2CD-0BB3-4B8A-9187-2805F4C90506.tif";