Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1f3c190
Merge pull request #301 from xdev-software/master
AB-xdev Dec 6, 2024
07c48c8
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3…
xdev-renovate Dec 8, 2024
94e2149
Remove duplicated save action
AB-xdev Dec 9, 2024
adae2de
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Dec 9, 2024
edde4f6
Merge pull request #122 from xdev-software/renovate/org.apache.maven.…
AB-xdev Dec 9, 2024
105d452
Update dependency com.puppycrawl.tools:checkstyle to v10.21.0
xdev-renovate Dec 13, 2024
457bcd2
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Dec 16, 2024
6f25288
Update log4j-version to v2.24.3
xdev-renovate Dec 16, 2024
ec586b6
Merge pull request #124 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Dec 16, 2024
73b158a
Update to latest checkstyle version
AB-xdev Dec 16, 2024
70052e6
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Dec 17, 2024
bbc54b9
Update dependency org.junit.jupiter:junit-jupiter to v5.11.4
xdev-renovate Dec 17, 2024
0beda00
Merge pull request #303 from xdev-software/renovate/log4j-version
AB-xdev Dec 17, 2024
e8df3ec
Merge pull request #305 from xdev-software/renovate/org.junit.jupiter…
AB-xdev Dec 17, 2024
e904999
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Dec 17, 2024
4a380b2
Update net.sourceforge.pmd to v7.9.0
xdev-renovate Dec 28, 2024
5c0db24
Update dependency com.puppycrawl.tools:checkstyle to v10.21.1
xdev-renovate Dec 29, 2024
87dea0f
Merge pull request #127 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jan 13, 2025
22775a4
Merge pull request #126 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Jan 13, 2025
894f7f2
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jan 20, 2025
c1635be
Support new GitHub issue types
AB-xdev Jan 21, 2025
90d8e94
Overwrite gh-pages by default
AB-xdev Jan 21, 2025
7e9fd4e
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jan 24, 2025
6b01863
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jan 24, 2025
50bc78e
Update dependency com.puppycrawl.tools:checkstyle to v10.21.2
xdev-renovate Jan 27, 2025
1affa42
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jan 27, 2025
1e97852
Merge pull request #131 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jan 27, 2025
d109ab3
Update dependency net.sourceforge.pmd:pmd-core to v7.10.0 [SECURITY]
xdev-renovate Feb 1, 2025
459817d
Update dependency net.sourceforge.pmd:pmd-java to v7.10.0
xdev-renovate Feb 1, 2025
67a6149
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Feb 3, 2025
fa36994
Merge pull request #134 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Feb 3, 2025
37e12e8
Merge pull request #133 from xdev-software/renovate/maven-net.sourcef…
AB-xdev Feb 3, 2025
b96e565
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Feb 10, 2025
a28fc5b
Update dependency org.seleniumhq.selenium:selenium-chrome-driver to v…
xdev-renovate Feb 10, 2025
dc0e311
Merge pull request #310 from xdev-software/renovate/org.seleniumhq.se…
AB-xdev Feb 11, 2025
bfe5b93
Make it possible to set custom padding and multi-line text
AB-xdev Feb 11, 2025
3739323
Remove useless doc
AB-xdev Feb 11, 2025
259f5ab
Add changelogs, bump version
AB-xdev Feb 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: 🐞 Bug
description: Create a bug report for something that is broken
labels: [bug]
type: bug
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: ✨ Feature/Enhancement
description: Suggest a new feature or enhancement
labels: [enhancement]
type: feature
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
force_orphan: true

after-release:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/saveactions_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.7.0
* ``Title``: Make it possible to set custom padding and multi-line text #316

## 2.6.0
* Synced ``Doughnut/PieOptions`` from ChartJS source code #293
* Synced ``GridLineConfiguration`` from ChartJS source code / improved Types for more options #289
Expand Down
4 changes: 2 additions & 2 deletions chartjs-java-model-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>software.xdev</groupId>
<artifactId>chartjs-java-model-root</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>

<artifactId>chartjs-java-model-demo</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<organization>
Expand Down
16 changes: 8 additions & 8 deletions chartjs-java-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>chartjs-java-model</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>chartjs-java-model</name>
Expand Down Expand Up @@ -49,7 +49,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<slf4j-version>2.0.16</slf4j-version>
<log4j-version>2.24.2</log4j-version>
<log4j-version>2.24.3</log4j-version>
<testcontainers-version>1.20.4</testcontainers-version>

<!-- by default run no tests as Docker is required -->
Expand Down Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.11.3</version>
<version>5.11.4</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -170,7 +170,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>4.27.0</version>
<version>4.28.1</version>
<scope>test</scope>
<exclusions>
<!-- Tracing is not needed -->
Expand Down Expand Up @@ -241,7 +241,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.1</version>
<version>3.11.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -360,7 +360,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.20.2</version>
<version>10.21.2</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -397,12 +397,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.8.0</version>
<version>7.10.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.8.0</version>
<version>7.10.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,59 +26,36 @@ public class Title
protected Boolean fullSize;
protected String position;
protected Font font;
protected Integer padding;
protected String text;
protected Object padding;
protected Object text;

/**
* @see #setAlign(String)
*/
public String getAlign()
{
return this.align;
}

/**
* Alignment of the title
*
* <p>Default: center</p>
*/
public Title setAlign(final String align)
{
this.align = align;
return this;
}

/**
* @see #setColor(Object)
*/
public Object getColor()
{
return this.color;
}

/**
* Color of text
*/
public Title setColor(final Object color)
{
this.color = color;
return this;
}

/**
* @see #setFullSize(Boolean)
*/
public Boolean getFullSize()
{
return this.fullSize;
}

/**
* Marks that this box should take the full width/height of the canvas. If false, the box is sized and placed
* above/beside the chart area.
*
* <p>Default: true</p>
*/
public Title setFullSize(final Boolean fullSize)
{
this.fullSize = fullSize;
Expand All @@ -96,93 +73,45 @@ public Title setFont(final Font font)
return this;
}

/**
* @see #setDisplay(Boolean)
*/
public Boolean getDisplay()
{
return this.display;
}

/**
* <p>
* Display the title block
* </p>
*
* <p>
* Default {@code false}
* </p>
*/
public Title setDisplay(final Boolean display)
{
this.display = display;
return this;
}

/**
* @see #setPosition(String)
*/
public String getPosition()
{
return this.position;
}

/**
* <p>
* Position of the title. Only 'top' or 'bottom' are currently allowed
* </p>
*
* <p>
* Default {@code 'top'}
* </p>
*/
public Title setPosition(final String position)
{
this.position = position;
return this;
}

/**
* @see #setPadding(Integer)
*/
public Integer getPadding()
public Object getPadding()
{
return this.padding;
}

/**
* <p>
* Number of pixels to add above and below the title text
* </p>
*
* <p>
* Default {@code 10}
* </p>
*/
public Title setPadding(final Integer padding)
public Title setPadding(final Object padding)
{
this.padding = padding;
return this;
}

/**
* @see #setText(String)
*/
public String getText()
public Object getText()
{
return this.text;
}

/**
* <p>
* Title text
* </p>
*
* <p>
* Default {@code ""}
* </p>
*/
public Title setText(final String text)
public Title setText(final Object text)
{
this.text = text;
return this;
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>chartjs-java-model-root</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.20.2</version>
<version>10.21.2</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -82,12 +82,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.8.0</version>
<version>7.10.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.8.0</version>
<version>7.10.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down