Skip to content

Commit 0c36094

Browse files
authored
Merge pull request #49 from xdev-software/support-more-data-structures
Support more data structures
2 parents b5339c0 + e476231 commit 0c36094

26 files changed

+275
-269
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
## 1.1.0
2+
* Added support for more [data structures](https://www.chartjs.org/docs/4.4.0/general/data-structures.html) inside ``Dataset#data``
3+
* ``Dataset#data`` can now contain ``Object``s
4+
15
## 1.0.2
26
* Support Java 11
37
* Updated dependencies
48

59
## 1.0.1
6-
* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/latest/samples/bar/stacked-groups.html)
10+
* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/4.4.0/samples/bar/stacked-groups.html)
711

812
## 1.0.0
913
Initial release

chartjs-java-model-demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xdev-software</groupId>
88
<artifactId>chartjs-java-model-demo</artifactId>
9-
<version>1.0.3-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<inceptionYear>2022</inceptionYear>

chartjs-java-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xdev-software</groupId>
88
<artifactId>chartjs-java-model</artifactId>
9-
<version>1.0.3-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>chartjs-java-model</name>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import software.xdev.chartjs.model.options.Options;
2929

3030

31-
public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?, ?>>
31+
public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?>>
3232
implements Chart<T, O, D>
3333
{
3434
protected D data;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
@SuppressWarnings("java:S119") // SELF means the Chart itself... Not a problem
25-
public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?, ?>>
25+
public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?>>
2626
{
2727
/**
2828
* @return type of this {@link Chart} implementation for proper drawing in JavaScript.

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
*/
1616
package software.xdev.chartjs.model.data;
1717

18-
import java.math.BigDecimal;
19-
2018
import software.xdev.chartjs.model.dataset.BarDataset;
2119

2220

23-
public class BarData extends Data<BarData, BarDataset, BigDecimal>
21+
public class BarData extends Data<BarData, BarDataset>
2422
{
25-
2623
}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
*/
1616
package software.xdev.chartjs.model.data;
1717

18-
import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
1918
import software.xdev.chartjs.model.dataset.BubbleDataset;
2019

2120

22-
public class BubbleData extends Data<BubbleData, BubbleDataset, BubbleDataPoint>
21+
public class BubbleData extends Data<BubbleData, BubbleDataset>
2322
{
24-
2523
}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
import software.xdev.chartjs.model.dataset.Dataset;
2525

2626

27-
public class Data<D extends Data<D, T, O>, T extends Dataset<T, O>, O>
27+
public class Data<D extends Data<D, T>, T extends Dataset<T, ?>>
2828
{
29-
3029
private final List<String> labels = new ArrayList<>();
3130
private final List<T> datasets = new ArrayList<>();
3231

@@ -40,7 +39,6 @@ public List<String> getLabels() {
4039
/**
4140
* Sets the backing label list, replacing any labels previously added or set
4241
*
43-
* @param labels
4442
* @return this object to allow method chaining
4543
*/
4644
public D setLabels(final Collection<String> labels) {
@@ -54,7 +52,6 @@ public D setLabels(final Collection<String> labels) {
5452
/**
5553
* Sets the backing label list, replacing any labels previously added or set
5654
*
57-
* @param labels
5855
* @return this object to allow method chaining
5956
*/
6057
public D setLabels(final String... labels) {

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
*/
1616
package software.xdev.chartjs.model.data;
1717

18-
import java.math.BigDecimal;
19-
2018
import software.xdev.chartjs.model.dataset.DoughnutDataset;
2119

2220

23-
public class DoughnutData extends Data<DoughnutData, DoughnutDataset, BigDecimal>
21+
public class DoughnutData extends Data<DoughnutData, DoughnutDataset>
2422
{
25-
2623
}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
*/
1616
package software.xdev.chartjs.model.data;
1717

18-
import java.math.BigDecimal;
19-
2018
import software.xdev.chartjs.model.dataset.LineDataset;
2119

2220

23-
public class LineData extends Data<LineData, LineDataset, BigDecimal>
21+
public class LineData extends Data<LineData, LineDataset>
2422
{
25-
2623
}

0 commit comments

Comments
 (0)