Cleanup code

AB-xdev · AB-xdev · commit 53692d934e17 · 2023-10-26T15:43:44.000+02:00
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java
@@ -20,5 +20,4 @@
 
 public class BarData extends Data<BarData, BarDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java
@@ -20,5 +20,4 @@
 
 public class BubbleData extends Data<BubbleData, BubbleDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java
@@ -26,7 +26,6 @@
 
 public class Data<D extends Data<D, T>, T extends Dataset<T, ?>>
 {
-
 	private final List<String> labels = new ArrayList<>();
 	private final List<T> datasets = new ArrayList<>();
 
@@ -40,7 +39,6 @@ public List<String> getLabels() {
 	/**
 	 * Sets the backing label list, replacing any labels previously added or set
 	 * 
-	 * @param labels
 	 * @return this object to allow method chaining
 	 */
 	public D setLabels(final Collection<String> labels) {
@@ -54,7 +52,6 @@ public D setLabels(final Collection<String> labels) {
 	/**
 	 * Sets the backing label list, replacing any labels previously added or set
 	 * 
-	 * @param labels
 	 * @return this object to allow method chaining
 	 */
 	public D setLabels(final String... labels) {
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java
@@ -20,5 +20,4 @@
 
 public class DoughnutData extends Data<DoughnutData, DoughnutDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java
@@ -20,5 +20,4 @@
 
 public class LineData extends Data<LineData, LineDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java
@@ -20,5 +20,4 @@
 
 public class PieData extends Data<PieData, PieDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java
@@ -20,5 +20,4 @@
 
 public class PolarData extends Data<PolarData, PolarDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java
@@ -20,5 +20,4 @@
 
 public class RadarData extends Data<RadarData, RadarDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java
@@ -20,5 +20,4 @@
 
 public class ScatterData extends Data<ScatterData, ScatterDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java
@@ -18,13 +18,8 @@
 import java.math.BigDecimal;
 
 
-public class BubbleDataPoint
+public class BubbleDataPoint extends XYDataPointBase<BubbleDataPoint>
 {
-	
-	private BigDecimal x;
-	
-	private BigDecimal y;
-	
 	private BigDecimal r;
 	
 	public BubbleDataPoint()
@@ -33,57 +28,10 @@ public BubbleDataPoint()
 	
 	public BubbleDataPoint(final BigDecimal x, final BigDecimal y, final BigDecimal r)
 	{
-		this.x = x;
-		this.y = y;
+		super(x, y);
 		this.r = r;
 	}
 	
-	public BigDecimal getX()
-	{
-		return this.x;
-	}
-	
-	public BubbleDataPoint setX(final int x)
-	{
-		this.x = new BigDecimal(x);
-		return this;
-	}
-	
-	public BubbleDataPoint setX(final double x)
-	{
-		this.x = new BigDecimal(String.valueOf(x));
-		return this;
-	}
-	
-	public BubbleDataPoint setX(final BigDecimal x)
-	{
-		this.x = x;
-		return this;
-	}
-	
-	public BigDecimal getY()
-	{
-		return this.y;
-	}
-	
-	public BubbleDataPoint setY(final int y)
-	{
-		this.y = new BigDecimal(y);
-		return this;
-	}
-	
-	public BubbleDataPoint setY(final double y)
-	{
-		this.y = new BigDecimal(String.valueOf(y));
-		return this;
-	}
-	
-	public BubbleDataPoint setY(final BigDecimal y)
-	{
-		this.y = y;
-		return this;
-	}
-	
 	public BigDecimal getR()
 	{
 		return this.r;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java
@@ -18,78 +18,24 @@
 import java.math.BigDecimal;
 
 
-public class ScatterDataPoint
+public class ScatterDataPoint extends XYDataPointBase<ScatterDataPoint>
 {
-	
-	private BigDecimal x;
-	
-	private BigDecimal y;
-	
 	public ScatterDataPoint()
 	{
 	}
 	
 	public ScatterDataPoint(final int x, final int y)
 	{
-		this.setX(x);
-		this.setY(y);
+		super(x, y);
 	}
 	
 	public ScatterDataPoint(final double x, final double y)
 	{
-		this.setX(x);
-		this.setY(y);
+		super(x, y);
 	}
 	
 	public ScatterDataPoint(final BigDecimal x, final BigDecimal y)
 	{
-		this.setX(x);
-		this.setY(y);
-	}
-	
-	public BigDecimal getX()
-	{
-		return this.x;
-	}
-	
-	public ScatterDataPoint setX(final int x)
-	{
-		this.x = new BigDecimal(x);
-		return this;
-	}
-	
-	public ScatterDataPoint setX(final double x)
-	{
-		this.x = new BigDecimal(String.valueOf(x));
-		return this;
-	}
-	
-	public ScatterDataPoint setX(final BigDecimal x)
-	{
-		this.x = x;
-		return this;
-	}
-	
-	public BigDecimal getY()
-	{
-		return this.y;
-	}
-	
-	public ScatterDataPoint setY(final int y)
-	{
-		this.y = new BigDecimal(y);
-		return this;
-	}
-	
-	public ScatterDataPoint setY(final double y)
-	{
-		this.y = new BigDecimal(String.valueOf(y));
-		return this;
-	}
-	
-	public ScatterDataPoint setY(final BigDecimal y)
-	{
-		this.y = y;
-		return this;
+		super(x, y);
 	}
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+import java.math.BigDecimal;
+
+
+public class XYDataPoint extends XYDataPointBase<XYDataPoint>
+{
+	public XYDataPoint()
+	{
+	}
+	
+	public XYDataPoint(final int x, final int y)
+	{
+		super(x, y);
+	}
+	
+	public XYDataPoint(final double x, final double y)
+	{
+		super(x, y);
+	}
+	
+	public XYDataPoint(final BigDecimal x, final BigDecimal y)
+	{
+		super(x, y);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.datapoint;
+
+import java.math.BigDecimal;
+
+
+public abstract class XYDataPointBase<S extends XYDataPointBase<S>>
+{
+	private BigDecimal x;
+	
+	private BigDecimal y;
+	
+	protected XYDataPointBase()
+	{
+	}
+	
+	protected XYDataPointBase(final int x, final int y)
+	{
+		this.setX(x);
+		this.setY(y);
+	}
+	
+	protected XYDataPointBase(final double x, final double y)
+	{
+		this.setX(x);
+		this.setY(y);
+	}
+	
+	protected XYDataPointBase(final BigDecimal x, final BigDecimal y)
+	{
+		this.setX(x);
+		this.setY(y);
+	}
+	
+	public BigDecimal getX()
+	{
+		return this.x;
+	}
+	
+	public S setX(final int x)
+	{
+		this.x = new BigDecimal(x);
+		return this.self();
+	}
+	
+	public S setX(final double x)
+	{
+		this.x = new BigDecimal(String.valueOf(x));
+		return this.self();
+	}
+	
+	public S setX(final BigDecimal x)
+	{
+		this.x = x;
+		return this.self();
+	}
+	
+	public BigDecimal getY()
+	{
+		return this.y;
+	}
+	
+	public S setY(final int y)
+	{
+		this.y = new BigDecimal(y);
+		return this.self();
+	}
+	
+	public S setY(final double y)
+	{
+		this.y = new BigDecimal(String.valueOf(y));
+		return this.self();
+	}
+	
+	public S setY(final BigDecimal y)
+	{
+		this.y = y;
+		return this.self();
+	}
+	
+	@SuppressWarnings("unchecked")
+	public S self()
+	{
+		return (S)this;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java
@@ -19,5 +19,4 @@
 
 public class LineDataset extends BaseLineDataset<LineDataset, BigDecimal> implements BigDecimalDataset<LineDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java
@@ -19,5 +19,4 @@
 
 public class PolarDataset extends RoundDataset<PolarDataset, BigDecimal> implements BigDecimalDataset<PolarDataset>
 {
-
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java
@@ -23,6 +23,7 @@
 public class RadarDataset extends PointDataset<RadarDataset, BigDecimal> implements BigDecimalDataset<RadarDataset>
 {
 	private final List<Integer> hitRadius = new ArrayList<>();
+	
 	public List<Integer> getHitRadius()
 	{
 		return this.hitRadius;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/ScatterDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/ScatterDataset.java
@@ -20,5 +20,4 @@
 
 public class ScatterDataset extends BaseLineDataset<ScatterDataset, ScatterDataPoint>
 {
-
 }
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,4 @@`
`20`	`20`
`21`	`21`	`public class BarData extends Data<BarData, BarDataset>`
`22`	`22`	`{`
`23`		`-`
`24`	`23`	`}`