package rearrange

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java

@@ -18,9 +18,9 @@ package com.xeiam.xchart.demo.charts.area;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * 3-Series

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java

@@ -24,9 +24,9 @@ package com.xeiam.xchart.demo.charts.bar;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Basic Bar Chart

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java

@@ -32,8 +32,8 @@ import java.util.Random;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
 
 /**
  * Basic Bar Chart

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart03.java

@@ -24,8 +24,8 @@ package com.xeiam.xchart.demo.charts.bar;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
 
 /**
  * Basic Bar Chart

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java

@@ -24,8 +24,8 @@ package com.xeiam.xchart.demo.charts.bar;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
 
 /**
  * Missing Point in Series

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java

@@ -27,9 +27,9 @@ import java.util.Arrays;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartTheme;
+import com.xeiam.xchart.StyleManager.ChartType;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.theme.GGPlot2Theme;
 
 /**
  * <p>
@@ -52,7 +52,7 @@ public class BarChart05 implements ExampleChart {
   public Chart getChart() {
 
     // Create Chart
-    Chart chart = new ChartBuilder().chartType(ChartType.Bar).width(800).height(600).title("Temperature vs. Color").xAxisTitle("Color").yAxisTitle("Temperature").theme(new GGPlot2Theme()).build();
+    Chart chart = new ChartBuilder().chartType(ChartType.Bar).width(800).height(600).title("Temperature vs. Color").xAxisTitle("Color").yAxisTitle("Temperature").theme(ChartTheme.GGPlot2).build();
     // List<Number> data = ;
     chart.addCategorySeries("fish", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow" })), new ArrayList<Number>(Arrays.asList(new Number[] { -40, 30, 20, 60 })));
     chart.addCategorySeries("worms", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow" })), new ArrayList<Number>(Arrays.asList(new Number[] { 50, 10, -20, 40 })));

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java

@@ -26,9 +26,9 @@ import java.util.Random;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.Series;
+import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.SeriesMarker;
 
 /**
  * Millisecond Scale

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java

@@ -21,8 +21,8 @@ import java.util.List;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Logarithmic Y-Axis
@@ -50,7 +50,7 @@ public class LineChart01 implements ExampleChart {
     List<Number> yData = new ArrayList<Number>();
     for (int i = -3; i <= 3; i++) {
       xData.add(i);
-      yData.add(Math.pow(10, i) - 1);
+      yData.add(Math.pow(10, i));
     }
 
     // Create Chart

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java

@@ -20,11 +20,11 @@ import java.util.List;
 
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.Series;
+import com.xeiam.xchart.SeriesColor;
+import com.xeiam.xchart.SeriesLineStyle;
+import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.SeriesColor;
-import com.xeiam.xchart.style.SeriesLineStyle;
-import com.xeiam.xchart.style.SeriesMarker;
 
 /**
  * Sine wave with customized series style

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java

@@ -26,14 +26,14 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.ChartColor;
 import com.xeiam.xchart.Series;
+import com.xeiam.xchart.SeriesColor;
+import com.xeiam.xchart.SeriesLineStyle;
+import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.ChartColor;
-import com.xeiam.xchart.style.SeriesColor;
-import com.xeiam.xchart.style.SeriesLineStyle;
-import com.xeiam.xchart.style.SeriesMarker;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Extensive Chart Customization

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java

@@ -17,11 +17,11 @@ package com.xeiam.xchart.demo.charts.line;
 
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.Series;
+import com.xeiam.xchart.SeriesColor;
+import com.xeiam.xchart.SeriesLineStyle;
+import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.SeriesColor;
-import com.xeiam.xchart.style.SeriesLineStyle;
-import com.xeiam.xchart.style.SeriesMarker;
 
 /**
  * Plots Hundreds of Series on One Plot

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java

@@ -21,9 +21,9 @@ import java.util.Random;
 
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Gaussian Blob

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java

@@ -21,9 +21,9 @@ import java.util.Random;
 
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
+import com.xeiam.xchart.StyleManager.LegendPosition;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.StyleManager.LegendPosition;
 
 /**
  * Logarithmic Data

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart04.java

@@ -22,10 +22,10 @@ import java.util.List;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.Series;
+import com.xeiam.xchart.SeriesMarker;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartType;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.SeriesMarker;
-import com.xeiam.xchart.style.StyleManager.ChartType;
 
 /**
  * Error Bars

xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart02.java

@@ -18,8 +18,8 @@ package com.xeiam.xchart.demo.charts.theme;
 import com.xeiam.xchart.Chart;
 import com.xeiam.xchart.ChartBuilder;
 import com.xeiam.xchart.SwingWrapper;
+import com.xeiam.xchart.StyleManager.ChartTheme;
 import com.xeiam.xchart.demo.charts.ExampleChart;
-import com.xeiam.xchart.style.theme.GGPlot2Theme;
 
 /**
  * GGPlot2 Theme
@@ -43,7 +43,7 @@ public class ThemeChart02 implements ExampleChart {
   public Chart getChart() {
 
     // Create Chart
-    Chart chart = new ChartBuilder().width(800).height(600).theme(new GGPlot2Theme()).title("GGPlot2Theme").xAxisTitle("X").yAxisTitle("Y").build();
+    Chart chart = new ChartBuilder().width(800).height(600).theme(ChartTheme.GGPlot2).title("GGPlot2Theme").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 });

xchart/src/main/java/com/xeiam/xchart/Chart.java

@@ -26,8 +26,7 @@ import com.xeiam.xchart.internal.chartpart.AxisPair;
 import com.xeiam.xchart.internal.chartpart.ChartTitle;
 import com.xeiam.xchart.internal.chartpart.Legend;
 import com.xeiam.xchart.internal.chartpart.Plot;
-import com.xeiam.xchart.style.StyleManager;
-import com.xeiam.xchart.style.theme.Theme;
+import com.xeiam.xchart.internal.style.Theme;
 
 /**
  * An XChart Chart
@@ -73,7 +72,7 @@ public class Chart {
   public Chart(ChartBuilder chartBuilder) {
 
     this(chartBuilder.width, chartBuilder.height);
-    setTheme(chartBuilder.theme);
+    getStyleManager().setChartTheme(chartBuilder.chartTheme);
     setChartTitle(chartBuilder.title);
     setXAxisTitle(chartBuilder.xAxisTitle);
     setYAxisTitle(chartBuilder.yAxisTitle);

xchart/src/main/java/com/xeiam/xchart/ChartBuilder.java

@@ -21,9 +21,8 @@
  */
 package com.xeiam.xchart;
 
-import com.xeiam.xchart.style.StyleManager.ChartType;
-import com.xeiam.xchart.style.theme.Theme;
-import com.xeiam.xchart.style.theme.XChartTheme;
+import com.xeiam.xchart.StyleManager.ChartTheme;
+import com.xeiam.xchart.StyleManager.ChartType;
 
 /**
  * @author timmolter
@@ -36,7 +35,7 @@ public class ChartBuilder {
   String title = "";
   String xAxisTitle = "";
   String yAxisTitle = "";
-  Theme theme = new XChartTheme();
+  ChartTheme chartTheme = ChartTheme.XChart;
 
   public ChartBuilder chartType(ChartType chartType) {
 
@@ -74,9 +73,9 @@ public class ChartBuilder {
     return this;
   }
 
-  public ChartBuilder theme(Theme theme) {
+  public ChartBuilder theme(ChartTheme chartTheme) {
 
-    this.theme = theme;
+    this.chartTheme = chartTheme;
     return this;
   }
 

xchart/src/main/java/com/xeiam/xchart/style/ChartColor.java → xchart/src/main/java/com/xeiam/xchart/ChartColor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.style;
+package com.xeiam.xchart;
 
 import java.awt.Color;
 

xchart/src/main/java/com/xeiam/xchart/QuickChart.java

@@ -17,7 +17,6 @@ package com.xeiam.xchart;
 
 import java.util.Collection;
 
-import com.xeiam.xchart.style.SeriesMarker;
 
 /**
  * A convenience class for making Charts with one line of code

xchart/src/main/java/com/xeiam/xchart/Series.java

@@ -24,10 +24,7 @@ import java.util.Iterator;
 
 import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
 import com.xeiam.xchart.internal.markers.Marker;
-import com.xeiam.xchart.style.SeriesColor;
-import com.xeiam.xchart.style.SeriesColorMarkerLineStyle;
-import com.xeiam.xchart.style.SeriesLineStyle;
-import com.xeiam.xchart.style.SeriesMarker;
+import com.xeiam.xchart.internal.style.SeriesColorMarkerLineStyle;
 
 /**
  * A Series containing X and Y data to be plotted on a Chart