PlotService: add newSeriesStyle method.

maarzt · maarzt · commit c501d3ad64b7 · 2020-05-14T17:59:48.000+02:00
It's less confusing to have this method in the PlotService rather than
in XYPlot and CategoryChart.
diff --git a/src/main/java/net/imagej/plot/CategoryChart.java b/src/main/java/net/imagej/plot/CategoryChart.java
@@ -42,8 +42,6 @@
  */
 public interface CategoryChart<C> extends Plot {
 
-	SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle);
-
 	Class<C> getCategoryType();
 
 	LineSeries<C> addLineSeries();
diff --git a/src/main/java/net/imagej/plot/PlotService.java b/src/main/java/net/imagej/plot/PlotService.java
@@ -32,6 +32,7 @@
 package net.imagej.plot;
 
 import net.imagej.ImageJService;
+import org.scijava.util.ColorRGB;
 
 /**
  * An ImageJService that provides factory methods for supported {@link Plot}s,
@@ -41,6 +42,8 @@
  */
 public interface PlotService extends ImageJService {
 
+	SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle);
+
 	XYPlot newXYPlot();
 
 	<C> CategoryChart<C> newCategoryChart(Class<C> categoryType);
diff --git a/src/main/java/net/imagej/plot/XYPlot.java b/src/main/java/net/imagej/plot/XYPlot.java
@@ -42,8 +42,6 @@
  */
 public interface XYPlot extends Plot {
 
-	SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle);
-
 	XYSeries addXYSeries();
 
 	NumberAxis xAxis();
diff --git a/src/main/java/net/imagej/plot/defaultplot/DefaultCategoryChart.java b/src/main/java/net/imagej/plot/defaultplot/DefaultCategoryChart.java
@@ -32,7 +32,6 @@
 package net.imagej.plot.defaultplot;
 
 import net.imagej.plot.*;
-import org.scijava.util.ColorRGB;
 
 import java.util.Collections;
 import java.util.LinkedList;
@@ -63,11 +62,6 @@ class DefaultCategoryChart<C> extends AbstractPlot implements CategoryChart<C> {
 
 	// -- CategoryChart methods --
 
-	@Override
-	public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
-		return new DefaultSeriesStyle(color, lineStyle, markerStyle);
-	}
-
 	@Override
 	public Class<C> getCategoryType() {
 		return categoryType;
diff --git a/src/main/java/net/imagej/plot/defaultplot/DefaultPlotService.java b/src/main/java/net/imagej/plot/defaultplot/DefaultPlotService.java
@@ -33,11 +33,15 @@
 package net.imagej.plot.defaultplot;
 
 import net.imagej.plot.CategoryChart;
+import net.imagej.plot.LineStyle;
+import net.imagej.plot.MarkerStyle;
 import net.imagej.plot.PlotService;
+import net.imagej.plot.SeriesStyle;
 import net.imagej.plot.XYPlot;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
+import org.scijava.util.ColorRGB;
 
 /**
  * The default implementation of the {@link PlotService} interface.
@@ -49,7 +53,12 @@
 public class DefaultPlotService extends AbstractService implements PlotService {
 
 	// -- PlotService methods --
-	
+
+	@Override
+	public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
+		return new DefaultSeriesStyle(color, lineStyle, markerStyle);
+	}
+
 	@Override
 	public XYPlot newXYPlot() {
 		return new DefaultXYPlot();
diff --git a/src/main/java/net/imagej/plot/defaultplot/DefaultXYPlot.java b/src/main/java/net/imagej/plot/defaultplot/DefaultXYPlot.java
@@ -59,11 +59,6 @@ class DefaultXYPlot extends AbstractPlot implements XYPlot {
 
 	// -- XYPlot methods --
 
-	@Override
-	public SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle) {
-		return new DefaultSeriesStyle(color, lineStyle, markerStyle);
-	}
-
 	@Override
 	public XYSeries addXYSeries() {
 		XYSeries result = new DefaultXYSeries();
