From fb7d6f5cf947454e66b1219d7ce24cd7d36aef28 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Thu, 1 Oct 2015 00:21:59 +0200
Subject: [PATCH] change Collection to List
---
.../xchart/demo/charts/bar/BarChart02.java | 3 +-
.../xchart/demo/charts/line/LineChart03.java | 6 ++--
.../demo/charts/scatter/ScatterChart01.java | 8 ++---
.../demo/charts/theme/ThemeChart01.java | 6 ++--
.../src/main/java/com/xeiam/xchart/Chart.java | 35 +++++++++----------
.../java/com/xeiam/xchart/QuickChart.java | 12 +++----
.../main/java/com/xeiam/xchart/Series.java | 11 +++---
.../java/com/xeiam/xchart/XChartPanel.java | 3 +-
.../xchart/internal/chartpart/AxisPair.java | 3 +-
9 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
index dcf204e7..361b6428 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
@@ -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");
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
index c3b760fc..6afb4629 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
@@ -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;
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
index 39e8949c..dee2d9e8 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
@@ -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++) {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java
index 4a4bc254..da450fec 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java
@@ -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);
diff --git a/xchart/src/main/java/com/xeiam/xchart/Chart.java b/xchart/src/main/java/com/xeiam/xchart/Chart.java
index 32051f2a..4ed931e4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Chart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/Chart.java
@@ -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;
@@ -27,7 +26,7 @@ import com.xeiam.xchart.internal.style.Theme;
/**
* An XChart Chart
- *
+ *
* @author timmolter
*/
public class Chart {
@@ -36,7 +35,7 @@ public class Chart {
/**
* Constructor
- *
+ *
* @param width
* @param height
*/
@@ -47,7 +46,7 @@ public class Chart {
/**
* Constructor
- *
+ *
* @param width
* @param height
* @param chartTheme
@@ -59,7 +58,7 @@ public class Chart {
/**
* Constructor
- *
+ *
* @param width
* @param height
* @param theme instance of Theme class
@@ -72,7 +71,7 @@ public class Chart {
/**
* Constructor
- *
+ *
* @param chartBuilder
*/
public Chart(ChartBuilder chartBuilder) {
@@ -104,34 +103,34 @@ public class Chart {
/**
* Add a series to the chart using Collections
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @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);
}
/**
* Add a Number series to the chart using Collections with error bars
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @param yData the Y-Axis data
* @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);
}
/**
* Add a series to the chart using double arrays
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @param xData the Y-Axis data
@@ -144,7 +143,7 @@ public class Chart {
/**
* Add a series to the chart using double arrays with error bars
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @param xData the Y-Axis data
@@ -177,7 +176,7 @@ public class Chart {
/**
* Add a series to the chart using int arrays
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @param xData the Y-Axis data
@@ -190,7 +189,7 @@ public class Chart {
/**
* Add a series to the chart using int arrays with error bars
- *
+ *
* @param seriesName
* @param xData the X-Axis data
* @param xData the Y-Axis data
@@ -223,7 +222,7 @@ public class Chart {
/**
* Set the chart title
- *
+ *
* @param title
*/
public void setChartTitle(String title) {
@@ -233,7 +232,7 @@ public class Chart {
/**
* Set the x-axis title
- *
+ *
* @param title
*/
public void setXAxisTitle(String title) {
@@ -243,7 +242,7 @@ public class Chart {
/**
* Set the y-axis title
- *
+ *
* @param title
*/
public void setYAxisTitle(String title) {
@@ -253,7 +252,7 @@ public class Chart {
/**
* Gets the Chart's style manager, which can be used to customize the Chart's appearance
- *
+ *
* @return the style manager
*/
public StyleManager getStyleManager() {
diff --git a/xchart/src/main/java/com/xeiam/xchart/QuickChart.java b/xchart/src/main/java/com/xeiam/xchart/QuickChart.java
index 71f84e79..0025909b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/QuickChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/QuickChart.java
@@ -15,11 +15,11 @@
*/
package com.xeiam.xchart;
-import java.util.Collection;
+import java.util.List;
/**
* A convenience class for making Charts with one line of code
- *
+ *
* @author timmolter
*/
public final class QuickChart {
@@ -36,7 +36,7 @@ public final class QuickChart {
/**
* Creates a Chart with default style
- *
+ *
* @param chartTitle the Chart title
* @param xTitle The X-Axis title
* @param yTitle The Y-Axis title
@@ -58,7 +58,7 @@ public final class QuickChart {
/**
* Creates a Chart with multiple Series for the same X-Axis data with default style
- *
+ *
* @param chartTitle the Chart title
* @param xTitle The X-Axis title
* @param yTitle The Y-Axis title
@@ -95,7 +95,7 @@ public final class QuickChart {
/**
* Creates a Chart with default style
- *
+ *
* @param chartTitle the Chart title
* @param xTitle The X-Axis title
* @param yTitle The Y-Axis title
@@ -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);
diff --git a/xchart/src/main/java/com/xeiam/xchart/Series.java b/xchart/src/main/java/com/xeiam/xchart/Series.java
index 3cafb6f4..2c1071f4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Series.java
+++ b/xchart/src/main/java/com/xeiam/xchart/Series.java
@@ -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()) {
diff --git a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
index de1fafaf..5c5a1d7a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
+++ b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
@@ -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) {
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
index fdc80987..5637c1cf 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
@@ -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) {
--
GitLab