Skip to content
Snippets Groups Projects
Commit fb7d6f5c authored by Tim Molter's avatar Tim Molter
Browse files

change Collection to List

parent 5dd9753a
Branches
No related tags found
No related merge requests found
......@@ -19,7 +19,6 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
......@@ -61,7 +60,7 @@ public class BarChart02 implements ExampleChart {
Chart chart = new ChartBuilder().theme(ChartTheme.Matlab).chartType(ChartType.Bar).width(800).height(600).title("Units Sold Per Year").xAxisTitle("Year").yAxisTitle("Units Sold").build();
List<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Number> yData = new ArrayList<Number>();
Random random = new Random();
DateFormat sdf = new SimpleDateFormat("yyyy");
......
......@@ -21,8 +21,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import com.xeiam.xchart.Chart;
......@@ -54,8 +54,8 @@ public class LineChart03 implements ExampleChart {
Chart chart = new Chart(800, 600);
// generates linear data
Collection<Date> xData = new ArrayList<Date>();
Collection<Double> yData = new ArrayList<Double>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
DateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
Date date = null;
......
......@@ -15,9 +15,9 @@
*/
package com.xeiam.xchart.demo.charts.scatter;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.Set;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.StyleManager.ChartType;
......@@ -47,8 +47,8 @@ public class ScatterChart01 implements ExampleChart {
@Override
public Chart getChart() {
Set<Double> xData = new HashSet<Double>();
Set<Double> yData = new HashSet<Double>();
List<Double> xData = new LinkedList<Double>();
List<Double> yData = new LinkedList<Double>();
Random random = new Random();
int size = 1000;
for (int i = 0; i < size; i++) {
......
......@@ -16,7 +16,7 @@
package com.xeiam.xchart.demo.charts.theme;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.SwingWrapper;
......@@ -48,8 +48,8 @@ public class ThemeChart01 implements ExampleChart {
// generates linear data
int b = 20;
Collection<Number> xData = new ArrayList<Number>();
Collection<Number> yData = new ArrayList<Number>();
List<Number> xData = new ArrayList<Number>();
List<Number> yData = new ArrayList<Number>();
for (int x = 0; x <= b; x++) {
xData.add(2 * x - b);
yData.add(2 * i * x - i * b);
......
......@@ -17,7 +17,6 @@ package com.xeiam.xchart;
import java.awt.Graphics2D;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
......@@ -110,7 +109,7 @@ public class Chart {
* @param yData the Y-Axis data
* @return A Series object that you can set properties on
*/
public Series addSeries(String seriesName, Collection<?> xData, Collection<? extends Number> yData) {
public Series addSeries(String seriesName, List<?> xData, List<? extends Number> yData) {
return chartPainter.getAxisPair().addSeries(seriesName, xData, yData, null);
}
......@@ -124,7 +123,7 @@ public class Chart {
* @param errorBars the error bar data
* @return A Series object that you can set properties on
*/
public Series addSeries(String seriesName, Collection<?> xData, Collection<? extends Number> yData, Collection<? extends Number> errorBars) {
public Series addSeries(String seriesName, List<?> xData, List<? extends Number> yData, List<? extends Number> errorBars) {
return chartPainter.getAxisPair().addSeries(seriesName, xData, yData, errorBars);
}
......
......@@ -15,7 +15,7 @@
*/
package com.xeiam.xchart;
import java.util.Collection;
import java.util.List;
/**
* A convenience class for making Charts with one line of code
......@@ -104,7 +104,7 @@ public final class QuickChart {
* @param yData A Collection containing Y-Axis data
* @return a Chart Object
*/
public static Chart getChart(String chartTitle, String xTitle, String yTitle, String seriesName, Collection<Number> xData, Collection<Number> yData) {
public static Chart getChart(String chartTitle, String xTitle, String yTitle, String seriesName, List<Number> xData, List<Number> yData) {
// Create Chart
Chart chart = new Chart(WIDTH, HEIGHT);
......
......@@ -20,6 +20,7 @@ import java.awt.Color;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
import com.xeiam.xchart.internal.markers.Marker;
......@@ -38,15 +39,15 @@ public class Series {
private String name = "";
private Collection<?> xData;
private List<?> xData;
private AxisType xAxisType;
private Collection<? extends Number> yData;
private List<? extends Number> yData;
private AxisType yAxisType;
private SeriesType seriesType;
private Collection<? extends Number> errorBars;
private List<? extends Number> errorBars;
/** the minimum value of axis range */
private double xMin;
......@@ -86,7 +87,7 @@ public class Series {
* @param errorBars
* @param seriesColorMarkerLineStyle
*/
public Series(String name, Collection<?> xData, AxisType xAxisType, Collection<? extends Number> yData, AxisType yAxisType, Collection<? extends Number> errorBars,
public Series(String name, List<?> xData, AxisType xAxisType, List<? extends Number> yData, AxisType yAxisType, List<? extends Number> errorBars,
SeriesColorMarkerLineStyle seriesColorMarkerLineStyle) {
if (name == null || name.length() < 1) {
......@@ -331,7 +332,7 @@ public class Series {
return name;
}
public void replaceData(Collection<?> newXData, Collection<? extends Number> newYData, Collection<? extends Number> newErrorBars) {
public void replaceData(List<?> newXData, List<? extends Number> newYData, List<? extends Number> newErrorBars) {
// Sanity check
if (newErrorBars != null && newErrorBars.size() != newYData.size()) {
......
......@@ -27,7 +27,6 @@ import java.awt.event.MouseListener;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.swing.AbstractAction;
......@@ -284,7 +283,7 @@ public class XChartPanel extends JPanel {
* @param newErrorBarData - set null if there are no error bars
* @return
*/
public Series updateSeries(String seriesName, Collection<?> newXData, List<? extends Number> newYData, List<? extends Number> newErrorBarData) {
public Series updateSeries(String seriesName, List<?> newXData, List<? extends Number> newYData, List<? extends Number> newErrorBarData) {
Series series = chart.getSeriesMap().get(seriesName);
if (series == null) {
......
......@@ -18,7 +18,6 @@ package com.xeiam.xchart.internal.chartpart;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashMap;
......@@ -66,7 +65,7 @@ public class AxisPair implements ChartPart {
* @param errorBars
* @return Series
*/
public Series addSeries(String seriesName, Collection<?> xData, Collection<? extends Number> yData, Collection<? extends Number> errorBars) {
public Series addSeries(String seriesName, List<?> xData, List<? extends Number> yData, List<? extends Number> errorBars) {
// Sanity checks
if (seriesName == null) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment