diff --git a/.gitignore b/.gitignore index e419b98728e52ac6a7e0c6d0634e8456a1590df8..57f16fb67c1b1589981416b323d7a9debc728665 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,41 @@ +/build* +/workspace +setting.xml +release/ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ +icy.log + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated .classpath +.factorypath .project -*.jardesc -bin/ +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ build/ -target/ -*.iml -.idea/ -.settings/ -**/.DS_Store \ No newline at end of file +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +**/.DS_Store +Icon? \ No newline at end of file diff --git a/pom.xml b/pom.xml index c569c7771b4a903e2b019a55f8284a1eb158cfbb..2d095687f0f66fe4028d29812ec8a6b50eb48266 100644 --- a/pom.xml +++ b/pom.xml @@ -7,35 +7,29 @@ <parent> <groupId>org.bioimageanalysis.icy</groupId> <artifactId>pom-icy</artifactId> - <version>2.2.0</version> + <version>3.0.0-a.1</version> </parent> <artifactId>rsyntaxtextarea</artifactId> - <version>3.0.0</version> - - <packaging>jar</packaging> + <version>3.0.0-a.1</version> <name>RSyntaxTextArea for Icy</name> <description> RSyntaxTextArea library for Icy: provides a TextArea component with syntax highlight for different languages. </description> - <properties> - <artifact-to-extract>rsyntaxtextarea</artifact-to-extract> - </properties> - <dependencies> <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>3.3.3</version> + <version>3.4.1</version> </dependency> </dependencies> <repositories> <repository> <id>icy</id> - <url>https://icy-nexus.pasteur.fr/repository/Icy/</url> + <url>https://nexus-icy.pasteur.fr/repository/icy/</url> </repository> </repositories> </project> \ No newline at end of file diff --git a/src/main/java/plugins/tprovoost/rsyntaxtextarea/RSyntaxTextAreaPlugin.java b/src/main/java/plugins/tprovoost/rsyntaxtextarea/RSyntaxTextAreaPlugin.java index ddfeeea596b2c8585ca7762184591b985990d1c7..14c574ea5bf10783edfd4a8f08e63c4648571960 100644 --- a/src/main/java/plugins/tprovoost/rsyntaxtextarea/RSyntaxTextAreaPlugin.java +++ b/src/main/java/plugins/tprovoost/rsyntaxtextarea/RSyntaxTextAreaPlugin.java @@ -1,8 +1,12 @@ package plugins.tprovoost.rsyntaxtextarea; -import icy.plugin.abstract_.Plugin; -import icy.plugin.interface_.PluginLibrary; +import org.bioimageanalysis.icy.extension.plugin.abstract_.Plugin; +import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginIcon; +import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginName; +import org.bioimageanalysis.icy.extension.plugin.interface_.PluginLibrary; +@IcyPluginName("RSyntaxTextArea") +@IcyPluginIcon(path = "/rsyntaxtextarea.png") public class RSyntaxTextAreaPlugin extends Plugin implements PluginLibrary { } diff --git a/src/main/resources/rsyntaxtextarea.png b/src/main/resources/rsyntaxtextarea.png new file mode 100644 index 0000000000000000000000000000000000000000..5c55a38f4246f724206790ab2a5ab87beebf6162 Binary files /dev/null and b/src/main/resources/rsyntaxtextarea.png differ