Merge pull request #334 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.8.0
+* Synced ``TooltipOptions`` from ChartJS source code #330
+
 ## 2.7.0
 * ``Title``: Make it possible to set custom padding and multi-line text #316
 

chartjs-java-model-demo/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>chartjs-java-model-root</artifactId>
-		<version>2.7.1-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>2.7.1-SNAPSHOT</version>
+	<version>2.8.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -44,7 +44,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.13.0</version>
+				<version>3.14.0</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>

chartjs-java-model/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>2.7.1-SNAPSHOT</version>
+	<version>2.8.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
@@ -48,9 +48,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<slf4j-version>2.0.16</slf4j-version>
+		<slf4j-version>2.0.17</slf4j-version>
 		<log4j-version>2.24.3</log4j-version>
-		<testcontainers-version>1.20.4</testcontainers-version>
+		<testcontainers-version>1.20.6</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->
 		<skipTests>true</skipTests>
@@ -95,7 +95,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.18.2</version>
+			<version>2.18.3</version>
 		</dependency>
 
 		<!-- Tests -->
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.11.4</version>
+			<version>5.12.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.28.1</version>
+			<version>4.29.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -193,7 +193,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.8.0</version>
+					<version>3.9.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -230,7 +230,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.13.0</version>
+				<version>3.14.0</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>
@@ -295,7 +295,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>flatten-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>1.7.0</version>
 						<configuration>
 							<flattenMode>ossrh</flattenMode>
 						</configuration>
@@ -360,7 +360,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.21.2</version>
+								<version>10.21.4</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -397,12 +397,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.10.0</version>
+								<version>7.11.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.10.0</version>
+								<version>7.11.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Font.java

@@ -31,15 +31,6 @@ public String getFamily()
 		return this.family;
 	}
 
-	/**
-	 * <p>
-	 * Font family for the scale title, follows CSS font-family options.
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
-	 * </p>
-	 */
 	public Font setFamily(final String family)
 	{
 		this.family = family;
@@ -51,15 +42,6 @@ public Number getSize()
 		return this.size;
 	}
 
-	/**
-	 * <p>
-	 * Font size for the scale title.
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code 12}
-	 * </p>
-	 */
 	public Font setSize(final Number size)
 	{
 		this.size = size;
@@ -71,15 +53,6 @@ public FontStyle getStyle()
 		return this.style;
 	}
 
-	/**
-	 * <p>
-	 * Font style for the scale title, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code "normal"}
-	 * </p>
-	 */
 	public Font setStyle(final FontStyle style)
 	{
 		this.style = style;
@@ -97,17 +70,11 @@ public Font setWeight(final Number weight)
 		return this;
 	}
 
-	/**
-	 * @see #setLineHeight(String)
-	 */
 	public String getLineHeight()
 	{
 		return this.lineHeight;
 	}
 
-	/**
-	 * Height of an individual line of text
-	 */
 	public void setLineHeight(final String lineHeight)
 	{
 		this.lineHeight = lineHeight;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Plugins.java

@@ -16,14 +16,15 @@
 package software.xdev.chartjs.model.options;
 
 import software.xdev.chartjs.model.options.plugins.zoom.Zoom;
+import software.xdev.chartjs.model.options.tooltip.TooltipOptions;
 
 
 public class Plugins
 {
 	protected Title title;
 	protected Title subtitle;
 	protected LegendOptions legend;
-	protected Tooltip tooltip;
+	protected TooltipOptions tooltip;
 	protected Zoom zoom;
 
 	/**
@@ -81,9 +82,9 @@ public Plugins setLegend(final LegendOptions legend)
 	}
 
 	/**
-	 * @see #setTooltip(Tooltip)
+	 * @see #setTooltip(TooltipOptions)
 	 */
-	public Tooltip getTooltip()
+	public TooltipOptions getTooltip()
 	{
 		return this.tooltip;
 	}
@@ -98,7 +99,7 @@ public Tooltip getTooltip()
 	 * functions must return either a string or an array of strings. Arrays of strings are treated as multiple lines of
 	 * text.
 	 */
-	public Plugins setTooltip(final Tooltip tooltip)
+	public Plugins setTooltip(final TooltipOptions tooltip)
 	{
 		this.tooltip = tooltip;
 		return this;