Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

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.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>
Expand Down
2 changes: 1 addition & 1 deletion 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.7.1-SNAPSHOT</version>
<version>2.8.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>chartjs-java-model</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
Loading
Loading