From 4deea928409f5d2bb50eaeb0590ced2a0a5eb733 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Sun, 17 Jan 2016 16:01:59 +0100
Subject: [PATCH] rename some classes
---
.../org/knowm/xchart/demo/charts/area/AreaChart01.java | 4 ++--
.../org/knowm/xchart/demo/charts/area/AreaChart02.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart01.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart02.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart03.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart04.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart05.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart06.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart07.java | 4 ++--
.../org/knowm/xchart/demo/charts/date/DateChart08.java | 4 ++--
.../org/knowm/xchart/demo/charts/line/LineChart01.java | 4 ++--
.../org/knowm/xchart/demo/charts/pie/PieChart01.java | 4 ++--
.../org/knowm/xchart/demo/charts/pie/PieChart02.java | 4 ++--
.../xchart/demo/charts/scatter/ScatterChart04.java | 4 ++--
.../knowm/xchart/demo/charts/theme/ThemeChart02.java | 4 ++--
.../knowm/xchart/demo/charts/theme/ThemeChart03.java | 4 ++--
.../standalone/Example0WithoutHorizontalLines.java | 4 ++--
.../Example0WithoutVerticalAndHorizontalLines.java | 4 ++--
.../standalone/Example0WithoutVerticalLines.java | 4 ++--
.../java/org/knowm/xchart/standalone/Example2.java | 4 ++--
.../org/knowm/xchart/standalone/TestForIssue98.java | 4 ++--
xchart/src/main/java/org/knowm/xchart/CSVExporter.java | 2 ++
.../{ChartBuilderPie.java => ChartBuilder_Pie.java} | 4 ++--
.../{ChartBuilderXY.java => ChartBuilder_XY.java} | 8 ++++----
.../src/main/java/org/knowm/xchart/Chart_Category.java | 4 ++--
xchart/src/main/java/org/knowm/xchart/Chart_Pie.java | 6 +++---
xchart/src/main/java/org/knowm/xchart/Chart_XY.java | 6 +++---
.../main/java/org/knowm/xchart/Series_Category.java | 1 +
xchart/src/main/java/org/knowm/xchart/Series_XY.java | 1 +
...{StyleManagerCategory.java => Styler_Category.java} | 4 ++--
.../xchart/{StyleManagerPie.java => Styler_Pie.java} | 4 ++--
.../xchart/{StyleManagerXY.java => Styler_XY.java} | 4 ++--
xchart/src/main/java/org/knowm/xchart/XChartPanel.java | 1 +
.../knowm/xchart/{ => internal}/Series_AxesChart.java | 3 +--
.../java/org/knowm/xchart/internal/chartpart/Axis.java | 6 +++---
.../org/knowm/xchart/internal/chartpart/AxisPair.java | 8 ++++----
.../org/knowm/xchart/internal/chartpart/AxisTick.java | 2 +-
.../xchart/internal/chartpart/AxisTickLabels.java | 2 +-
.../knowm/xchart/internal/chartpart/AxisTickMarks.java | 2 +-
.../org/knowm/xchart/internal/chartpart/AxisTitle.java | 2 +-
.../xchart/internal/chartpart/LegendAxesChart.java | 2 +-
.../org/knowm/xchart/internal/chartpart/LegendPie.java | 6 +++---
.../internal/chartpart/PlotContent_Category_Bar.java | 6 +++---
.../PlotContent_Category_Line_Area_Scatter.java | 6 +++---
.../xchart/internal/chartpart/PlotContent_Pie.java | 6 +++---
.../xchart/internal/chartpart/PlotContent_XY.java | 6 +++---
.../xchart/internal/chartpart/PlotSurfacePie.java | 6 +++---
.../knowm/xchart/internal/chartpart/Plot_Category.java | 10 +++++-----
.../org/knowm/xchart/internal/chartpart/Plot_Pie.java | 8 ++++----
.../org/knowm/xchart/internal/chartpart/Plot_XY.java | 6 +++---
.../xchart/internal/style/colors/SeriesColors.java | 3 ++-
.../knowm/xchart/internal/style/lines/NoneStroke.java | 3 ++-
.../xchart/internal/style/markers/SeriesMarkers.java | 3 ++-
53 files changed, 116 insertions(+), 109 deletions(-)
rename xchart/src/main/java/org/knowm/xchart/{ChartBuilderPie.java => ChartBuilder_Pie.java} (89%)
rename xchart/src/main/java/org/knowm/xchart/{ChartBuilderXY.java => ChartBuilder_XY.java} (83%)
rename xchart/src/main/java/org/knowm/xchart/{StyleManagerCategory.java => Styler_Category.java} (95%)
rename xchart/src/main/java/org/knowm/xchart/{StyleManagerPie.java => Styler_Pie.java} (97%)
rename xchart/src/main/java/org/knowm/xchart/{StyleManagerXY.java => Styler_XY.java} (95%)
rename xchart/src/main/java/org/knowm/xchart/{ => internal}/Series_AxesChart.java (98%)
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
index 29ecd0cb..e0d5f414 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
@@ -16,7 +16,7 @@
*/
package org.knowm.xchart.demo.charts.area;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
@@ -46,7 +46,7 @@ public class AreaChart01 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
+ 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 });
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
index 2a39a6fd..892c02c7 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.demo.charts.area;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
@@ -49,7 +49,7 @@ public class AreaChart02 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
List<Integer> xData = new ArrayList<Integer>();
List<Integer> yData = new ArrayList<Integer>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
index 11252122..205402ba 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -53,7 +53,7 @@ public class DateChart01 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Millisecond Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Millisecond Scale").build();
chart.getStyleManager().setLegendVisible(false);
Random random = new Random();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
index 9a917e7f..f57e4150 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart02 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Second Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Second Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
index 5e9519b8..0ff35af1 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart03 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Minute Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Minute Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
index ad26c13d..68f9d405 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart04 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Hour Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Hour Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
index 34b7b78a..571a3557 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart05 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Day Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Day Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
index 0c97fe00..6751636d 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart06 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Month Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Month Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
index f357f4f1..94c25f48 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -46,7 +46,7 @@ public class DateChart07 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Year Scale").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Year Scale").build();
chart.getStyleManager().setLegendVisible(false);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
index f8def44c..10906660 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -51,7 +51,7 @@ public class DateChart08 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Rotated Tick Labels").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Rotated Tick Labels").build();
chart.getStyleManager().setLegendVisible(false);
chart.getStyleManager().setXAxisLabelRotation(60);
chart.getStyleManager().setDatePattern("yyyy-MM-dd");
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
index cd2e519a..4d5922fa 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.demo.charts.line;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -56,7 +56,7 @@ public class LineChart01 implements ExampleChart {
}
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("Powers of Ten").xAxisTitle("Power").yAxisTitle("Value").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Powers of Ten").xAxisTitle("Power").yAxisTitle("Value").build();
// Customize Chart
chart.getStyleManager().setChartTitleVisible(true);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
index 6c28e9f3..3ff1032e 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
@@ -16,7 +16,7 @@
*/
package org.knowm.xchart.demo.charts.pie;
-import org.knowm.xchart.ChartBuilderPie;
+import org.knowm.xchart.ChartBuilder_Pie;
import org.knowm.xchart.Chart_Pie;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -42,7 +42,7 @@ public class PieChart01 implements ExampleChart<Chart_Pie> {
public Chart_Pie getChart() {
// Create Chart
- Chart_Pie chart = new ChartBuilderPie().width(400).height(500).title(getClass().getSimpleName()).build();
+ Chart_Pie chart = new ChartBuilder_Pie().width(400).height(500).title(getClass().getSimpleName()).build();
chart.addSeries("Pennies", 100);
chart.addSeries("Nickels", 100);
chart.addSeries("Dimes", 100);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
index 1dbb2956..e8cb40a6 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
@@ -18,7 +18,7 @@ package org.knowm.xchart.demo.charts.pie;
import java.awt.Color;
-import org.knowm.xchart.ChartBuilderPie;
+import org.knowm.xchart.ChartBuilder_Pie;
import org.knowm.xchart.Chart_Pie;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -45,7 +45,7 @@ public class PieChart02 implements ExampleChart<Chart_Pie> {
public Chart_Pie getChart() {
// Create Chart
- Chart_Pie chart = new ChartBuilderPie().width(800).height(600).title(getClass().getSimpleName()).build();
+ Chart_Pie chart = new ChartBuilder_Pie().width(800).height(600).title(getClass().getSimpleName()).build();
chart.addSeries("Gold", 24);
chart.addSeries("Silver", 21);
chart.addSeries("Platinum", 39);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
index a20078bb..f62a81b3 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
@@ -20,7 +20,7 @@ import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -63,7 +63,7 @@ public class ScatterChart04 implements ExampleChart {
}
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).title("ScatterChart04").xAxisTitle("X").yAxisTitle("Y").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("ScatterChart04").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
chart.getStyleManager().setChartTitleVisible(false);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
index 200fb5cb..0766fbcd 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
@@ -16,7 +16,7 @@
*/
package org.knowm.xchart.demo.charts.theme;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -45,7 +45,7 @@ public class ThemeChart02 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).theme(ChartTheme.GGPlot2).title("GGPlot2 Theme").xAxisTitle("X").yAxisTitle("Y").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.GGPlot2).title("GGPlot2 Theme").xAxisTitle("X").yAxisTitle("Y").build();
chart.addSeries("vertical", new double[] { 1, 1 }, new double[] { -10, 10 });
chart.addSeries("horizontal", new double[] { -10, 10 }, new double[] { 0, 0 });
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
index 76e0e9f8..7d45de8a 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -52,7 +52,7 @@ public class ThemeChart03 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilderXY().width(800).height(600).theme(ChartTheme.Matlab).title("Matlab Theme").xAxisTitle("X").yAxisTitle("Y").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.Matlab).title("Matlab Theme").xAxisTitle("X").yAxisTitle("Y").build();
chart.getStyleManager().setPlotGridLinesVisible(false);
chart.getStyleManager().setXAxisTickMarkSpacingHint(100);
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutHorizontalLines.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutHorizontalLines.java
index 10a2bc5d..2b3a8533 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutHorizontalLines.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutHorizontalLines.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.standalone;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -38,7 +38,7 @@ public class Example0WithoutHorizontalLines {
List<Chart> charts = new ArrayList<Chart>();
for (int i = 0; i < numCharts; i++) {
- Chart_XY chart = new ChartBuilderXY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
+ Chart_XY chart = new ChartBuilder_XY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
chart.getStyleManager().setYAxisMin(-10);
chart.getStyleManager().setYAxisMax(10);
chart.getStyleManager().setPlotGridHorizontalLinesVisible(false);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalAndHorizontalLines.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalAndHorizontalLines.java
index 435629cc..03ccf9a7 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalAndHorizontalLines.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalAndHorizontalLines.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.standalone;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -40,7 +40,7 @@ public class Example0WithoutVerticalAndHorizontalLines {
List<Chart> charts = new ArrayList<Chart>();
for (int i = 0; i < numCharts; i++) {
- Chart_XY chart = new ChartBuilderXY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
+ Chart_XY chart = new ChartBuilder_XY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
chart.getStyleManager().setYAxisMin(-10);
chart.getStyleManager().setYAxisMax(10);
chart.getStyleManager().setPlotGridVerticalLinesVisible(false);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalLines.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalLines.java
index 2f6f02dc..42e10143 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalLines.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0WithoutVerticalLines.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.standalone;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -38,7 +38,7 @@ public class Example0WithoutVerticalLines {
List<Chart> charts = new ArrayList<Chart>();
for (int i = 0; i < numCharts; i++) {
- Chart_XY chart = new ChartBuilderXY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
+ Chart_XY chart = new ChartBuilder_XY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
chart.getStyleManager().setYAxisMin(-10);
chart.getStyleManager().setYAxisMax(10);
chart.getStyleManager().setPlotGridVerticalLinesVisible(false);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
index 6accffad..db660fbc 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
@@ -19,7 +19,7 @@ package org.knowm.xchart.standalone;
import java.util.ArrayList;
import java.util.List;
-import org.knowm.xchart.ChartBuilderXY;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -40,7 +40,7 @@ public class Example2 {
List<Chart> charts = new ArrayList<Chart>();
for (int i = 0; i < numCharts; i++) {
- Chart_XY chart = new ChartBuilderXY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
+ Chart_XY chart = new ChartBuilder_XY().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
chart.getStyleManager().setYAxisMin(-10);
chart.getStyleManager().setYAxisMax(10);
Series_XY series = chart.addSeries("" + i, null, getRandomWalk(200));
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
index 7468f91d..ef218ce5 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Date;
import org.knowm.xchart.Chart_XY;
-import org.knowm.xchart.StyleManagerXY;
+import org.knowm.xchart.Styler_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
@@ -33,7 +33,7 @@ public class TestForIssue98 {
public static void main(String[] args) throws IOException {
final Chart_XY chart = new Chart_XY(1920, 1080);
- StyleManagerXY manager = chart.getStyleManager();
+ Styler_XY manager = chart.getStyleManager();
manager.setLegendPosition(LegendPosition.InsideNW);
manager.setYAxisLogarithmic(true);
diff --git a/xchart/src/main/java/org/knowm/xchart/CSVExporter.java b/xchart/src/main/java/org/knowm/xchart/CSVExporter.java
index f3b6ddae..9ff2fa1b 100644
--- a/xchart/src/main/java/org/knowm/xchart/CSVExporter.java
+++ b/xchart/src/main/java/org/knowm/xchart/CSVExporter.java
@@ -25,6 +25,8 @@ import java.io.Writer;
import java.util.Collection;
import java.util.Iterator;
+import org.knowm.xchart.internal.Series_AxesChart;
+
/**
* This class is used to export Chart data to a folder containing one or more CSV files. The parent folder's name is the title of the chart. Each
* series becomes a CSV file in the folder. The series' name becomes the CSV files' name.
diff --git a/xchart/src/main/java/org/knowm/xchart/ChartBuilderPie.java b/xchart/src/main/java/org/knowm/xchart/ChartBuilder_Pie.java
similarity index 89%
rename from xchart/src/main/java/org/knowm/xchart/ChartBuilderPie.java
rename to xchart/src/main/java/org/knowm/xchart/ChartBuilder_Pie.java
index c678df59..44dcd609 100644
--- a/xchart/src/main/java/org/knowm/xchart/ChartBuilderPie.java
+++ b/xchart/src/main/java/org/knowm/xchart/ChartBuilder_Pie.java
@@ -21,9 +21,9 @@ import org.knowm.xchart.internal.ChartBuilder;
/**
* @author timmolter
*/
-public class ChartBuilderPie extends ChartBuilder<ChartBuilderPie, Chart_Pie> {
+public class ChartBuilder_Pie extends ChartBuilder<ChartBuilder_Pie, Chart_Pie> {
- public ChartBuilderPie() {
+ public ChartBuilder_Pie() {
}
diff --git a/xchart/src/main/java/org/knowm/xchart/ChartBuilderXY.java b/xchart/src/main/java/org/knowm/xchart/ChartBuilder_XY.java
similarity index 83%
rename from xchart/src/main/java/org/knowm/xchart/ChartBuilderXY.java
rename to xchart/src/main/java/org/knowm/xchart/ChartBuilder_XY.java
index 147be6cf..1e3c55ea 100644
--- a/xchart/src/main/java/org/knowm/xchart/ChartBuilderXY.java
+++ b/xchart/src/main/java/org/knowm/xchart/ChartBuilder_XY.java
@@ -21,22 +21,22 @@ import org.knowm.xchart.internal.ChartBuilder;
/**
* @author timmolter
*/
-public class ChartBuilderXY extends ChartBuilder<ChartBuilderXY, Chart_XY> {
+public class ChartBuilder_XY extends ChartBuilder<ChartBuilder_XY, Chart_XY> {
String xAxisTitle = "";
String yAxisTitle = "";
- public ChartBuilderXY() {
+ public ChartBuilder_XY() {
}
- public ChartBuilderXY xAxisTitle(String xAxisTitle) {
+ public ChartBuilder_XY xAxisTitle(String xAxisTitle) {
this.xAxisTitle = xAxisTitle;
return this;
}
- public ChartBuilderXY yAxisTitle(String yAxisTitle) {
+ public ChartBuilder_XY yAxisTitle(String yAxisTitle) {
this.yAxisTitle = yAxisTitle;
return this;
diff --git a/xchart/src/main/java/org/knowm/xchart/Chart_Category.java b/xchart/src/main/java/org/knowm/xchart/Chart_Category.java
index 19a60564..62953ee6 100644
--- a/xchart/src/main/java/org/knowm/xchart/Chart_Category.java
+++ b/xchart/src/main/java/org/knowm/xchart/Chart_Category.java
@@ -35,7 +35,7 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class Chart_Category extends Chart<StyleManagerCategory, Series_Category> {
+public class Chart_Category extends Chart<Styler_Category, Series_Category> {
/**
* Constructor - the default Chart Theme will be used (XChartTheme)
@@ -45,7 +45,7 @@ public class Chart_Category extends Chart<StyleManagerCategory, Series_Category>
*/
public Chart_Category(int width, int height) {
- super(width, height, new StyleManagerCategory());
+ super(width, height, new Styler_Category());
axisPair = new AxisPair(this);
plot = new Plot_Category(this);
chartLegend = new LegendAxesChart(this);
diff --git a/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java b/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
index aa2b8015..c290d074 100644
--- a/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
+++ b/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
@@ -33,7 +33,7 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class Chart_Pie extends Chart<StyleManagerPie, Series_Pie> {
+public class Chart_Pie extends Chart<Styler_Pie, Series_Pie> {
/**
* Constructor - the default Chart Theme will be used (XChartTheme)
@@ -43,7 +43,7 @@ public class Chart_Pie extends Chart<StyleManagerPie, Series_Pie> {
*/
public Chart_Pie(int width, int height) {
- super(width, height, new StyleManagerPie());
+ super(width, height, new Styler_Pie());
plot = new Plot_Pie(this);
chartLegend = new LegendPie(this);
}
@@ -78,7 +78,7 @@ public class Chart_Pie extends Chart<StyleManagerPie, Series_Pie> {
*
* @param chartBuilder
*/
- public Chart_Pie(ChartBuilderPie chartBuilder) {
+ public Chart_Pie(ChartBuilder_Pie chartBuilder) {
this(chartBuilder.width, chartBuilder.height, chartBuilder.chartTheme);
setTitle(chartBuilder.title);
diff --git a/xchart/src/main/java/org/knowm/xchart/Chart_XY.java b/xchart/src/main/java/org/knowm/xchart/Chart_XY.java
index 6c5e3f0f..6246c56b 100644
--- a/xchart/src/main/java/org/knowm/xchart/Chart_XY.java
+++ b/xchart/src/main/java/org/knowm/xchart/Chart_XY.java
@@ -35,7 +35,7 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class Chart_XY extends Chart<StyleManagerXY, Series_XY> {
+public class Chart_XY extends Chart<Styler_XY, Series_XY> {
/**
* Constructor - the default Chart Theme will be used (XChartTheme)
@@ -45,7 +45,7 @@ public class Chart_XY extends Chart<StyleManagerXY, Series_XY> {
*/
public Chart_XY(int width, int height) {
- super(width, height, new StyleManagerXY());
+ super(width, height, new Styler_XY());
axisPair = new AxisPair(this);
plot = new Plot_XY(this);
chartLegend = new LegendAxesChart(this);
@@ -81,7 +81,7 @@ public class Chart_XY extends Chart<StyleManagerXY, Series_XY> {
*
* @param chartBuilder
*/
- public Chart_XY(ChartBuilderXY chartBuilder) {
+ public Chart_XY(ChartBuilder_XY chartBuilder) {
this(chartBuilder.width, chartBuilder.height, chartBuilder.chartTheme);
setTitle(chartBuilder.title);
diff --git a/xchart/src/main/java/org/knowm/xchart/Series_Category.java b/xchart/src/main/java/org/knowm/xchart/Series_Category.java
index 116b30a3..2e7194da 100644
--- a/xchart/src/main/java/org/knowm/xchart/Series_Category.java
+++ b/xchart/src/main/java/org/knowm/xchart/Series_Category.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import org.knowm.xchart.internal.chartpart.Axis.AxisDataType;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.RenderableSeries;
import org.knowm.xchart.internal.chartpart.RenderableSeries.LegendRenderType;
diff --git a/xchart/src/main/java/org/knowm/xchart/Series_XY.java b/xchart/src/main/java/org/knowm/xchart/Series_XY.java
index ff3a7cb4..9cb871d3 100644
--- a/xchart/src/main/java/org/knowm/xchart/Series_XY.java
+++ b/xchart/src/main/java/org/knowm/xchart/Series_XY.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import org.knowm.xchart.internal.chartpart.Axis.AxisDataType;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.RenderableSeries;
import org.knowm.xchart.internal.chartpart.RenderableSeries.LegendRenderType;
diff --git a/xchart/src/main/java/org/knowm/xchart/StyleManagerCategory.java b/xchart/src/main/java/org/knowm/xchart/Styler_Category.java
similarity index 95%
rename from xchart/src/main/java/org/knowm/xchart/StyleManagerCategory.java
rename to xchart/src/main/java/org/knowm/xchart/Styler_Category.java
index 5cfc95e9..e626d620 100644
--- a/xchart/src/main/java/org/knowm/xchart/StyleManagerCategory.java
+++ b/xchart/src/main/java/org/knowm/xchart/Styler_Category.java
@@ -23,14 +23,14 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class StyleManagerCategory extends StyleManagerAxesChart {
+public class Styler_Category extends StyleManagerAxesChart {
private ChartCategorySeriesRenderStyle chartCategorySeriesRenderStyle;
/**
* Constructor
*/
- public StyleManagerCategory() {
+ public Styler_Category() {
this.setAllStyles();
super.setAllStyles();
diff --git a/xchart/src/main/java/org/knowm/xchart/StyleManagerPie.java b/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java
similarity index 97%
rename from xchart/src/main/java/org/knowm/xchart/StyleManagerPie.java
rename to xchart/src/main/java/org/knowm/xchart/Styler_Pie.java
index c13a82d3..a1a2a326 100644
--- a/xchart/src/main/java/org/knowm/xchart/StyleManagerPie.java
+++ b/xchart/src/main/java/org/knowm/xchart/Styler_Pie.java
@@ -23,7 +23,7 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class StyleManagerPie extends StyleManager {
+public class Styler_Pie extends StyleManager {
private ChartPieSeriesRenderStyle chartPieSeriesRenderStyle;
@@ -34,7 +34,7 @@ public class StyleManagerPie extends StyleManager {
/**
* Constructor
*/
- public StyleManagerPie() {
+ public Styler_Pie() {
this.setAllStyles();
super.setAllStyles();
diff --git a/xchart/src/main/java/org/knowm/xchart/StyleManagerXY.java b/xchart/src/main/java/org/knowm/xchart/Styler_XY.java
similarity index 95%
rename from xchart/src/main/java/org/knowm/xchart/StyleManagerXY.java
rename to xchart/src/main/java/org/knowm/xchart/Styler_XY.java
index 8f42c784..d4fd8389 100644
--- a/xchart/src/main/java/org/knowm/xchart/StyleManagerXY.java
+++ b/xchart/src/main/java/org/knowm/xchart/Styler_XY.java
@@ -23,14 +23,14 @@ import org.knowm.xchart.internal.style.Theme;
/**
* @author timmolter
*/
-public class StyleManagerXY extends StyleManagerAxesChart {
+public class Styler_XY extends StyleManagerAxesChart {
private ChartXYSeriesRenderStyle chartXYSeriesRenderStyle;
/**
* Constructor
*/
- public StyleManagerXY() {
+ public Styler_XY() {
this.setAllStyles();
super.setAllStyles();
diff --git a/xchart/src/main/java/org/knowm/xchart/XChartPanel.java b/xchart/src/main/java/org/knowm/xchart/XChartPanel.java
index ea534ec9..34434c22 100644
--- a/xchart/src/main/java/org/knowm/xchart/XChartPanel.java
+++ b/xchart/src/main/java/org/knowm/xchart/XChartPanel.java
@@ -42,6 +42,7 @@ import javax.swing.filechooser.FileFilter;
import org.knowm.xchart.BitmapEncoder.BitmapFormat;
import org.knowm.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.Chart;
/**
diff --git a/xchart/src/main/java/org/knowm/xchart/Series_AxesChart.java b/xchart/src/main/java/org/knowm/xchart/internal/Series_AxesChart.java
similarity index 98%
rename from xchart/src/main/java/org/knowm/xchart/Series_AxesChart.java
rename to xchart/src/main/java/org/knowm/xchart/internal/Series_AxesChart.java
index b39e967e..5bf688f1 100644
--- a/xchart/src/main/java/org/knowm/xchart/Series_AxesChart.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/Series_AxesChart.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.knowm.xchart;
+package org.knowm.xchart.internal;
import java.awt.BasicStroke;
import java.awt.Color;
@@ -23,7 +23,6 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.chartpart.Axis.AxisDataType;
import org.knowm.xchart.internal.style.markers.Marker;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
index 2d33c4e8..a36623a4 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
@@ -24,9 +24,9 @@ import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.util.List;
-import org.knowm.xchart.Series_AxesChart;
-import org.knowm.xchart.StyleManagerCategory;
+import org.knowm.xchart.Styler_Category;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
@@ -348,7 +348,7 @@ public class Axis<SM extends StyleManagerAxesChart, S extends Series> implements
// X-Axis
if (getDirection() == Direction.X) {
- if (chart.getStyleManager() instanceof StyleManagerCategory) {
+ if (chart.getStyleManager() instanceof Styler_Category) {
List<?> categories = (List<?>) chart.getSeriesMap().values().iterator().next().getXData();
AxisDataType axisType = chart.getAxisPair().getXAxis().getAxisDataType();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
index 67edcd2f..9183e315 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
@@ -19,11 +19,11 @@ package org.knowm.xchart.internal.chartpart;
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
-import org.knowm.xchart.StyleManagerCategory;
+import org.knowm.xchart.Styler_Category;
/**
* @author timmolter
@@ -93,9 +93,9 @@ public class AxisPair<SM extends StyleManagerAxesChart, S extends Series> implem
double overrideYAxisMinValue = yAxis.getMin();
double overrideYAxisMaxValue = yAxis.getMax();
- if (chart.getStyleManager() instanceof StyleManagerCategory) {
+ if (chart.getStyleManager() instanceof Styler_Category) {
- StyleManagerCategory styleManagerCategory = (StyleManagerCategory) chart.getStyleManager();
+ Styler_Category styleManagerCategory = (Styler_Category) chart.getStyleManager();
if (styleManagerCategory.getChartCategorySeriesRenderStyle() == ChartCategorySeriesRenderStyle.Bar) {
// override min/max value for bar charts' Y-Axis
// There is a special case where it's desired to anchor the axis min or max to zero, like in the case of bar charts. This flag enables that feature.
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
index 38d09246..71397dfb 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
@@ -19,8 +19,8 @@ package org.knowm.xchart.internal.chartpart;
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.Axis.Direction;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
index 6d53e601..e917ca54 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
@@ -25,8 +25,8 @@ import java.awt.geom.Rectangle2D;
import java.util.HashMap;
import java.util.Map;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.Axis.Direction;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
index b593da4c..e419708c 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
@@ -21,8 +21,8 @@ import java.awt.Shape;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.Axis.Direction;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
index 2f11a24e..4b31db04 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
@@ -23,8 +23,8 @@ import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.Axis.Direction;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendAxesChart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendAxesChart.java
index 8c867bfd..5d6e5a17 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendAxesChart.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendAxesChart.java
@@ -26,9 +26,9 @@ import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import java.util.Map;
-import org.knowm.xchart.Series_AxesChart;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.internal.Series;
+import org.knowm.xchart.internal.Series_AxesChart;
import org.knowm.xchart.internal.chartpart.RenderableSeries.LegendRenderType;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
import org.knowm.xchart.internal.style.lines.SeriesLines;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendPie.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendPie.java
index 9e1a87dc..dfa351c7 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendPie.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/LegendPie.java
@@ -26,7 +26,7 @@ import java.awt.geom.Rectangle2D;
import java.util.Map;
import org.knowm.xchart.Series_Pie;
-import org.knowm.xchart.StyleManagerPie;
+import org.knowm.xchart.Styler_Pie;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
@@ -35,14 +35,14 @@ import org.knowm.xchart.internal.style.StyleManagerAxesChart;
*/
public class LegendPie<SM extends StyleManagerAxesChart, S extends Series> extends Legend {
- StyleManagerPie styleManagerPie;
+ Styler_Pie styleManagerPie;
/**
* Constructor
*
* @param chart
*/
- public LegendPie(Chart<StyleManagerPie, Series_Pie> chart) {
+ public LegendPie(Chart<Styler_Pie, Series_Pie> chart) {
super(chart);
styleManagerPie = chart.getStyleManager();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
index 006dfff9..e0becf60 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Bar.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.knowm.xchart.Series_Category;
import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
-import org.knowm.xchart.StyleManagerCategory;
+import org.knowm.xchart.Styler_Category;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.Utils;
import org.knowm.xchart.internal.style.StyleManager;
@@ -38,14 +38,14 @@ import org.knowm.xchart.internal.style.lines.SeriesLines;
*/
public class PlotContent_Category_Bar<SM extends StyleManager, S extends Series> extends PlotContent_ {
- StyleManagerCategory styleManagerCategory;
+ Styler_Category styleManagerCategory;
/**
* Constructor
*
* @param plot
*/
- protected PlotContent_Category_Bar(Chart<StyleManagerCategory, Series_Category> chart) {
+ protected PlotContent_Category_Bar(Chart<Styler_Category, Series_Category> chart) {
super(chart);
this.styleManagerCategory = chart.getStyleManager();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Line_Area_Scatter.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Line_Area_Scatter.java
index 2aaa9cc0..2beadc36 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Line_Area_Scatter.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Category_Line_Area_Scatter.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.knowm.xchart.Series_Category;
import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
-import org.knowm.xchart.StyleManagerCategory;
+import org.knowm.xchart.Styler_Category;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.Utils;
import org.knowm.xchart.internal.style.StyleManager;
@@ -38,14 +38,14 @@ import org.knowm.xchart.internal.style.lines.SeriesLines;
*/
public class PlotContent_Category_Line_Area_Scatter<SM extends StyleManager, S extends Series> extends PlotContent_ {
- StyleManagerCategory styleManagerCategory;
+ Styler_Category styleManagerCategory;
/**
* Constructor
*
* @param plot
*/
- protected PlotContent_Category_Line_Area_Scatter(Chart<StyleManagerCategory, Series_Category> chart) {
+ protected PlotContent_Category_Line_Area_Scatter(Chart<Styler_Category, Series_Category> chart) {
super(chart);
this.styleManagerCategory = styleManagerCategory;
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java
index 25261cba..ad7c9f8f 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_Pie.java
@@ -27,7 +27,7 @@ import java.text.DecimalFormat;
import java.util.Map;
import org.knowm.xchart.Series_Pie;
-import org.knowm.xchart.StyleManagerPie;
+import org.knowm.xchart.Styler_Pie;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManager;
@@ -36,7 +36,7 @@ import org.knowm.xchart.internal.style.StyleManager;
*/
public class PlotContent_Pie<SM extends StyleManager, S extends Series> extends PlotContent_ {
- StyleManagerPie styleManagerPie;
+ Styler_Pie styleManagerPie;
DecimalFormat df = new DecimalFormat("#.0");
/**
@@ -44,7 +44,7 @@ public class PlotContent_Pie<SM extends StyleManager, S extends Series> extends
*
* @param plot
*/
- protected PlotContent_Pie(Chart<StyleManagerPie, Series_Pie> chart) {
+ protected PlotContent_Pie(Chart<Styler_Pie, Series_Pie> chart) {
super(chart);
styleManagerPie = chart.getStyleManager();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_XY.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_XY.java
index ad7cc892..05b51664 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_XY.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_XY.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
-import org.knowm.xchart.StyleManagerXY;
+import org.knowm.xchart.Styler_XY;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.Utils;
import org.knowm.xchart.internal.chartpart.Axis.AxisDataType;
@@ -40,14 +40,14 @@ import org.knowm.xchart.internal.style.lines.SeriesLines;
*/
public class PlotContent_XY<SM extends StyleManagerAxesChart, S extends Series> extends PlotContent_ {
- StyleManagerXY styleManagerXY;
+ Styler_XY styleManagerXY;
/**
* Constructor
*
* @param chart
*/
- protected PlotContent_XY(Chart<StyleManagerXY, Series_XY> chart) {
+ protected PlotContent_XY(Chart<Styler_XY, Series_XY> chart) {
super(chart);
styleManagerXY = chart.getStyleManager();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurfacePie.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurfacePie.java
index 8c48d76d..d9251453 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurfacePie.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurfacePie.java
@@ -21,7 +21,7 @@ import java.awt.Shape;
import java.awt.geom.Rectangle2D;
import org.knowm.xchart.Series_Pie;
-import org.knowm.xchart.StyleManagerPie;
+import org.knowm.xchart.Styler_Pie;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManager;
@@ -32,14 +32,14 @@ import org.knowm.xchart.internal.style.StyleManager;
*/
public class PlotSurfacePie<SM extends StyleManager, S extends Series> extends PlotSurface {
- private final StyleManagerPie styleManagerPie;
+ private final Styler_Pie styleManagerPie;
/**
* Constructor
*
* @param chart
*/
- protected PlotSurfacePie(Chart<StyleManagerPie, Series_Pie> chart) {
+ protected PlotSurfacePie(Chart<Styler_Pie, Series_Pie> chart) {
super(chart);
this.styleManagerPie = chart.getStyleManager();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
index c400eafb..fe5838da 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
@@ -20,7 +20,7 @@ import org.knowm.xchart.Series_Category;
import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
-import org.knowm.xchart.StyleManagerCategory;
+import org.knowm.xchart.Styler_Category;
/**
* @author timmolter
@@ -32,19 +32,19 @@ public class Plot_Category<SM extends StyleManagerAxesChart, S extends Series> e
*
* @param chart
*/
- public Plot_Category(Chart<StyleManagerCategory, Series_Category> chart) {
+ public Plot_Category(Chart<Styler_Category, Series_Category> chart) {
super(chart);
- StyleManagerCategory styleManagerCategory = chart.getStyleManager();
+ Styler_Category styleManagerCategory = chart.getStyleManager();
if (ChartCategorySeriesRenderStyle.Bar.equals(styleManagerCategory.getChartCategorySeriesRenderStyle())) {
- this.plotContent = new PlotContent_Category_Bar<StyleManagerCategory, Series_Category>(chart);
+ this.plotContent = new PlotContent_Category_Bar<Styler_Category, Series_Category>(chart);
}
else {
- this.plotContent = new PlotContent_Category_Line_Area_Scatter<StyleManagerCategory, Series_Category>(chart);
+ this.plotContent = new PlotContent_Category_Line_Area_Scatter<Styler_Category, Series_Category>(chart);
}
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Pie.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Pie.java
index 17bd0444..4c06cf22 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Pie.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Pie.java
@@ -20,7 +20,7 @@ import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
import org.knowm.xchart.Series_Pie;
-import org.knowm.xchart.StyleManagerPie;
+import org.knowm.xchart.Styler_Pie;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManager;
import org.knowm.xchart.internal.style.StyleManager.LegendPosition;
@@ -35,11 +35,11 @@ public class Plot_Pie<SM extends StyleManager, S extends Series> extends Plot_ {
*
* @param chart
*/
- public Plot_Pie(Chart<StyleManagerPie, Series_Pie> chart) {
+ public Plot_Pie(Chart<Styler_Pie, Series_Pie> chart) {
super(chart);
- this.plotContent = new PlotContent_Pie<StyleManagerPie, Series_Pie>(chart);
- this.plotSurface = new PlotSurfacePie<StyleManagerPie, Series_Pie>(chart);
+ this.plotContent = new PlotContent_Pie<Styler_Pie, Series_Pie>(chart);
+ this.plotSurface = new PlotSurfacePie<Styler_Pie, Series_Pie>(chart);
}
@Override
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_XY.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_XY.java
index d4a42677..cb24c512 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_XY.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_XY.java
@@ -17,7 +17,7 @@
package org.knowm.xchart.internal.chartpart;
import org.knowm.xchart.Series_XY;
-import org.knowm.xchart.StyleManagerXY;
+import org.knowm.xchart.Styler_XY;
import org.knowm.xchart.internal.Series;
import org.knowm.xchart.internal.style.StyleManagerAxesChart;
@@ -31,10 +31,10 @@ public class Plot_XY<SM extends StyleManagerAxesChart, S extends Series> extends
*
* @param chart
*/
- public Plot_XY(Chart<StyleManagerXY, Series_XY> chart) {
+ public Plot_XY(Chart<Styler_XY, Series_XY> chart) {
super(chart);
- this.plotContent = new PlotContent_XY<StyleManagerXY, Series_XY>(chart);
+ this.plotContent = new PlotContent_XY<Styler_XY, Series_XY>(chart);
}
}
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/colors/SeriesColors.java b/xchart/src/main/java/org/knowm/xchart/internal/style/colors/SeriesColors.java
index 3b1671bb..a45d4cc6 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/style/colors/SeriesColors.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/colors/SeriesColors.java
@@ -1,5 +1,6 @@
/**
- * Copyright 2013 Xeiam LLC.
+ * 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.
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/lines/NoneStroke.java b/xchart/src/main/java/org/knowm/xchart/internal/style/lines/NoneStroke.java
index c34ca10d..80f3a9a3 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/style/lines/NoneStroke.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/lines/NoneStroke.java
@@ -1,5 +1,6 @@
/**
- * Copyright 2013 Xeiam LLC.
+ * 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.
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/style/markers/SeriesMarkers.java b/xchart/src/main/java/org/knowm/xchart/internal/style/markers/SeriesMarkers.java
index eef1a17d..780e3335 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/style/markers/SeriesMarkers.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/markers/SeriesMarkers.java
@@ -1,5 +1,6 @@
/**
- * Copyright 2013 Xeiam LLC.
+ * 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.
--
GitLab