Rework scales

Author: AB-xdev

chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/Color.java

@@ -25,8 +25,10 @@
 
 /**
  * Immutable RGBa color model.
+ * @deprecated Will be phased out and replaced by the simpler 'string'
  */
 @SuppressWarnings("checkstyle:MagicNumber") // RGB Numbers
+@Deprecated
 public class Color
 {
 	private static final Random RANDOMIZER = new SecureRandom();

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chartjs.model.options.scales;
+package software.xdev.chartjs.model.options;
 
 import software.xdev.chartjs.model.enums.FontStyle;
 

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

@@ -17,7 +17,6 @@
 
 import software.xdev.chartjs.model.color.Color;
 import software.xdev.chartjs.model.options.layout.Padding;
-import software.xdev.chartjs.model.options.scales.Font;
 
 
 public class LegendTitle

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

@@ -23,7 +23,7 @@
 import software.xdev.chartjs.model.options.animation.Animation;
 import software.xdev.chartjs.model.options.animation.Animations;
 import software.xdev.chartjs.model.options.layout.Layout;
-import software.xdev.chartjs.model.options.scales.Scales;
+import software.xdev.chartjs.model.options.scale.Scales;
 
 
 public class Options<T extends Options<T, A>, A extends Animation<A>>

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

@@ -17,42 +17,40 @@
 
 import software.xdev.chartjs.model.options.animation.PolarAnimation;
 import software.xdev.chartjs.model.options.elements.ArcElements;
-import software.xdev.chartjs.model.options.scales.RadialLinearScale;
-import software.xdev.chartjs.model.options.scales.Scale;
+import software.xdev.chartjs.model.options.scale.radial.RadialLinearScaleOptions;
 
 
 public class PolarOptions extends Options<PolarOptions, PolarAnimation>
 {
-	
 	/**
-	 * @see #setScale(RadialLinearScale scale)
+	 * @see #setScale(RadialLinearScaleOptions scale)
 	 */
-	protected RadialLinearScale<?> scale;
+	protected RadialLinearScaleOptions scale;
 
 	protected ArcElements elements;
 
 	/**
-	 * Static factory, constructs a {@link Scale} implementation appropriate for a {@link PolarOptions} instance.
+	 * Static factory, constructs a Scale implementation appropriate for a {@link PolarOptions} instance.
 	 *
-	 * @return a new {@link RadialLinearScale} instance
+	 * @return a new {@link RadialLinearScaleOptions} instance
 	 */
-	public static RadialLinearScale scales()
+	public static RadialLinearScaleOptions scales()
 	{
-		return new RadialLinearScale<>();
+		return new RadialLinearScaleOptions();
 	}
 
 	/**
-	 * @see #setScale(RadialLinearScale)
+	 * @see #setScale(RadialLinearScaleOptions)
 	 */
-	public RadialLinearScale getScale()
+	public RadialLinearScaleOptions getScale()
 	{
 		return this.scale;
 	}
 
 	/**
 	 * Options for the one scale used on the chart. Use this to style the ticks, labels, and grid.
 	 */
-	public PolarOptions setScale(final RadialLinearScale<?> scale)
+	public PolarOptions setScale(final RadialLinearScaleOptions scale)
 	{
 		this.scale = scale;
 		return this;

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

@@ -16,9 +16,11 @@
 package software.xdev.chartjs.model.options;
 
 import software.xdev.chartjs.model.color.Color;
-import software.xdev.chartjs.model.options.scales.Font;
 
 
+/**
+ * @see <a href="https://www.chartjs.org/docs/latest/axes/labelling.html#scale-title-configuration">ChartJS docs</a>
+ */
 public class Title
 {
 	protected String align;