From 31628c02011ba4f089f4f95461dfb48feb748afd Mon Sep 17 00:00:00 2001 From: Thomas <thomas.musset@pasteur.fr> Date: Thu, 27 Jun 2024 18:34:26 +0200 Subject: [PATCH] updated pom to v3.0.0-a.1, fix classes accordingly to new architecture, added icon, updated .gitignore --- .gitignore | 45 +++++++++++++++--- pom.xml | 14 ++---- .../RSyntaxTextAreaPlugin.java | 8 +++- src/main/resources/rsyntaxtextarea.png | Bin 0 -> 11407 bytes 4 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/rsyntaxtextarea.png diff --git a/.gitignore b/.gitignore index e419b98..57f16fb 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 c569c77..2d09568 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 ddfeeea..14c574e 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 GIT binary patch literal 11407 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 literal 0 HcmV?d00001 -- GitLab