diff --git a/.classpath b/.classpath index c27b0583990953e2a984c12e965fd71e0f9ebb43..f31c84e7ce44c2258c6866e15c14dbcda6aa1406 100644 --- a/.classpath +++ b/.classpath @@ -1,10 +1,48 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources"/> + <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="lib" path="/Icy-App/plugins/adufour/ezplug/EzPlug.jar"/> <classpathentry kind="lib" path="/Icy-App/plugins/adufour/blocks/Blocks.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="var" path="ICY_JAR"/> - <classpathentry kind="output" path="bin"/> - <referencedentry kind="lib" path="D:/Stephane/Documents/dev/GIT/Icy-App/lib/scifio.jar" sourcepath="D:/Stephane/Documents/dev/GIT/bioformats"/> + <classpathentry kind="lib" path="F:/SDKs/Java/jdk1.8.0_241/lib/tools.jar"/> + <classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> + <classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> + <classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> + <classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> + <classpathentry kind="var" path="USER_HOME/SDKs/Java/jdk1.8.0_251/lib/tools.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-kernel:2.1.0"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.sf.ehcache:ehcache:2.10.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.slf4j:slf4j-api:1.7.25"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-bioformats:6.3.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-insubstantial:7.3.7"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-vtk:6.3.0.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.imagej:ij:1.52q"/> + <classpathentry kind="lib" path="D:/SDKs/Java/jdk1.8.0_241/lib/tools.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.media:jai-core:1.1.3"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.media:jai-codec:1.1.3"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all:2.1.5-01"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-linux-amd64:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-linux-i586:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-macosx-universal:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-windows-amd64:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.jogl:jogl-all-natives-windows-i586:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt:2.1.5-01"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-linux-amd64:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-linux-i586:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-macosx-universal:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-windows-amd64:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jogamp.gluegen:gluegen-rt-natives-windows-i586:2.1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.javassist:javassist:3.22.0-GA"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: net.sourceforge.jexcelapi:jxl:2.6.12"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: log4j:log4j:1.2.14"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.swinglabs.swingx:swingx-all:1.6.5-1"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-blocks:1.0.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-protocols:3.0.9"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-javadocparser:1.0.0"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: com.nativelibs4java:ochafik-util:0.12"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.bioimageanalysis.icy:icy-ezplug:3.15.13"/> + <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/.gitignore b/.gitignore index 4d4be15bfb23be3e12d21529e4781399b209867f..18c1c4b324adf41df851fd5281471dcb9e2d0373 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ -bin +bin/ +target/ +.settings/ pluginfile-sequence-blocks*.jar +.idea/ +*.iml +*.eml +.project +.classpath diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..7c8b1fb42f70ad23b8a1d5ad9c6125d1d67acb2e --- /dev/null +++ b/pom.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + 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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>pom-icy</artifactId> + <groupId>org.bioimageanalysis.icy</groupId> + <version>1.0.4</version> + </parent> + + <artifactId>icy-sequence-blocks</artifactId> + <version>2.0.15</version> + + <name>SequenceBlocks</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <jdk.version>1.8</jdk.version> + + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + + <dependencies> + <dependency> + <groupId>org.bioimageanalysis.icy</groupId> + <artifactId>icy-kernel</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>org.bioimageanalysis.icy</groupId> + <artifactId>icy-blocks</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> + + <repositories> + <repository> + <id>icy</id> + <url>https://icy-nexus.pasteur.fr/repository/Icy/</url> + </repository> + </repositories> +</project> \ No newline at end of file diff --git a/src/plugins/tprovoost/sequenceblocks/SequenceBlocks.java b/src/main/java/plugins/tprovoost/sequenceblocks/SequenceBlocks.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/SequenceBlocks.java rename to src/main/java/plugins/tprovoost/sequenceblocks/SequenceBlocks.java diff --git a/src/plugins/tprovoost/sequenceblocks/add/AddOverlays.java b/src/main/java/plugins/tprovoost/sequenceblocks/add/AddOverlays.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/add/AddOverlays.java rename to src/main/java/plugins/tprovoost/sequenceblocks/add/AddOverlays.java diff --git a/src/plugins/tprovoost/sequenceblocks/add/AddRois.java b/src/main/java/plugins/tprovoost/sequenceblocks/add/AddRois.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/add/AddRois.java rename to src/main/java/plugins/tprovoost/sequenceblocks/add/AddRois.java diff --git a/src/plugins/tprovoost/sequenceblocks/convert/ConvertColor.java b/src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertColor.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/convert/ConvertColor.java rename to src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertColor.java diff --git a/src/plugins/tprovoost/sequenceblocks/convert/ConvertStack.java b/src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertStack.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/convert/ConvertStack.java rename to src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertStack.java diff --git a/src/plugins/tprovoost/sequenceblocks/convert/ConvertType.java b/src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertType.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/convert/ConvertType.java rename to src/main/java/plugins/tprovoost/sequenceblocks/convert/ConvertType.java diff --git a/src/plugins/tprovoost/sequenceblocks/convert/Resize.java b/src/main/java/plugins/tprovoost/sequenceblocks/convert/Resize.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/convert/Resize.java rename to src/main/java/plugins/tprovoost/sequenceblocks/convert/Resize.java diff --git a/src/plugins/tprovoost/sequenceblocks/creation/CombineChannels.java b/src/main/java/plugins/tprovoost/sequenceblocks/creation/CombineChannels.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/creation/CombineChannels.java rename to src/main/java/plugins/tprovoost/sequenceblocks/creation/CombineChannels.java diff --git a/src/plugins/tprovoost/sequenceblocks/creation/CreateSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/creation/CreateSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/creation/CreateSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/creation/CreateSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/creation/DuplicateSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/creation/DuplicateSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/creation/DuplicateSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/creation/DuplicateSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/CropCZT.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/CropCZT.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/CropCZT.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/CropCZT.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/CropSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/CropSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/CropSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/CropSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/ExtractChannel.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractChannel.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/ExtractChannel.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractChannel.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/ExtractMultiChannels.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractMultiChannels.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/ExtractMultiChannels.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractMultiChannels.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/ExtractSlice.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractSlice.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/ExtractSlice.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractSlice.java diff --git a/src/plugins/tprovoost/sequenceblocks/extract/ExtractTime.java b/src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractTime.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/extract/ExtractTime.java rename to src/main/java/plugins/tprovoost/sequenceblocks/extract/ExtractTime.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/IsFileValid.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/IsFileValid.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/IsFileValid.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/IsFileValid.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/LoadMetadata.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/LoadMetadata.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/LoadMetadata.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/LoadMetadata.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/LoadSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/LoadSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/LoadSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/LoadSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/LoadSubSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/LoadSubSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/LoadSubSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/LoadSubSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/SaveMetadata.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/SaveMetadata.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/SaveMetadata.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/SaveMetadata.java diff --git a/src/plugins/tprovoost/sequenceblocks/files/SaveSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/files/SaveSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/files/SaveSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/files/SaveSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/images/AddImage.java b/src/main/java/plugins/tprovoost/sequenceblocks/images/AddImage.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/images/AddImage.java rename to src/main/java/plugins/tprovoost/sequenceblocks/images/AddImage.java diff --git a/src/plugins/tprovoost/sequenceblocks/images/AsImageArray.java b/src/main/java/plugins/tprovoost/sequenceblocks/images/AsImageArray.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/images/AsImageArray.java rename to src/main/java/plugins/tprovoost/sequenceblocks/images/AsImageArray.java diff --git a/src/plugins/tprovoost/sequenceblocks/images/GetImage.java b/src/main/java/plugins/tprovoost/sequenceblocks/images/GetImage.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/images/GetImage.java rename to src/main/java/plugins/tprovoost/sequenceblocks/images/GetImage.java diff --git a/src/plugins/tprovoost/sequenceblocks/images/RemoveImage.java b/src/main/java/plugins/tprovoost/sequenceblocks/images/RemoveImage.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/images/RemoveImage.java rename to src/main/java/plugins/tprovoost/sequenceblocks/images/RemoveImage.java diff --git a/src/plugins/tprovoost/sequenceblocks/images/SetImage.java b/src/main/java/plugins/tprovoost/sequenceblocks/images/SetImage.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/images/SetImage.java rename to src/main/java/plugins/tprovoost/sequenceblocks/images/SetImage.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/PositionedSequenceFileImporter.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/PositionedSequenceFileImporter.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/PositionedSequenceFileImporter.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/PositionedSequenceFileImporter.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterClose.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterClose.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterClose.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterClose.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetMetadata.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetMetadata.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetMetadata.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetMetadata.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetThumbnail.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetThumbnail.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetThumbnail.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetThumbnail.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetTileSize.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetTileSize.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetTileSize.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetTileSize.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterOpen.java b/src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterOpen.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterOpen.java rename to src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterOpen.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/CreateLinearColormap.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/CreateLinearColormap.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/CreateLinearColormap.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/CreateLinearColormap.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/Dimensions.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/Dimensions.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/Dimensions.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/Dimensions.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/EzVarColormap.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/EzVarColormap.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/EzVarColormap.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/EzVarColormap.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetChannelName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetChannelName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetChannelName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetChannelName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetChannelsName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetChannelsName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetChannelsName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetChannelsName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetColormap.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetColormap.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetColormap.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetColormap.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetColormaps.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetColormaps.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetColormaps.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetColormaps.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetDataType.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetDataType.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetDataType.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetDataType.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetFileName.java similarity index 97% rename from src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetFileName.java index 2bf3699ee50a8651b20df613489457db5bc6e286..477a91549d9c19cffc6ad3aa69f178a3ca2b3cc5 100644 --- a/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java +++ b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetFileName.java @@ -42,7 +42,7 @@ public class GetFileName extends Plugin implements SequenceBlock, PluginBundled result = FileUtil.getFileName(result); // remove extension ? if (!withExtension.getValue().booleanValue()) - result = FileUtil.setExtension(result, ""); + FileUtil.setExtension(result, ""); filename.setValue(result); } diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetMetaData.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetMetaData.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetMetaData.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetMetaData.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetOutputFilename.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetOutputFilename.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetOutputFilename.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetOutputFilename.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetResolution.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetResolution.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetResolution.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetResolution.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetRoisAsRegion.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/GetRoisAsRegion.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/GetRoisAsRegion.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/GetRoisAsRegion.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/ReadMetadata.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/ReadMetadata.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/ReadMetadata.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/ReadMetadata.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetChannelName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetChannelName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetChannelName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetChannelName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetChannelsName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetChannelsName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetChannelsName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetChannelsName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetColormap.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetColormap.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetColormap.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetColormap.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetColormaps.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetColormaps.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetColormaps.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetColormaps.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetName.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetName.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetName.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetName.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/SetResolution.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/SetResolution.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/infos/SetResolution.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/SetResolution.java diff --git a/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java b/src/main/java/plugins/tprovoost/sequenceblocks/infos/VarColormap.java similarity index 97% rename from src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java rename to src/main/java/plugins/tprovoost/sequenceblocks/infos/VarColormap.java index d1776836e52a74e0452f8cc35bfb7b1add7c1203..017f8b950f6b668f493e16b8085eebd77cd6913a 100644 --- a/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java +++ b/src/main/java/plugins/tprovoost/sequenceblocks/infos/VarColormap.java @@ -50,7 +50,7 @@ public class VarColormap extends Var<IcyColorMap> // create the var editor (combo box type here) final ComboBox<IcyColorMap> result = new ComboBox<IcyColorMap>(this); // get the editor component - final JComboBox<?> combo = result.getEditorComponent(); + final JComboBox combo = result.getEditorComponent(); // and set a specific renderer combo.setRenderer(new ColormapComboBoxRenderer(combo)); diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceChannelBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceChannelBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceChannelBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceChannelBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterChannelBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterChannelBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterChannelBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterChannelBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterFrameBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterFrameBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterFrameBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterFrameBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterRegionBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterRegionBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterRegionBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterRegionBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSeriesBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSeriesBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSeriesBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSeriesBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSliceBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSliceBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSliceBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterSliceBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterTileBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterTileBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterTileBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFileImporterTileBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java b/src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java rename to src/main/java/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java diff --git a/src/plugins/tprovoost/sequenceblocks/op/AdditiveFillSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/op/AdditiveFillSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/op/AdditiveFillSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/op/AdditiveFillSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/op/FillInnerSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/op/FillInnerSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/op/FillInnerSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/op/FillInnerSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/op/FillOuterSequence.java b/src/main/java/plugins/tprovoost/sequenceblocks/op/FillOuterSequence.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/op/FillOuterSequence.java rename to src/main/java/plugins/tprovoost/sequenceblocks/op/FillOuterSequence.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveAllRois.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveAllRois.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveAllRois.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveAllRois.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveChannel.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveChannel.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveChannel.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveChannel.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveFrame.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveFrame.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveFrame.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveFrame.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveOverlays.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveOverlays.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveOverlays.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveOverlays.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveRois.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveRois.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveRois.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveRois.java diff --git a/src/plugins/tprovoost/sequenceblocks/remove/RemoveSlice.java b/src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveSlice.java similarity index 100% rename from src/plugins/tprovoost/sequenceblocks/remove/RemoveSlice.java rename to src/main/java/plugins/tprovoost/sequenceblocks/remove/RemoveSlice.java diff --git a/res/SequenceBlocks.xml b/src/main/resources/SequenceBlocks.xml similarity index 100% rename from res/SequenceBlocks.xml rename to src/main/resources/SequenceBlocks.xml diff --git a/res/SequenceBlocks_icon.png b/src/main/resources/SequenceBlocks_icon.png similarity index 100% rename from res/SequenceBlocks_icon.png rename to src/main/resources/SequenceBlocks_icon.png