diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 96af7986..c17c3978 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -18,7 +18,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@v1 + uses: lycheeverse/lychee-action@v2 - name: Find already existing issue id: find-issue diff --git a/CHANGELOG.md b/CHANGELOG.md index ee21f7be..8a4854fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.3.1 +* Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262 +* Updated dependencies + ## 2.3.0 * Update available datasets fields from ChartJS source code #244 * Removed deprecated code diff --git a/chartjs-java-model-demo/src/main/java/software/xdev/Application.java b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java index 9506216a..3d16e65f 100644 --- a/chartjs-java-model-demo/src/main/java/software/xdev/Application.java +++ b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java @@ -45,8 +45,7 @@ private static void createAndOpenTestFile(final Chart chart) + "\n" + "\t\n" + "\t\t\n" - + "\t\t\n" + + "\t\t\n" + "\t\n" + "\t\n" + "\t\t\n" diff --git a/chartjs-java-model/pom.xml b/chartjs-java-model/pom.xml index 7f42a497..e8390e7e 100644 --- a/chartjs-java-model/pom.xml +++ b/chartjs-java-model/pom.xml @@ -49,8 +49,8 @@ UTF-8 2.0.16 - 2.24.0 - 1.20.1 + 2.24.1 + 1.20.2 true @@ -95,7 +95,7 @@ com.fasterxml.jackson.core jackson-databind - 2.17.2 + 2.18.0 @@ -129,7 +129,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.2 test @@ -170,7 +170,7 @@ org.seleniumhq.selenium selenium-chrome-driver - 4.24.0 + 4.25.0 test @@ -201,7 +201,7 @@ com.mycila license-maven-plugin - 4.5 + 4.6 ${project.organization.url} @@ -241,7 +241,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 attach-javadocs @@ -274,7 +274,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 ${skipTests} @@ -312,7 +312,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.7 sign-artifacts @@ -360,7 +360,7 @@ com.puppycrawl.tools checkstyle - 10.18.1 + 10.18.2 @@ -397,12 +397,12 @@ net.sourceforge.pmd pmd-core - 7.5.0 + 7.6.0 net.sourceforge.pmd pmd-java - 7.5.0 + 7.6.0 diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java index 12eef54f..5c185e9e 100644 --- a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java +++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDatasetBase.java @@ -32,7 +32,8 @@ public abstract class LineDatasetBase, O> extends P private final List pointHitRadius = new OptionalArray<>(); - private Boolean stepped; + protected Number tension; + protected Object stepped; public String getXAxisID() { @@ -78,12 +79,23 @@ public T setSpanGaps(final Object spanGaps) return this.self(); } - public Boolean getStepped() + public Number getTension() + { + return this.tension; + } + + public T setTension(final Number tension) + { + this.tension = tension; + return this.self(); + } + + public Object getStepped() { return this.stepped; } - public T setStepped(final Boolean stepped) + public T setStepped(final Object stepped) { this.stepped = stepped; return this.self(); diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java index 5f4bed2d..4f27911b 100644 --- a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java +++ b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/LineOptions.java @@ -19,8 +19,14 @@ import software.xdev.chartjs.model.options.elements.LineElements; +/** + * @see ChartJS Source + */ public class LineOptions extends Options { + protected Number tension; + protected Object stepped; + /** * @see #setShowLine(Boolean) */ @@ -31,6 +37,28 @@ public class LineOptions extends Options protected Boolean spanGaps; protected LineElements elements; + public Number getTension() + { + return this.tension; + } + + public LineOptions setTension(final Number tension) + { + this.tension = tension; + return this; + } + + public Object getStepped() + { + return this.stepped; + } + + public LineOptions setStepped(final Object stepped) + { + this.stepped = stepped; + return this; + } + /** * @see #setShowLine(Boolean) */ diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png index 5f00f928..47bc7cae 100644 Binary files a/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png and b/chartjs-java-model/src/test/resources/screenshotReferences/DoughnutChartBasic.png differ diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png index 7c942124..b652b609 100644 Binary files a/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png and b/chartjs-java-model/src/test/resources/screenshotReferences/PieChartBasic.png differ diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png index a7c04b17..365317ad 100644 Binary files a/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png and b/chartjs-java-model/src/test/resources/screenshotReferences/PolarChartBasic.png differ diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png index a1e92f37..7be178dd 100644 Binary files a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png and b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasic.png differ diff --git a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png index c48982ff..b45aa91a 100644 Binary files a/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png and b/chartjs-java-model/src/test/resources/screenshotReferences/RadarChartBasicRadialScale.png differ diff --git a/chartjs-java-model/src/test/resources/test-template.html b/chartjs-java-model/src/test/resources/test-template.html index 496fa9d8..0a54b07d 100644 --- a/chartjs-java-model/src/test/resources/test-template.html +++ b/chartjs-java-model/src/test/resources/test-template.html @@ -2,7 +2,7 @@ - + diff --git a/pom.xml b/pom.xml index f0a9dacf..3370ef06 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.18.1 + 10.18.2 @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.5.0 + 7.6.0 net.sourceforge.pmd pmd-java - 7.5.0 + 7.6.0