diff --git a/src/main/java/com/xeiam/xchart/Chart.java b/src/main/java/com/xeiam/xchart/Chart.java index 0350c7f89a17988dddad7330bdd9e35955d6850f..463c3750798aa1ae085e1bfda6fab4e227d942b4 100644 --- a/src/main/java/com/xeiam/xchart/Chart.java +++ b/src/main/java/com/xeiam/xchart/Chart.java @@ -111,12 +111,27 @@ public class Chart { // PUBLIC SETTERS + /** + * Add series data as Collection<Number> + * + * @param seriesName + * @param xData Collection<Number> + * @param yData Collection<Number> + * @return + */ public Series addSeries(String seriesName, Collection<Number> xData, Collection<Number> yData) { return axisPair.addSeries(seriesName, xData, yData); } - @Deprecated + /** + * Convenience Method - Add series data as double arrays + * + * @param seriesName + * @param xData double[] + * @param yData double[] + * @return + */ public Series addSeries(String seriesName, double[] xData, double[] yData) { Collection<Number> xDataNumber = null; diff --git a/src/test/java/com/xeiam/xchart/example/Example1.java b/src/test/java/com/xeiam/xchart/example/Example1.java index 7eff23811285383b79a59f54c796d2c1e5fe4e1c..80d2c3cb08470d8c9ba50448acf53f8a4d830d97 100644 --- a/src/test/java/com/xeiam/xchart/example/Example1.java +++ b/src/test/java/com/xeiam/xchart/example/Example1.java @@ -15,6 +15,9 @@ */ package com.xeiam.xchart.example; +import java.util.Arrays; +import java.util.Collection; + import com.xeiam.xchart.BitmapEncoder; import com.xeiam.xchart.Chart; @@ -27,8 +30,8 @@ public class Example1 { public static void main(String[] args) { - double[] xData = { 0.0, 1.0, 2.0 }; - double[] yData = { 0.0, 1.0, 2.0 }; + Collection<Number> xData = Arrays.asList(new Number[] { 0.0, 1.0, 2.0 }); + Collection<Number> yData = Arrays.asList(new Number[] { 0.0, 1.0, 2.0 }); // Create Chart Chart chart = new Chart(500, 400); diff --git a/src/test/java/com/xeiam/xchart/example/Example2.java b/src/test/java/com/xeiam/xchart/example/Example2.java index 02a1f1155ba3a321586dd5fc2f8ac7143e7d5222..ea24993bf8083ae792189493926ca8e88215810c 100644 --- a/src/test/java/com/xeiam/xchart/example/Example2.java +++ b/src/test/java/com/xeiam/xchart/example/Example2.java @@ -15,6 +15,9 @@ */ package com.xeiam.xchart.example; +import java.util.ArrayList; +import java.util.Collection; + import com.xeiam.xchart.Chart; import com.xeiam.xchart.series.Series; import com.xeiam.xchart.series.SeriesColor; @@ -33,12 +36,12 @@ public class Example2 { // generates sine data int size = 30; - double[] xData1 = new double[size + 1]; - double[] yData1 = new double[size + 1]; + Collection<Number> xData1 = new ArrayList<Number>(); + Collection<Number> yData1 = new ArrayList<Number>(); for (int i = 0; i <= size; i++) { double radians = (Math.PI / (size / 2) * i); - xData1[i] = i - size / 2; - yData1[i] = size * Math.sin(radians); + xData1.add(i - size / 2); + yData1.add(size * Math.sin(radians)); } // Create Chart diff --git a/src/test/java/com/xeiam/xchart/example/Example3.java b/src/test/java/com/xeiam/xchart/example/Example3.java index bd5bf769c1e1ce47a5d0f89fd95f49bf46c35f18..a70b68ec6134fc73ec6092f5aaad5d4ba57e79a1 100644 --- a/src/test/java/com/xeiam/xchart/example/Example3.java +++ b/src/test/java/com/xeiam/xchart/example/Example3.java @@ -15,6 +15,9 @@ */ package com.xeiam.xchart.example; +import java.util.ArrayList; +import java.util.Collection; + import com.xeiam.xchart.Chart; import com.xeiam.xchart.swing.SwingWrapper; @@ -34,11 +37,11 @@ public class Example3 { // generates linear data int b = 20; - double[] xData = new double[b + 1]; - double[] yData = new double[b + 1]; + Collection<Number> xData = new ArrayList<Number>(); + Collection<Number> yData = new ArrayList<Number>(); for (int x = 0; x <= b; x++) { - xData[x] = 2 * x - b; - yData[x] = 2 * i * x - i * b; + xData.add(2 * x - b); + yData.add(2 * i * x - i * b); } // Customize Chart