Skip to content

Commit ddbd138

Browse files
AB-xdevAB-xdev
authored
Merge pull request #156 from xdev-software/develop
Release
2 parents d5014fd + 8b98052 commit ddbd138

38 files changed

+276
-133
lines changed

Diff for: ‎.github/.lycheeignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignorefile for broken link check
2+
localhost
3+
mvnrepository.com

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.yml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: 🐞 Bug
2+
description: Create a bug report for something that is broken
3+
labels: [bug]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thank you for reporting a bug.
9+
10+
Please fill in as much information as possible about your bug so that we don't have to play "information ping-pong" and can help you immediately.
11+
12+
- type: checkboxes
13+
id: checklist
14+
attributes:
15+
label: "Checklist"
16+
options:
17+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/chartjs-java-model/releases/latest)"
18+
required: true
19+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
required: true
21+
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
22+
required: true
23+
- label: "This issue contains only one bug."
24+
required: true
25+
26+
- type: input
27+
id: app-version
28+
attributes:
29+
label: Affected version
30+
description: "In which version did you encounter the bug?"
31+
placeholder: "x.x.x"
32+
validations:
33+
required: true
34+
35+
- type: textarea
36+
id: steps-to-reproduce
37+
attributes:
38+
label: Steps to reproduce the bug
39+
description: |
40+
What did you do for the bug to show up?
41+
42+
If you can't cause the bug to show up again reliably (and hence don't have a proper set of steps to give us), please still try to give as many details as possible on how you think you encountered the bug.
43+
placeholder: |
44+
1. Use '...'
45+
2. Do '...'
46+
validations:
47+
required: true
48+
49+
- type: textarea
50+
id: expected-behavior
51+
attributes:
52+
label: Expected behavior
53+
description: |
54+
Tell us what you expect to happen.
55+
56+
- type: textarea
57+
id: actual-behavior
58+
attributes:
59+
label: Actual behavior
60+
description: |
61+
Tell us what happens with the steps given above.
62+
63+
- type: textarea
64+
id: additional-information
65+
attributes:
66+
label: Additional information
67+
description: |
68+
Any other relevant information you'd like to include

Diff for: ‎.github/ISSUE_TEMPLATE/config.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
contact_links:
2+
- name: 💬 Contact support
3+
url: https://xdev.software/en/services/support
4+
about: "If you need support as soon as possible or/and you can't wait for any pull request"

Diff for: ‎.github/ISSUE_TEMPLATE/enhancement.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: ✨ Feature/Enhancement
2+
description: Suggest a new feature or enhancement
3+
labels: [enhancement]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thank you for suggesting a new feature/enhancement.
9+
10+
- type: checkboxes
11+
id: checklist
12+
attributes:
13+
label: "Checklist"
14+
options:
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
required: true
17+
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
18+
required: true
19+
- label: "This issue contains only one feature request/enhancement."
20+
required: true
21+
22+
- type: textarea
23+
id: description
24+
attributes:
25+
label: Description
26+
validations:
27+
required: true
28+
29+
- type: textarea
30+
id: additional-information
31+
attributes:
32+
label: Additional information

Diff for: ‎.github/ISSUE_TEMPLATE/question.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: ❓ Question
2+
description: Ask a question
3+
labels: [question]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this form!
9+
10+
- type: checkboxes
11+
id: checklist
12+
attributes:
13+
label: "Checklist"
14+
options:
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/chartjs-java-model/issues) or [closed](https://github.com/xdev-software/chartjs-java-model/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
required: true
17+
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
18+
required: true
19+
20+
- type: textarea
21+
id: what-is-the-question
22+
attributes:
23+
label: What is/are your question(s)?
24+
validations:
25+
required: true
26+
27+
- type: textarea
28+
id: additional-information
29+
attributes:
30+
label: Additional information
31+
description: "Any other information you'd like to include - for instance logs, screenshots, etc."

Diff for: ‎.github/labels.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Default
2+
## Required for template
3+
- name: bug
4+
description: "Something isn't working"
5+
color: 'd73a4a'
6+
- name: enhancement
7+
description: New feature or request
8+
color: '#a2eeef'
9+
- name: question
10+
description: Information is requested
11+
color: '#d876e3'
12+
## Others
13+
- name: duplicate
14+
description: This already exists
15+
color: '#cfd3d7'
16+
- name: good first issue
17+
description: Good for newcomers
18+
color: '#7057ff'
19+
- name: help wanted
20+
description: Extra attention is needed
21+
color: '#008672'
22+
- name: invalid
23+
description: "This doesn't seem right"
24+
color: '#e4e669'
25+
# Custom
26+
- name: automated
27+
description: Created by an automation
28+
color: '#000000'
29+
- name: "can't reproduce"
30+
color: '#e95f2c'
31+
- name: customer-requested
32+
description: Was requested by a customer of us
33+
color: '#068374'
34+
- name: stale
35+
color: '#ededed'
36+
- name: waiting-for-response
37+
description: If no response is received after a certain time the issue will be closed
38+
color: '#202020'

Diff for: ‎.github/workflows/broken-links.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Broken links
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "23 23 * * 0"
7+
8+
permissions:
9+
issues: write
10+
11+
jobs:
12+
link-checker:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- run: mv .github/.lycheeignore .lycheeignore
18+
19+
- name: Link Checker
20+
id: lychee
21+
uses: lycheeverse/lychee-action@v1
22+
23+
- name: Find already existing issue
24+
id: find-issue
25+
run: |
26+
echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title \"Link Checker Report\"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT
27+
env:
28+
GH_TOKEN: ${{ github.token }}
29+
30+
- name: Close issue if everything is fine
31+
if: env.lychee_exit_code == 0 && steps.find-issue.outputs.number != ''
32+
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
33+
env:
34+
GH_TOKEN: ${{ github.token }}
35+
36+
- name: Create Issue From File
37+
if: env.lychee_exit_code != 0
38+
uses: peter-evans/create-issue-from-file@v5
39+
with:
40+
issue-number: ${{ steps.find-issue.outputs.number }}
41+
title: Link Checker Report
42+
content-filepath: ./lychee/out.md
43+
labels: bug, automated

Diff for: ‎.github/workflows/sync-labels.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Sync labels
2+
3+
on:
4+
push:
5+
branches: develop
6+
paths:
7+
- .github/labels.yml
8+
9+
workflow_dispatch:
10+
11+
permissions:
12+
issues: write
13+
14+
jobs:
15+
labels:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
with:
20+
sparse-checkout: .github/labels.yml
21+
22+
- uses: EndBug/label-sync@v2
23+
with:
24+
config-file: .github/labels.yml

Diff for: ‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.4.0
2+
* Simplify API by using ``Number`` instead of ``BigDecimal``, ``int`` and ``double`` for ``Datapoints`` #154 (@aripddev)
3+
14
## 1.3.1
25
* Add subtitle option #141 (@aripddev)
36
* Add ``PointStyle#rectRounded`` #143 (@aripddev)

Diff for: ‎chartjs-java-model-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

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

1212
<organization>

Diff for: ‎chartjs-java-model/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

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

1212
<name>chartjs-java-model</name>
@@ -170,7 +170,7 @@
170170
<dependency>
171171
<groupId>org.seleniumhq.selenium</groupId>
172172
<artifactId>selenium-chrome-driver</artifactId>
173-
<version>4.20.0</version>
173+
<version>4.21.0</version>
174174
<scope>test</scope>
175175
<exclusions>
176176
<!-- Tracing is not needed -->

Diff for: ‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java

+4-13
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,29 @@
1515
*/
1616
package software.xdev.chartjs.model.datapoint;
1717

18-
import java.math.BigDecimal;
19-
20-
2118
public class BubbleDataPoint extends XYDataPointBase<BubbleDataPoint>
2219
{
23-
private BigDecimal r;
20+
private Number r;
2421

2522
public BubbleDataPoint()
2623
{
2724
}
2825

29-
public BubbleDataPoint(final BigDecimal x, final BigDecimal y, final BigDecimal r)
26+
public BubbleDataPoint(final Number x, final Number y, final Number r)
3027
{
3128
super(x, y);
3229
this.r = r;
3330
}
3431

35-
public BigDecimal getR()
32+
public Number getR()
3633
{
3734
return this.r;
3835
}
3936

40-
public BubbleDataPoint setR(final double r)
41-
{
42-
this.r = new BigDecimal(String.valueOf(r));
43-
return this;
44-
}
45-
4637
/**
4738
* Radius of bubble
4839
*/
49-
public BubbleDataPoint setR(final BigDecimal r)
40+
public BubbleDataPoint setR(final Number r)
5041
{
5142
this.r = r;
5243
return this;

Diff for: ‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,13 @@
1515
*/
1616
package software.xdev.chartjs.model.datapoint;
1717

18-
import java.math.BigDecimal;
19-
20-
2118
public class ScatterDataPoint extends XYDataPointBase<ScatterDataPoint>
2219
{
2320
public ScatterDataPoint()
2421
{
2522
}
2623

27-
public ScatterDataPoint(final int x, final int y)
28-
{
29-
super(x, y);
30-
}
31-
32-
public ScatterDataPoint(final double x, final double y)
33-
{
34-
super(x, y);
35-
}
36-
37-
public ScatterDataPoint(final BigDecimal x, final BigDecimal y)
24+
public ScatterDataPoint(final Number x, final Number y)
3825
{
3926
super(x, y);
4027
}

Diff for: ‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,13 @@
1515
*/
1616
package software.xdev.chartjs.model.datapoint;
1717

18-
import java.math.BigDecimal;
19-
20-
2118
public class XYDataPoint extends XYDataPointBase<XYDataPoint>
2219
{
2320
public XYDataPoint()
2421
{
2522
}
2623

27-
public XYDataPoint(final int x, final int y)
28-
{
29-
super(x, y);
30-
}
31-
32-
public XYDataPoint(final double x, final double y)
33-
{
34-
super(x, y);
35-
}
36-
37-
public XYDataPoint(final BigDecimal x, final BigDecimal y)
24+
public XYDataPoint(final Number x, final Number y)
3825
{
3926
super(x, y);
4027
}

0 commit comments

Comments
 (0)