From f68edc21802d5051b6bdae6fee82db37746b98de Mon Sep 17 00:00:00 2001
From: Thomas <thomas.musset@pasteur.fr>
Date: Mon, 9 Dec 2024 13:47:36 +0100
Subject: [PATCH] updated to v2.0.0-a.2, updated dependency, moved icons
---
pom.xml | 16 ++++------------
.../plugins/stef/library/JFreeChartPlugin.java | 5 ++---
.../library/jfreechart}/JFreeChart_icon.png | Bin
.../stef/library/jfreechart}/jfreechart.jpg | Bin
4 files changed, 6 insertions(+), 15 deletions(-)
rename src/main/resources/{ => plugins/stef/library/jfreechart}/JFreeChart_icon.png (100%)
rename src/main/resources/{ => plugins/stef/library/jfreechart}/jfreechart.jpg (100%)
diff --git a/pom.xml b/pom.xml
index eaef28e..422b6bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,14 +8,14 @@
<parent>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>pom-icy</artifactId>
- <version>3.0.0-a.1</version>
+ <version>3.0.0-a.3</version>
</parent>
<!-- Project Information -->
<artifactId>jfreechart</artifactId>
- <version>2.0.0-a.1</version>
+ <version>2.0.0-a.2</version>
- <name>JfreeChart</name>
+ <name>JFreeChart</name>
<description>
JFreeChart is a class library, written in Java, for generating charts. Utilising the Java2D API, it supports a wide range of chart
types including bar charts, pie charts, line charts, XY-plots, time series plots, Sankey charts and more.
@@ -58,15 +58,7 @@
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
</dependencies>
-
- <!-- Icy Maven repository (to find parent POM) -->
- <repositories>
- <repository>
- <id>icy</id>
- <url>https://nexus-icy.pasteur.cloud/repository/icy/</url>
- </repository>
- </repositories>
</project>
\ No newline at end of file
diff --git a/src/main/java/plugins/stef/library/JFreeChartPlugin.java b/src/main/java/plugins/stef/library/JFreeChartPlugin.java
index 0f17eb8..dbf3bc7 100644
--- a/src/main/java/plugins/stef/library/JFreeChartPlugin.java
+++ b/src/main/java/plugins/stef/library/JFreeChartPlugin.java
@@ -3,7 +3,6 @@ package plugins.stef.library;
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;
/**
* JFree Chart library for Icy
@@ -11,7 +10,7 @@ import org.bioimageanalysis.icy.extension.plugin.interface_.PluginLibrary;
* @author Stephane Dallongeville
*/
@IcyPluginName("JFreeChart")
-@IcyPluginIcon(path = "/jfreechart.jpg")
-public class JFreeChartPlugin extends Plugin implements PluginLibrary {
+@IcyPluginIcon(path = "/plugins/stef/library/jfreechart/jfreechart.jpg")
+public class JFreeChartPlugin extends Plugin {
//
}
diff --git a/src/main/resources/JFreeChart_icon.png b/src/main/resources/plugins/stef/library/jfreechart/JFreeChart_icon.png
similarity index 100%
rename from src/main/resources/JFreeChart_icon.png
rename to src/main/resources/plugins/stef/library/jfreechart/JFreeChart_icon.png
diff --git a/src/main/resources/jfreechart.jpg b/src/main/resources/plugins/stef/library/jfreechart/jfreechart.jpg
similarity index 100%
rename from src/main/resources/jfreechart.jpg
rename to src/main/resources/plugins/stef/library/jfreechart/jfreechart.jpg
--
GitLab