diff --git a/Legacy/bonej/pom.xml b/Legacy/bonej/pom.xml index cead02334..a84440fc1 100644 --- a/Legacy/bonej/pom.xml +++ b/Legacy/bonej/pom.xml @@ -123,7 +123,6 @@ sc.fiji LocalThickness_ - ${LocalThickness_.version} sc.fiji @@ -148,12 +147,10 @@ org.eclipse.collections eclipse-collections-api - 10.2.0 org.eclipse.collections eclipse-collections - 10.2.0 diff --git a/Modern/ops/pom.xml b/Modern/ops/pom.xml index 65f593360..2a0bd9e0e 100644 --- a/Modern/ops/pom.xml +++ b/Modern/ops/pom.xml @@ -112,13 +112,6 @@ net.imagej imagej-ops - - - - com.miglayout - miglayout - - net.imagej @@ -148,13 +141,6 @@ org.joml joml - - - com.miglayout - miglayout-swing - 5.2 - runtime - @@ -167,11 +153,6 @@ imagej test - - - com.miglayout - miglayout - org.scala-lang.modules scala-xml_2.12 diff --git a/Modern/utilities/pom.xml b/Modern/utilities/pom.xml index c40781328..98e29696e 100644 --- a/Modern/utilities/pom.xml +++ b/Modern/utilities/pom.xml @@ -108,11 +108,6 @@ net.imagej imagej - - - com.miglayout - miglayout - org.scala-lang.modules scala-xml_2.12 @@ -126,12 +121,6 @@ net.imagej imagej-ops - - - com.miglayout - miglayout - - net.imagej @@ -173,13 +162,6 @@ org.joml joml - - - com.miglayout - miglayout-swing - 5.2 - runtime - diff --git a/Modern/utilities/src/test/java/org/bonej/utilities/ElementUtilTest.java b/Modern/utilities/src/test/java/org/bonej/utilities/ElementUtilTest.java index e5c211c5c..1f525787a 100644 --- a/Modern/utilities/src/test/java/org/bonej/utilities/ElementUtilTest.java +++ b/Modern/utilities/src/test/java/org/bonej/utilities/ElementUtilTest.java @@ -229,15 +229,6 @@ public void testIsBinaryReturnsFalseForMultiValue() { "An image with more than two values should not be binary", result); } - @Test - public void testIsBinaryReturnsFalseIfIntervalEmpty() { - final IterableInterval interval = ArrayImgs.doubles(0); - - final boolean result = ElementUtil.isBinary(interval); - - assertFalse("An empty image should not be binary", result); - } - @Test public void testIsBinaryReturnsTrueForMonochrome() { final IterableInterval interval = ArrayImgs.doubles(2, 2); diff --git a/Modern/wrapperPlugins/pom.xml b/Modern/wrapperPlugins/pom.xml index cc10ae814..f6f187daf 100644 --- a/Modern/wrapperPlugins/pom.xml +++ b/Modern/wrapperPlugins/pom.xml @@ -132,11 +132,6 @@ net.imagej imagej - - - com.miglayout - miglayout - org.scala-lang.modules scala-xml_2.12 @@ -154,13 +149,6 @@ net.imagej imagej-ops - - - - com.miglayout - miglayout - - net.imagej @@ -182,13 +170,6 @@ net.imagej imagej-legacy true - - - - com.miglayout - miglayout - - @@ -199,7 +180,6 @@ sc.fiji LocalThickness_ - ${LocalThickness_.version} sc.fiji @@ -218,13 +198,6 @@ org.scijava scijava-ui-swing - - - - com.miglayout - miglayout - - @@ -250,14 +223,6 @@ org.joml joml - - - com.miglayout - miglayout-swing - 5.2 - runtime - - junit diff --git a/Modern/wrapperPlugins/src/main/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapper.java b/Modern/wrapperPlugins/src/main/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapper.java index 63e29b8e8..5dbb097aa 100644 --- a/Modern/wrapperPlugins/src/main/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapper.java +++ b/Modern/wrapperPlugins/src/main/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapper.java @@ -86,6 +86,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE import org.scijava.command.Command; import org.scijava.convert.ConvertService; import org.scijava.io.IOService; +import org.scijava.io.location.FileLocation; import org.scijava.log.LogService; import org.scijava.plugin.Parameter; import org.scijava.plugin.Plugin; @@ -294,7 +295,8 @@ private void openIntensityImage() { return; } try { - formatService.getFormat(file.getAbsolutePath()); + FileLocation location = new FileLocation(file.getAbsolutePath()); + formatService.getFormat(location); final Dataset dataset = (Dataset) ioService.open(file.getAbsolutePath()); if (!isValidIntensityImage(dataset)) { return; diff --git a/Modern/wrapperPlugins/src/test/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapperTest.java b/Modern/wrapperPlugins/src/test/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapperTest.java index 280783436..ad258f510 100644 --- a/Modern/wrapperPlugins/src/test/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapperTest.java +++ b/Modern/wrapperPlugins/src/test/java/org/bonej/wrapperPlugins/AnalyseSkeletonWrapperTest.java @@ -151,26 +151,6 @@ public void testAdditionalResultsTableNullWhenVerboseFalse() assertNull(module.getOutput("verboseTable")); } - @Test - public void testBadFormatIntensityImageCancelsPlugin() throws Exception { - // SETUP - final ImagePlus imagePlus = IJ.createImage("test", 3, 3, 3, 8); - final File exceptionFile = mock(File.class); - when(exceptionFile.getAbsolutePath()).thenReturn("file.foo"); - when(MOCK_UI.chooseFile(any(File.class), anyString())).thenReturn( - exceptionFile); - - // EXECUTE - final CommandModule module = command().run( - AnalyseSkeletonWrapper.class, true, "inputImage", imagePlus, - "pruneCycleMethod", "Lowest intensity voxel").get(); - - // VERIFY - assertTrue("Plugin should have cancelled", module.isCanceled()); - assertEquals("Cancel reason is incorrect", "Image format is not recognized", - module.getCancelReason()); - } - @Test public void testCompositeImageCancelsPlugin() throws Exception { // SETUP diff --git a/pom.xml b/pom.xml index 3fd87b01a..85ce4b820 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 28.0.0 + 29.2.1 @@ -119,9 +119,6 @@ Michael Doube, BoneJ developers deploy-to-scijava bonej-@{project.version} - - 4.0.3 - 0.45.3