cleaned up demos

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

@@ -47,14 +47,17 @@ public class AreaChart01 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
-    chart.addSeries("a", new double[] { 0, 3, 5, 7, 9 }, new double[] { -3, 5, 9, 6, 5 });
-    chart.addSeries("b", new double[] { 0, 2, 4, 6, 9 }, new double[] { -1, 6, 4, 0, 4 });
-    chart.addSeries("c", new double[] { 0, 1, 3, 8, 9 }, new double[] { -2, -1, 1, 0, 1 });
 
     // Customize Chart
     chart.getStyler().setLegendPosition(LegendPosition.InsideNE);
     chart.getStyler().setAxisTitlesVisible(false);
     chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
+
+    // Series
+    chart.addSeries("a", new double[] { 0, 3, 5, 7, 9 }, new double[] { -3, 5, 9, 6, 5 });
+    chart.addSeries("b", new double[] { 0, 2, 4, 6, 9 }, new double[] { -1, 6, 4, 0, 4 });
+    chart.addSeries("c", new double[] { 0, 1, 3, 8, 9 }, new double[] { -2, -1, 1, 0, 1 });
+
     return chart;
   }
 

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

@@ -51,6 +51,11 @@ public class AreaChart02 implements ExampleChart {
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
 
+    // Customize Chart
+    chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
+    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+
+    // Series
     List<Integer> xData = new ArrayList<Integer>();
     List<Integer> yData = new ArrayList<Integer>();
     for (int i = 0; i < 5; i++) {
@@ -73,10 +78,6 @@ public class AreaChart02 implements ExampleChart {
 
     chart.addSeries("a", xData, yData);
 
-    // Customize Chart
-    chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
-    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
-
     return chart;
   }
 

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

@@ -56,7 +56,12 @@ public class AreaLineChart03 implements ExampleChart {
     chart.setYAxisTitle("Amount");
     chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
     chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Line);
+    chart.getStyler().setYAxisLabelAlignment(Styler.TextAlignment.Right);
+    chart.getStyler().setYAxisDecimalPattern("$ #,###.##");
+    chart.getStyler().setPlotMargin(0);
+    chart.getStyler().setPlotContentSize(.95);
 
+    // Series
     // @formatter:off
     double[] xAges = new double[] { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
         88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100 };
@@ -90,13 +95,6 @@ public class AreaLineChart03 implements ExampleChart {
 
     Series_XY seriesPercentile25th = chart.addSeries("25th Percentile", xAges, yPercentile25th);
     seriesPercentile25th.setMarker(SeriesMarkers.NONE);
-
-    chart.getStyler().setYAxisLabelAlignment(Styler.TextAlignment.Right);
-    chart.getStyler().setYAxisDecimalPattern("$ #,###.##");
-
-    chart.getStyler().setPlotMargin(0);
-    chart.getStyler().setPlotContentSize(.95);
-    // chart.getStyleManager().setYAxisMax(1620725 * 1.15); // We want to ensure there is a % of padding on the top of the chart
     return chart;
   }
 

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

@@ -50,12 +50,14 @@ public class BarChart01 implements ExampleChart {
 
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Score").yAxisTitle("Number").build();
-    chart.addSeries("test 1", Arrays.asList(new Integer[] { 0, 1, 2, 3, 4 }), Arrays.asList(new Integer[] { 4, 5, 9, 6, 5 }));
 
     // Customize Chart
     chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
     chart.getStyler().setPlotContentSize(1.0);
 
+    // Series
+    chart.addSeries("test 1", Arrays.asList(new Integer[] { 0, 1, 2, 3, 4 }), Arrays.asList(new Integer[] { 4, 5, 9, 6, 5 }));
+
     return chart;
   }
 }

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

@@ -60,6 +60,12 @@ public class BarChart02 implements ExampleChart {
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().theme(ChartTheme.Matlab).width(800).height(600).title("Units Sold Per Year").xAxisTitle("Year").yAxisTitle("Units Sold").build();
 
+    // Customize Chart
+    chart.getStyler().setPlotGridLinesVisible(false);
+    chart.getStyler().setBarFilled(false);
+    chart.getStyler().setDatePattern("YYYY");
+
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Number> yData = new ArrayList<Number>();
 
@@ -77,9 +83,6 @@ public class BarChart02 implements ExampleChart {
     }
     Series_Category series = chart.addSeries("Model 77", xData, yData);
     series.setLineColor(MatlabSeriesColors.RED);
-    chart.getStyler().setPlotGridLinesVisible(false);
-    chart.getStyler().setBarFilled(false);
-    chart.getStyler().setDatePattern("YYYY");
 
     return chart;
   }

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

@@ -45,6 +45,10 @@ public class BarChart03 implements ExampleChart {
 
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score vs. Age").xAxisTitle("Age").yAxisTitle("Score").build();
+
+    // Customize Chart
+
+    // Series
     chart.addSeries("males", new int[] { 10, 20, 30, 40 }, new int[] { 40, -30, -20, -60 });
 
     return chart;

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

@@ -49,12 +49,15 @@ public class BarChart04 implements ExampleChart {
 
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("XFactor vs. Age").xAxisTitle("Age").yAxisTitle("XFactor").build();
-    chart.addSeries("female", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 50, 10, 20, 40, 35 }));
-    chart.addSeries("male", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 40, 30, 20, null, 60 }));
 
+    // Customize Chart
     chart.getStyler().setYAxisMin(5);
     chart.getStyler().setYAxisMax(70);
 
+    // Series
+    chart.addSeries("female", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 50, 10, 20, 40, 35 }));
+    chart.addSeries("male", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 40, 30, 20, null, 60 }));
+
     return chart;
   }
 }

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

@@ -49,6 +49,10 @@ public class BarChart05 implements ExampleChart {
 
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Temperature vs. Color").xAxisTitle("Color").yAxisTitle("Temperature").theme(ChartTheme.GGPlot2).build();
+
+    // Customize Chart
+
+    // Series
     chart.addSeries("fish", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow", "Orange" })), new ArrayList<Number>(Arrays.asList(new Number[] { -40, 30, 20, 60,
         60 })));
     chart.addSeries("worms", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow", "Orange" })), new ArrayList<Number>(Arrays.asList(new Number[] { 50, 10, -20, 40,

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

@@ -51,16 +51,17 @@ public class BarChart06 implements ExampleChart {
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
 
-    Histogram histogram1 = new Histogram(getGaussianData(10000), 30, -30, 30);
-    Histogram histogram2 = new Histogram(getGaussianData(5000), 30, -30, 30);
-    chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
-    chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
-
     // Customize Chart
     chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
     chart.getStyler().setBarWidthPercentage(.96);
     chart.getStyler().setBarsOverlapped(true);
 
+    // Series
+    Histogram histogram1 = new Histogram(getGaussianData(10000), 30, -30, 30);
+    Histogram histogram2 = new Histogram(getGaussianData(5000), 30, -30, 30);
+    chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
+    chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
+
     return chart;
   }
 

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

@@ -52,15 +52,16 @@ public class BarChart07 implements ExampleChart {
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
 
+    // Customize Chart
+    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+    chart.getStyler().setBarWidthPercentage(.96);
+
+    // Series
     Histogram histogram1 = new Histogram(getGaussianData(1000), 10, -30, 30);
     chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
     Histogram histogram2 = new Histogram(getGaussianData(1000), 10, -30, 30);
     chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
 
-    // Customize Chart
-    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
-    chart.getStyler().setBarWidthPercentage(.96);
-
     return chart;
   }
 
@@ -70,7 +71,6 @@ public class BarChart07 implements ExampleChart {
     Random r = new Random();
     for (int i = 0; i < count; i++) {
       data.add((int) (r.nextGaussian() * 10));
-      // data.add(r.nextDouble() * 60 - 30);
     }
     return data;
   }

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

@@ -51,13 +51,14 @@ public class BarChart08 implements ExampleChart {
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
 
-    Histogram histogram1 = new Histogram(getGaussianData(10000), 10, -10, 10);
-    chart.addSeries("histogram", histogram1.getxAxisData(), histogram1.getyAxisData(), getFakeErrorData(histogram1.getxAxisData().size()));
-
     // Customize Chart
     chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
     chart.getStyler().setBarWidthPercentage(.96);
 
+    // Series
+    Histogram histogram1 = new Histogram(getGaussianData(10000), 10, -10, 10);
+    chart.addSeries("histogram", histogram1.getxAxisData(), histogram1.getyAxisData(), getFakeErrorData(histogram1.getxAxisData().size()));
+
     return chart;
   }
 

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

@@ -51,6 +51,13 @@ public class BarChart09 implements ExampleChart {
 
     // Create Chart
     Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Value vs. Letter").xAxisTitle("Letter").yAxisTitle("Value").theme(ChartTheme.GGPlot2).build();
+
+    // Customize Chart
+    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+    chart.getStyler().setBarWidthPercentage(.55);
+    chart.getStyler().setBarsOverlapped(true);
+
+    // Series
     chart.addSeries("China", new ArrayList<String>(Arrays.asList(new String[] { "A", "B", "C", "D", "E" })), new ArrayList<Number>(Arrays.asList(new Number[] { 11, 23, 20, 36, 5 })));
     Series_Category series2 = chart.addSeries("Korea", new ArrayList<String>(Arrays.asList(new String[] { "A", "B", "C", "D", "E" })), new ArrayList<Number>(Arrays.asList(new Number[] { 13, 25, 22,
         38, 7 })), new ArrayList<Number>(Arrays.asList(new Number[] { 1, 3, 2, 1, 2 })));
@@ -59,11 +66,6 @@ public class BarChart09 implements ExampleChart {
         18, 36, 32 })));
     series3.setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Scatter);
 
-    // Customize Chart
-    chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
-    chart.getStyler().setBarWidthPercentage(.55);
-    chart.getStyler().setBarsOverlapped(true);
-
     return chart;
   }
 

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

@@ -54,8 +54,11 @@ public class DateChart01 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Millisecond Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
+    // Series
     Random random = new Random();
 
     // generate data

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

@@ -47,9 +47,11 @@ public class DateChart02 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Second Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -47,9 +47,11 @@ public class DateChart03 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Minute Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -47,9 +47,11 @@ public class DateChart04 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Hour Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -47,9 +47,11 @@ public class DateChart05 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Day Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -47,9 +47,11 @@ public class DateChart06 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Month Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -47,9 +47,11 @@ public class DateChart07 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Year Scale").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
 
-    // generate data
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();
 

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

@@ -52,10 +52,13 @@ public class DateChart08 implements ExampleChart {
 
     // Create Chart
     Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Rotated Tick Labels").build();
+
+    // Customize Chart
     chart.getStyler().setLegendVisible(false);
     chart.getStyler().setXAxisLabelRotation(60);
     chart.getStyler().setDatePattern("yyyy-MM-dd");
-    // generate data
+
+    // Series
     List<Date> xData = new ArrayList<Date>();
     List<Double> yData = new ArrayList<Double>();