From d0e14dc4d99d0667e8951099d569b5bfdfc2e899 Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Wed, 14 Oct 2020 15:49:24 +0100 Subject: [PATCH] Moving to v1.0.5 This adds compatibility for MIA v0.15.0 Former-commit-id: 0a278315637262bad3a9afd287624890cd696dea --- .project | 11 ++ core/.classpath | 17 --- core/.factorypath | 125 +++++++++--------- core/.project | 11 ++ core/.settings/org.eclipse.jdt.apt.core.prefs | 2 +- core/.settings/org.eclipse.jdt.core.prefs | 2 +- core/pom.xml | 50 ++++--- .../wbif/sjx/VideoHandler/VideoLoader.java | 10 +- .../sjx/VideoHandler/VideoLoaderCore.java | 3 +- linux32/.factorypath | 125 +++++++++--------- linux32/.project | 11 ++ linux32/pom.xml | 2 +- linux64/.factorypath | 125 +++++++++--------- linux64/.project | 11 ++ linux64/pom.xml | 2 +- mac64/.factorypath | 125 +++++++++--------- mac64/.project | 11 ++ mac64/pom.xml | 2 +- pom.xml | 13 +- win32/.factorypath | 125 +++++++++--------- win32/.project | 11 ++ win32/pom.xml | 2 +- win64/.factorypath | 125 +++++++++--------- win64/.project | 11 ++ win64/pom.xml | 2 +- 25 files changed, 529 insertions(+), 405 deletions(-) diff --git a/.project b/.project index 3cfe88c..f4289e7 100644 --- a/.project +++ b/.project @@ -14,4 +14,15 @@ org.eclipse.m2e.core.maven2Nature + + + 1602606422160 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/core/.classpath b/core/.classpath index 39abf1c..a5d9509 100644 --- a/core/.classpath +++ b/core/.classpath @@ -28,22 +28,5 @@ - - - - - - - - - - - - - - - - - diff --git a/core/.factorypath b/core/.factorypath index e6eab70..1d1ebe1 100644 --- a/core/.factorypath +++ b/core/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/core/.project b/core/.project index 1a64507..6e33712 100644 --- a/core/.project +++ b/core/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422169 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/core/.settings/org.eclipse.jdt.apt.core.prefs b/core/.settings/org.eclipse.jdt.apt.core.prefs index 687ad91..4f7c572 100644 --- a/core/.settings/org.eclipse.jdt.apt.core.prefs +++ b/core/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.aptEnabled=false org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs index 90f7a5b..1b6e1ef 100644 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ b/core/.settings/org.eclipse.jdt.core.prefs @@ -4,6 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=enabled +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/core/pom.xml b/core/pom.xml index 5a32aa6..b18f5db 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,11 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0 @@ -49,7 +48,7 @@ com.github.SJCross ModularImageAnalysis - v0.14.7 + v0.15.0 ${scp} @@ -61,23 +60,34 @@ maven-surefire-plugin 2.22.2 + + + maven-compiler-plugin + 2.5.1 + + 1.8 + 1.8 + + -proc:none + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java index fd15a78..5eaed5a 100644 --- a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java +++ b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java @@ -29,11 +29,11 @@ import wbif.sjx.MIA.Object.Parameters.Text.IntegerP; import wbif.sjx.MIA.Object.Parameters.Text.StringP; import wbif.sjx.MIA.Object.Parameters.Text.TextAreaP; -import wbif.sjx.MIA.Object.References.ImageMeasurementRefCollection; -import wbif.sjx.MIA.Object.References.MetadataRefCollection; -import wbif.sjx.MIA.Object.References.ObjMeasurementRefCollection; -import wbif.sjx.MIA.Object.References.ParentChildRefCollection; -import wbif.sjx.MIA.Object.References.PartnerRefCollection; +import wbif.sjx.MIA.Object.References.Collections.ImageMeasurementRefCollection; +import wbif.sjx.MIA.Object.References.Collections.MetadataRefCollection; +import wbif.sjx.MIA.Object.References.Collections.ObjMeasurementRefCollection; +import wbif.sjx.MIA.Object.References.Collections.ParentChildRefCollection; +import wbif.sjx.MIA.Object.References.Collections.PartnerRefCollection; import wbif.sjx.common.Object.Metadata; public class VideoLoader extends Module { diff --git a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoaderCore.java b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoaderCore.java index 8d8a4d0..3072ece 100644 --- a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoaderCore.java +++ b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoaderCore.java @@ -10,7 +10,6 @@ import org.bytedeco.javacv.FrameGrabber; import org.bytedeco.javacv.Java2DFrameConverter; -import javax.annotation.Nullable; import java.io.File; import java.io.FileNotFoundException; import java.util.Arrays; @@ -21,6 +20,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +import com.drew.lang.annotations.Nullable; + public class VideoLoaderCore { public static ImagePlus getVideo(String path, String frameRange, String channelRange, @Nullable int[] crop) throws FrameGrabber.Exception, FileNotFoundException { diff --git a/linux32/.factorypath b/linux32/.factorypath index 04ee67e..391453d 100644 --- a/linux32/.factorypath +++ b/linux32/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/linux32/.project b/linux32/.project index 81a7b6a..d3d31f1 100644 --- a/linux32/.project +++ b/linux32/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422179 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/linux32/pom.xml b/linux32/pom.xml index 8ac1d10..80a74dd 100644 --- a/linux32/pom.xml +++ b/linux32/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0 diff --git a/linux64/.factorypath b/linux64/.factorypath index c6ea46e..355574d 100644 --- a/linux64/.factorypath +++ b/linux64/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/linux64/.project b/linux64/.project index 295a797..d0052d7 100644 --- a/linux64/.project +++ b/linux64/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422186 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/linux64/pom.xml b/linux64/pom.xml index eae8a2f..1a6bc48 100644 --- a/linux64/pom.xml +++ b/linux64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0 diff --git a/mac64/.factorypath b/mac64/.factorypath index 9a13257..73ba78d 100644 --- a/mac64/.factorypath +++ b/mac64/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/mac64/.project b/mac64/.project index 712e478..d39a0bd 100644 --- a/mac64/.project +++ b/mac64/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422194 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/mac64/pom.xml b/mac64/pom.xml index 041d340..2646a6c 100644 --- a/mac64/pom.xml +++ b/mac64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0 diff --git a/pom.xml b/pom.xml index 40f5ca4..aa1b27d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ wbif.sjx VideoHandler pom - 1.0.4 + 1.0.5 VideoHandler https://github.com/SJCross/VideoHandler 2019 @@ -91,6 +91,17 @@ win64 + + + + org.eclipse.sisu + sisu-inject + 0.3.4 + pom + + + + diff --git a/win32/.factorypath b/win32/.factorypath index 51e2b7f..fb3f84f 100644 --- a/win32/.factorypath +++ b/win32/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/win32/.project b/win32/.project index 84ff5d9..9e57242 100644 --- a/win32/.project +++ b/win32/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422201 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/win32/pom.xml b/win32/pom.xml index dfbded5..bc72832 100644 --- a/win32/pom.xml +++ b/win32/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0 diff --git a/win64/.factorypath b/win64/.factorypath index abb4747..748edba 100644 --- a/win64/.factorypath +++ b/win64/.factorypath @@ -13,7 +13,7 @@ - + @@ -87,7 +87,6 @@ - @@ -102,27 +101,36 @@ - - + + - + + - - + + + + - + - + + + + + - + - + + + @@ -195,25 +203,32 @@ + + + + + + + - - - - + + + + - - - - - - + + + + + - + + @@ -222,33 +237,34 @@ + - + - + - - + + - + - + - - - + + + - - - + + + @@ -256,26 +272,26 @@ - - - - - - - - - - + + + + + + + + + + - - + + - - + + - + @@ -284,15 +300,13 @@ - + - - @@ -300,13 +314,6 @@ - - - - - - - diff --git a/win64/.project b/win64/.project index 216d834..540ed49 100644 --- a/win64/.project +++ b/win64/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1602606422211 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/win64/pom.xml b/win64/pom.xml index 7c33ea5..65a2112 100644 --- a/win64/pom.xml +++ b/win64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.4 + 1.0.5 4.0.0