Merge pull request #142 from aripddev/develop

Added missing options #141, #143, #144

Author: AB-xdev

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
+import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
@@ -34,6 +35,8 @@ public class BubbleDataset extends RoundDataset<BubbleDataset, BubbleDataPoint>
 {
 	private final List<Integer> hoverRadius = new OptionalArray<>();
 
+	private PointStyle pointStyle;
+	
 	@Override
 	protected String defaultType()
 	{
@@ -72,4 +75,15 @@ public List<Integer> getHoverRadius()
 	{
 		return this.hoverRadius;
 	}
+	
+	public PointStyle getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	public BubbleDataset setPointStyle(final PointStyle pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
 }

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

@@ -25,6 +25,7 @@ public enum PointStyle
 	CIRCLE,
 	TRIANGLE,
 	RECT,
+	RECT_ROUNDED,
 	RECT_ROT,
 	CROSS,
 	CROSS_ROT,

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

@@ -17,13 +17,15 @@
 
 import software.xdev.chartjs.model.options.plugins.zoom.Zoom;
 
+
 public class Plugins
 {
 	protected Title title;
+	protected Title subtitle;
 	protected Legend legend;
 	protected Tooltip tooltip;
 	protected Zoom zoom;
-
+	
 	/**
 	 * @see #setTitle(Title)
 	 */
@@ -42,6 +44,24 @@ public Plugins setTitle(final Title title)
 		return this;
 	}
 
+	/**
+	 * @see #setSubtitle(Title)
+	 */
+	public Title getSubtitle()
+	{
+		return this.subtitle;
+	}
+	
+	/**
+	 * The subtitle configuration is passed into the options.subtitle namespace. The global options for the chart
+	 * subtitle is defined in Chart.defaults.global.subtitle.
+	 */
+	public Plugins setSubtitle(final Title subtitle)
+	{
+		this.subtitle = subtitle;
+		return this;
+	}
+	
 	/**
 	 * @see #setLegend(Legend)
 	 */
@@ -83,7 +103,7 @@ public Plugins setTooltip(final Tooltip tooltip)
 		this.tooltip = tooltip;
 		return this;
 	}
-
+	
 	/**
 	 * @see #setZoom(Zoom)
 	 */