Added ability to customize series colors, markers, and line styles individually at the theme level

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java

@@ -17,7 +17,6 @@
 package org.knowm.xchart.demo.charts.area;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
 import org.knowm.xchart.SwingWrapper;
@@ -25,6 +24,7 @@ import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.StyleManager;
 import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Combination Line & Area Chart
@@ -79,17 +79,17 @@ public class AreaLineChart03 implements ExampleChart {
     // @formatter:on
 
     Series_XY seriesLiability = chart.addSeries("Liability", xAges, yLiability);
-    seriesLiability.setMarker(SeriesMarker.NONE);
+    seriesLiability.setMarker(SeriesMarkers.NONE);
     seriesLiability.setChartXYSeriesRenderStyle(Series_XY.ChartXYSeriesRenderStyle.Area);
 
     Series_XY seriesPercentile75th = chart.addSeries("75th Percentile", xAges, yPercentile75th);
-    seriesPercentile75th.setMarker(SeriesMarker.NONE);
+    seriesPercentile75th.setMarker(SeriesMarkers.NONE);
 
     Series_XY seriesPercentile50th = chart.addSeries("50th Percentile", xAges, yPercentile50th);
-    seriesPercentile50th.setMarker(SeriesMarker.NONE);
+    seriesPercentile50th.setMarker(SeriesMarkers.NONE);
 
     Series_XY seriesPercentile25th = chart.addSeries("25th Percentile", xAges, yPercentile25th);
-    seriesPercentile25th.setMarker(SeriesMarker.NONE);
+    seriesPercentile25th.setMarker(SeriesMarkers.NONE);
 
     chart.getStyleManager().setYAxisLabelAlignment(StyleManager.TextAlignment.Right);
     chart.getStyleManager().setYAxisDecimalPattern("$ #,###.##");

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java

@@ -30,8 +30,8 @@ import org.knowm.xchart.Series_Category;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
-import org.knowm.xchart.internal.style.MatlabTheme;
 import org.knowm.xchart.internal.style.StyleManager.ChartTheme;
+import org.knowm.xchart.internal.style.colors.MatlabSeriesColors;
 
 /**
  * Date Categories
@@ -76,7 +76,7 @@ public class BarChart02 implements ExampleChart {
       yData.add(-1 * 0.00000001 * ((random.nextInt(i) + 1)));
     }
     Series_Category series = chart.addSeries("Model 77", xData, yData);
-    series.setLineColor(MatlabTheme.RED);
+    series.setLineColor(MatlabSeriesColors.RED);
     chart.getStyleManager().setPlotGridLinesVisible(false);
     chart.getStyleManager().setBarFilled(false);
     chart.getStyleManager().setDatePattern("YYYY");

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java

@@ -26,11 +26,11 @@ import java.util.Random;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Millisecond Scale
@@ -78,7 +78,7 @@ public class DateChart01 implements ExampleChart {
     }
 
     Series_XY series = chart.addSeries("blah", xData, yData);
-    series.setMarker(SeriesMarker.NONE);
+    series.setMarker(SeriesMarkers.NONE);
 
     return chart;
 

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java

@@ -20,13 +20,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.colors.XChartSeriesColors;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Sine wave with customized series style
@@ -67,9 +67,9 @@ public class LineChart02 implements ExampleChart {
     // Series 1
     Series_XY series1 = chart.addSeries("y=sin(x)", xData, yData);
     series1.setLineColor(XChartSeriesColors.PURPLE);
-    series1.setLineStyle(SeriesLineStyle.DASH_DASH);
+    series1.setLineStyle(SeriesLines.DASH_DASH);
     series1.setMarkerColor(XChartSeriesColors.GREEN);
-    series1.setMarker(SeriesMarker.SQUARE);
+    series1.setMarker(SeriesMarkers.SQUARE);
 
     return chart;
   }

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java

@@ -26,16 +26,16 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import org.knowm.xchart.ChartColor;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
+import org.knowm.xchart.internal.style.colors.ChartColor;
 import org.knowm.xchart.internal.style.colors.XChartSeriesColors;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Extensive Chart Customization
@@ -105,8 +105,8 @@ public class LineChart03 implements ExampleChart {
     Series_XY series = chart.addSeries("Fake Data", xData, yData);
     series.setLineColor(XChartSeriesColors.BLUE);
     series.setMarkerColor(Color.ORANGE);
-    series.setMarker(SeriesMarker.CIRCLE);
-    series.setLineStyle(SeriesLineStyle.SOLID);
+    series.setMarker(SeriesMarkers.CIRCLE);
+    series.setLineStyle(SeriesLines.SOLID);
 
     return chart;
   }

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java

@@ -17,13 +17,13 @@
 package org.knowm.xchart.demo.charts.line;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.colors.XChartSeriesColors;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Hundreds of Series on One Plot
@@ -52,8 +52,8 @@ public class LineChart04 implements ExampleChart {
     for (int i = 0; i < 200; i++) {
       Series_XY series = chart.addSeries("A" + i, new double[] { Math.random() / 1000, Math.random() / 1000 }, new double[] { Math.random() / -1000, Math.random() / -1000 });
       series.setLineColor(XChartSeriesColors.BLUE);
-      series.setLineStyle(SeriesLineStyle.SOLID);
-      series.setMarker(SeriesMarker.CIRCLE);
+      series.setLineStyle(SeriesLines.SOLID);
+      series.setMarker(SeriesMarkers.CIRCLE);
       series.setMarkerColor(XChartSeriesColors.BLUE);
 
     }

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java

@@ -19,13 +19,13 @@ package org.knowm.xchart.demo.charts.line;
 import java.awt.Color;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Scatter and Line
@@ -63,13 +63,13 @@ public class LineChart05 implements ExampleChart {
     double[] yData2 = new double[] { 102, 49, 23.6, 11.3, 5.4, 2.6, 1.25 };
 
     Series_XY series = chart.addSeries("A", xData, yData);
-    series.setLineStyle(SeriesLineStyle.NONE);
-    series.setMarker(SeriesMarker.DIAMOND);
+    series.setLineStyle(SeriesLines.NONE);
+    series.setMarker(SeriesMarkers.DIAMOND);
     series.setMarkerColor(Color.BLACK);
 
     Series_XY series2 = chart.addSeries("B", xData, yData2);
-    series2.setMarker(SeriesMarker.NONE);
-    series2.setLineStyle(SeriesLineStyle.DASH_DASH);
+    series2.setMarker(SeriesMarkers.NONE);
+    series2.setLineStyle(SeriesLines.DASH_DASH);
     series2.setLineColor(Color.BLACK);
 
     chart.getStyleManager().setYAxisLogarithmic(true);

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java

@@ -19,12 +19,12 @@ package org.knowm.xchart.demo.charts.line;
 import java.awt.Color;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Logarithmic Y-Axis with Error Bars
@@ -66,9 +66,9 @@ public class LineChart06 implements ExampleChart {
 
     Series_XY series1 = chart.addSeries("Error bar\ntest data", xData, yData1, errdata);
 
-    series1.setLineStyle(SeriesLineStyle.SOLID);
+    series1.setLineStyle(SeriesLines.SOLID);
 
-    series1.setMarker(SeriesMarker.DIAMOND);
+    series1.setMarker(SeriesMarkers.DIAMOND);
 
     series1.setMarkerColor(Color.GREEN);
 

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart07.java

@@ -20,7 +20,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.knowm.xchart.Chart_Category;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_Category;
 import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
 import org.knowm.xchart.SwingWrapper;
@@ -28,6 +27,7 @@ import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
 import org.knowm.xchart.internal.style.StyleManager.ChartTheme;
 import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Line chart with multiple Category Series
@@ -96,7 +96,7 @@ public class LineChart07 implements ExampleChart {
     // Add data series to chart
     for (int i = 0; i < seriesNames.length; i++) {
       Series_Category series = chart.addSeries(seriesNames[i], xAxisKeys, Arrays.asList(dataPerSeries[i]));
-      series.setMarker(SeriesMarker.NONE);
+      series.setMarker(SeriesMarkers.NONE);
       // series.setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Line);
     }
     chart.getStyleManager().setYAxisLogarithmic(true);

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java

@@ -27,7 +27,7 @@ import org.knowm.xchart.demo.charts.ExampleChart;
  * Demonstrates the following:
  * <ul>
  * <li>Pie Chart
- * <li>ChartBuilder
+ * <li>ChartBuilderPie
  */
 public class PieChart01 implements ExampleChart<Chart_Pie> {
 
@@ -42,7 +42,6 @@ public class PieChart01 implements ExampleChart<Chart_Pie> {
   public Chart_Pie getChart() {
 
     // Create Chart
-    // TODO remove chartType(ChartType.Pie)
     Chart_Pie chart = new ChartBuilderPie().width(800).height(600).title(getClass().getSimpleName()).build();
     chart.addSeries("Pennies", 387);
     chart.addSeries("Nickels", 234);

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java

+/**
+ * Copyright 2015-2016 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
+ *
+ * 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 org.knowm.xchart.demo.charts.pie;
+
+import java.awt.Color;
+
+import org.knowm.xchart.ChartBuilderPie;
+import org.knowm.xchart.Chart_Pie;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
+
+/**
+ * Pie Chart with 4 Slices
+ * <p>
+ * Demonstrates the following:
+ * <ul>
+ * <li>Pie Chart
+ * <li>ChartBuilderPie
+ * <li>Custom series palette
+ */
+public class PieChart02 implements ExampleChart<Chart_Pie> {
+
+  public static void main(String[] args) {
+
+    ExampleChart<Chart_Pie> exampleChart = new PieChart02();
+    Chart_Pie chart = exampleChart.getChart();
+    new SwingWrapper(chart).displayChart();
+  }
+
+  @Override
+  public Chart_Pie getChart() {
+
+    // Create Chart
+    Chart_Pie chart = new ChartBuilderPie().width(800).height(600).title(getClass().getSimpleName()).build();
+    chart.addSeries("Gold", 24);
+    chart.addSeries("Silver", 21);
+    chart.addSeries("Platinum", 39);
+    chart.addSeries("Copper", 17);
+    chart.addSeries("Zinc", 40);
+
+    Color[] sliceColors = new Color[] { new Color(224, 68, 14), new Color(230, 105, 62), new Color(236, 143, 110), new Color(243, 180, 159), new Color(246, 199, 182) };
+    chart.getStyleManager().setSeriesColors(sliceColors);
+
+    return chart;
+  }
+
+}

xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java

@@ -22,11 +22,11 @@ import java.util.List;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.demo.charts.ExampleChart;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Error Bars
@@ -74,7 +74,7 @@ public class ScatterChart04 implements ExampleChart {
     // Series
     Series_XY series = chart.addSeries("10^(-x)", xData, yData, errorBars);
     series.setMarkerColor(Color.RED);
-    series.setMarker(SeriesMarker.SQUARE);
+    series.setMarker(SeriesMarkers.SQUARE);
 
     return chart;
   }

xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarLogTest.java

@@ -19,11 +19,11 @@ package org.knowm.xchart.standalone;
 import java.awt.Color;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.style.colors.XChartSeriesColors;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * @author timmolter
@@ -60,21 +60,21 @@ public class ErrorBarLogTest {
 
     Series_XY series3 = mychart.addSeries("Y-error", xData, yData3);
 
-    series1.setLineStyle(SeriesLineStyle.SOLID);
+    series1.setLineStyle(SeriesLines.SOLID);
 
-    series1.setMarker(SeriesMarker.DIAMOND);
+    series1.setMarker(SeriesMarkers.DIAMOND);
 
     series1.setMarkerColor(Color.MAGENTA);
 
-    series2.setLineStyle(SeriesLineStyle.DASH_DASH);
+    series2.setLineStyle(SeriesLines.DASH_DASH);
 
-    series2.setMarker(SeriesMarker.NONE);
+    series2.setMarker(SeriesMarkers.NONE);
 
     series2.setLineColor(XChartSeriesColors.RED);
 
-    series3.setLineStyle(SeriesLineStyle.DASH_DASH);
+    series3.setLineStyle(SeriesLines.DASH_DASH);
 
-    series3.setMarker(SeriesMarker.NONE);
+    series3.setMarker(SeriesMarkers.NONE);
 
     series3.setLineColor(XChartSeriesColors.RED);
 

xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarTest.java

@@ -19,11 +19,11 @@ package org.knowm.xchart.standalone;
 import java.awt.Color;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.style.colors.XChartSeriesColors;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * @author timmolter
@@ -46,14 +46,14 @@ public class ErrorBarTest {
     Series_XY series1 = mychart.addSeries("Error bar test data", xData, yData1, errdata);
     Series_XY series2 = mychart.addSeries("Y+error", xData, yData2);
     Series_XY series3 = mychart.addSeries("Y-error", xData, yData3);
-    series1.setLineStyle(SeriesLineStyle.SOLID);
-    series1.setMarker(SeriesMarker.DIAMOND);
+    series1.setLineStyle(SeriesLines.SOLID);
+    series1.setMarker(SeriesMarkers.DIAMOND);
     series1.setMarkerColor(Color.MAGENTA);
-    series2.setLineStyle(SeriesLineStyle.DASH_DASH);
-    series2.setMarker(SeriesMarker.NONE);
+    series2.setLineStyle(SeriesLines.DASH_DASH);
+    series2.setMarker(SeriesMarkers.NONE);
     series2.setLineColor(XChartSeriesColors.RED);
-    series3.setLineStyle(SeriesLineStyle.DASH_DASH);
-    series3.setMarker(SeriesMarker.NONE);
+    series3.setLineStyle(SeriesLines.DASH_DASH);
+    series3.setMarker(SeriesMarkers.NONE);
     series3.setLineColor(XChartSeriesColors.RED);
 
     new SwingWrapper(mychart).displayChart();

xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutHorizontalLines.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Creates a simple Chart and saves it as a PNG and JPEG image file.
@@ -43,7 +43,7 @@ public class Example0WithoutHorizontalLines {
       chart.getStyleManager().setYAxisMax(10);
       chart.getStyleManager().setPlotGridHorizontalLinesVisible(false);
       Series_XY series = chart.addSeries("" + i, null, getRandomWalk(200));
-      series.setMarker(SeriesMarker.NONE);
+      series.setMarker(SeriesMarkers.NONE);
       charts.add(chart);
     }
     new SwingWrapper(charts).displayChartMatrix();

xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalAndHorizontalLines.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Create a Chart matrix
@@ -46,7 +46,7 @@ public class Example0WithoutVerticalAndHorizontalLines {
       chart.getStyleManager().setPlotGridVerticalLinesVisible(false);
       chart.getStyleManager().setPlotGridHorizontalLinesVisible(false);
       Series_XY series = chart.addSeries("" + i, null, getRandomWalk(200));
-      series.setMarker(SeriesMarker.NONE);
+      series.setMarker(SeriesMarkers.NONE);
       charts.add(chart);
     }
     new SwingWrapper(charts).displayChartMatrix();

xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalLines.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Creates a simple Chart using QuickChart
@@ -43,7 +43,7 @@ public class Example0WithoutVerticalLines {
       chart.getStyleManager().setYAxisMax(10);
       chart.getStyleManager().setPlotGridVerticalLinesVisible(false);
       Series_XY series = chart.addSeries("" + i, null, getRandomWalk(200));
-      series.setMarker(SeriesMarker.NONE);
+      series.setMarker(SeriesMarkers.NONE);
       charts.add(chart);
     }
     new SwingWrapper(charts).displayChartMatrix();

xchart-demo/src/main/java/org/knowm/xchart/standalone/Example1.java

@@ -19,10 +19,10 @@ package org.knowm.xchart.standalone;
 import org.knowm.xchart.BitmapEncoder;
 import org.knowm.xchart.BitmapEncoder.BitmapFormat;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.VectorGraphicsEncoder;
 import org.knowm.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Creates a simple Chart and saves it as a PNG and JPEG image file.
@@ -39,7 +39,7 @@ public class Example1 {
     chart.setXAxisTitle("X");
     chart.setXAxisTitle("Y");
     Series_XY series = chart.addSeries("y(x)", null, yData);
-    series.setMarker(SeriesMarker.CIRCLE);
+    series.setMarker(SeriesMarkers.CIRCLE);
 
     BitmapEncoder.saveBitmap(chart, "./Sample_Chart", BitmapFormat.PNG);
     BitmapEncoder.saveBitmap(chart, "./Sample_Chart", BitmapFormat.JPG);

xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.knowm.xchart.ChartBuilderXY;
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesMarker;
 import org.knowm.xchart.Series_XY;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.markers.SeriesMarkers;
 
 /**
  * Create a Chart matrix
@@ -44,7 +44,7 @@ public class Example2 {
       chart.getStyleManager().setYAxisMin(-10);
       chart.getStyleManager().setYAxisMax(10);
       Series_XY series = chart.addSeries("" + i, null, getRandomWalk(200));
-      series.setMarker(SeriesMarker.NONE);
+      series.setMarker(SeriesMarkers.NONE);
       charts.add(chart);
     }
     new SwingWrapper(charts).displayChartMatrix();

xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue83.java

@@ -19,10 +19,10 @@ package org.knowm.xchart.standalone;
 import java.io.IOException;
 
 import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.SeriesLineStyle;
 import org.knowm.xchart.SwingWrapper;
 import org.knowm.xchart.internal.style.StyleManager;
 import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
+import org.knowm.xchart.internal.style.lines.SeriesLines;
 
 /**
  * @author timmolter
@@ -51,7 +51,7 @@ public class TestForIssue83 {
         40.45, 40.49, 40.47, 40.59, 40.55, 40.55, 40.35, 40.32, 40.57, 40.33, 40.34, 40.57, 40.38, 40.39, 40.53, 40.33, 40.41, 40.56, 40.37, 40.46, 40.44, 40.47, 40.31, 40.36, 40.55, 40.36, 40.31,
         40.6, 40.39, 40.46, 40.49, 40.42, 40.58, 40.44, 40.38, 40.53, 40.5, 40.32, 40.6, 40.33, 40.41, 40.41, 40.53, 40.35, 40.57, 40.46, 40.56, 40.55, 40.34, 40.49, 40.51, 40.32, 40.37, 40.57, 40.5,
         40.35, 40.43, 40.38, 40.58, 40.52, 40.59, 40.49, 40.55, 40.56, 40.53, 40.47, 40.41 };
-    chart.addSeries("Results", keys, values).setLineStyle(SeriesLineStyle.NONE);
+    chart.addSeries("Results", keys, values).setLineStyle(SeriesLines.NONE);
 
     // BitmapEncoder.saveBitmap(chart, "example", BitmapFormat.PNG);
     new SwingWrapper(chart).displayChart();