diff --git a/.gitignore b/.gitignore index 3d47f986c41db29ec6dc0d5036bf760b3a1cf366..8d47cace3a5bd898da9fb12bed716d60838191a4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ target/ .settings/ *.iml .project -.classpath \ No newline at end of file +.classpath +**/.DS_Store \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2ba73bed15a869f8986d2113b88e5d7a32abdb66..afc615e79a836d11c4c0371a75c718d783dfe7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -7,15 +7,13 @@ <!-- Inherited Icy Parent POM --> <parent> <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>parent-pom-plugin</artifactId> - <version>1.0.3</version> + <artifactId>pom-icy</artifactId> + <version>2.2.0</version> </parent> <!-- Project Information --> <artifactId>flanagan</artifactId> - <version>1.1.1</version> - - <packaging>jar</packaging> + <version>2.0.0</version> <name>Flanagan</name> <description> @@ -24,7 +22,7 @@ Flanagan library has been developed by Michael Thomas Flanagan. Flanagan library by Michael Thomas Flanagan: https://www.ee.ucl.ac.uk/~mflanaga/java/ </description> - <url>http://icy.bioimageanalysis.org/plugin/flanagan-scientific-library-for-icy/</url> + <url>https://icy.bioimageanalysis.org/plugin/flanagan-scientific-library-for-icy/</url> <inceptionYear>2020</inceptionYear> <organization> @@ -60,43 +58,12 @@ <!-- Project properties --> <properties> - + <artifact-to-extract>flanagan</artifact-to-extract> </properties> - <!-- Project build configuration --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> - <executions> - <execution> - <id>${project.artifactId}-fetch</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>flanagan</includeArtifactIds> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <stripVersion>true</stripVersion> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> <!-- List of project's dependencies --> <dependencies> - <!-- The core of Icy --> - <dependency> - <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>icy-kernel</artifactId> - </dependency> - <dependency> <groupId>flanagan</groupId> <artifactId>flanagan</artifactId> diff --git a/src/main/java/plugins/stef/library/FlanaganPlugin.java b/src/main/java/plugins/stef/library/FlanaganPlugin.java index 97ad7cbb71b39a8bb56033d95e3f92ee46db3f0e..ad7b92d1f87228f727a3cbad7ba704bd7a248b48 100644 --- a/src/main/java/plugins/stef/library/FlanaganPlugin.java +++ b/src/main/java/plugins/stef/library/FlanaganPlugin.java @@ -1,15 +1,26 @@ +/* + * Copyright (c) 2010-2023. Institut Pasteur. + * + * This file is part of Icy. + * Icy is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Icy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Icy. If not, see <https://www.gnu.org/licenses/>. + */ + package plugins.stef.library; import icy.plugin.abstract_.Plugin; import icy.plugin.interface_.PluginLibrary; -/** - * Flanagan scientific library for Icy. - * Copyright Dr Michael Thomas Flanagan - * - * @author Stephane Dallongeville - */ -public class FlanaganPlugin extends Plugin implements PluginLibrary -{ +public class FlanaganPlugin extends Plugin implements PluginLibrary { // }