Corrected model for Title and Font

#175

Author: AB-xdev

CHANGELOG.md

@@ -1,5 +1,6 @@
-## 1.4.2
+## 1.5.0
 * Added ``JsonIgnore`` to certain fields to help prevent infinite loops #174
+* Corrected model for ``Title`` and ``Font`` #175
 
 ## 1.4.1
 * Use ``Number`` instead of ``BigDecimal`` in some additional places #159 (@aripddev)

chartjs-java-model-demo/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>1.4.2-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

chartjs-java-model/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>1.4.2-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/TitlePosition.java

@@ -16,180 +16,130 @@
 package software.xdev.chartjs.model.options;
 
 import software.xdev.chartjs.model.color.Color;
-import software.xdev.chartjs.model.enums.FontStyle;
-import software.xdev.chartjs.model.enums.TitlePosition;
+import software.xdev.chartjs.model.options.scales.Font;
 
 
 public class Title
 {
+	protected String align;
+	protected Color color;
 	protected Boolean display;
-	protected TitlePosition position;
-	protected Boolean fullWidth;
-	protected Integer fontSize;
-	protected String fontFamily;
-	protected Color fontColor;
-	protected FontStyle fontStyle;
+	protected Boolean fullSize;
+	protected String position;
+	protected Font font;
 	protected Integer padding;
 	protected String text;
 
 	/**
-	 * @see #setDisplay(Boolean)
-	 */
-	public Boolean getDisplay()
-	{
-		return this.display;
-	}
-	
-	/**
-	 * <p>
-	 * Display the title block
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code false}
-	 * </p>
+	 * @see #setAlign(String)
 	 */
-	public Title setDisplay(final Boolean display)
+	public String getAlign()
 	{
-		this.display = display;
-		return this;
+		return this.align;
 	}
 
 	/**
-	 * @see #setPosition(TitlePosition)
-	 */
-	public TitlePosition getPosition()
-	{
-		return this.position;
-	}
-	
-	/**
-	 * <p>
-	 * Position of the title. Only 'top' or 'bottom' are currently allowed
-	 * </p>
+	 * Alignment of the title
 	 *
-	 * <p>
-	 * Default {@code 'top'}
-	 * </p>
+	 * <p>Default: center</p>
 	 */
-	public Title setPosition(final TitlePosition position)
+	public Title setAlign(final String align)
 	{
-		this.position = position;
+		this.align = align;
 		return this;
 	}
 
 	/**
-	 * @see #setFullWidth(Boolean)
+	 * @see #setColor(Color)
 	 */
-	public Boolean getFullWidth()
+	public Color getColor()
 	{
-		return this.fullWidth;
+		return this.color;
 	}
 
 	/**
-	 * <p>
-	 * Marks that this box should take the full width of the canvas (pushing down other boxes)
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code true}
-	 * </p>
+	 * Color of text
 	 */
-	public Title setFullWidth(final Boolean fullWidth)
+	public Title setColor(final Color color)
 	{
-		this.fullWidth = fullWidth;
+		this.color = color;
 		return this;
 	}
 
 	/**
-	 * @see #setFontSize(Integer)
+	 * @see #setFullSize(Boolean)
 	 */
-	public Integer getFontSize()
+	public Boolean getFullSize()
 	{
-		return this.fontSize;
+		return this.fullSize;
 	}
 
 	/**
-	 * <p>
-	 * Font size inherited from global configuration
-	 * </p>
+	 * 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 {@code 12}
-	 * </p>
+	 * <p>Default: true</p>
 	 */
-	public Title setFontSize(final Integer fontSize)
+	public Title setFullSize(final Boolean fullSize)
 	{
-		this.fontSize = fontSize;
+		this.fullSize = fullSize;
 		return this;
 	}
 
-	/**
-	 * @see #setFontFamily(String)
-	 */
-	public String getFontFamily()
+	public Font getFont()
 	{
-		return this.fontFamily;
+		return this.font;
 	}
 
-	/**
-	 * <p>
-	 * Font family inherited from global configuration
-	 * </p>
-	 *
-	 * <p>
-	 * Default {@code "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"}
-	 * </p>
-	 */
-	public Title setFontFamily(final String fontFamily)
+	public Title setFont(final Font font)
 	{
-		this.fontFamily = fontFamily;
+		this.font = font;
 		return this;
 	}
 
 	/**
-	 * @see #setFontColor(Color)
+	 * @see #setDisplay(Boolean)
 	 */
-	public Color getFontColor()
+	public Boolean getDisplay()
 	{
-		return this.fontColor;
+		return this.display;
 	}
 
 	/**
 	 * <p>
-	 * Font color inherited from global configuration
+	 * Display the title block
 	 * </p>
 	 *
 	 * <p>
-	 * Default {@code "#666"}
+	 * Default {@code false}
 	 * </p>
 	 */
-	public Title setFontColor(final Color fontColor)
+	public Title setDisplay(final Boolean display)
 	{
-		this.fontColor = fontColor;
+		this.display = display;
 		return this;
 	}
 
 	/**
-	 * @see #setFontStyle(FontStyle)
+	 * @see #setPosition(String)
 	 */
-	public FontStyle getFontStyle()
+	public String getPosition()
 	{
-		return this.fontStyle;
+		return this.position;
 	}
 
 	/**
 	 * <p>
-	 * Font styling of the title, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+	 * Position of the title. Only 'top' or 'bottom' are currently allowed
 	 * </p>
 	 *
 	 * <p>
-	 * Default {@code 'bold'}
+	 * Default {@code 'top'}
 	 * </p>
 	 */
-	public Title setFontStyle(final FontStyle fontStyle)
+	public Title setPosition(final String position)
 	{
-		this.fontStyle = fontStyle;
+		this.position = position;
 		return this;
 	}
 

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/Title.java

@@ -24,6 +24,7 @@ public class Font
 	protected Number size;
 	protected FontStyle style;
 	protected Number weight;
+	protected String lineHeight;
 
 	public String getFamily()
 	{
@@ -95,4 +96,20 @@ public Font setWeight(final Number weight)
 		this.weight = 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;
+	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scales/Font.java

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-root</artifactId>
-	<version>1.4.2-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>