diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java index 245c2dea8..0470ef5fc 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java @@ -5,7 +5,7 @@ public final class ChartInfo { private final String exampleChartName; - private final ExampleChart exampleChart; + private final ExampleChart exampleChart; /** * Constructor @@ -13,7 +13,7 @@ public final class ChartInfo { * @param exampleChartName * @param exampleChart */ - public ChartInfo(String exampleChartName, ExampleChart exampleChart) { + public ChartInfo(String exampleChartName, ExampleChart exampleChart) { this.exampleChartName = exampleChartName; this.exampleChart = exampleChart; @@ -24,7 +24,7 @@ public String getExampleChartName() { return exampleChartName; } - public ExampleChart getExampleChart() { + public ExampleChart getExampleChart() { return exampleChart; } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartStylePanel.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartStylePanel.java index 10fe98e1a..33fa5fee0 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartStylePanel.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartStylePanel.java @@ -78,22 +78,22 @@ public static final class EditableProperty { ChartStylePanel csp; Object additionalParameter; - static HashMap editorMap; - static Class[] assignableClasses = { + static HashMap, TableCellEditor> editorMap; + static Class[] assignableClasses = { Theme.class, BasicStroke.class, Marker.class, TimeZone.class }; static { - editorMap = new HashMap(); + editorMap = new HashMap<>(); { - JComboBox comboBox = new JComboBox(new Boolean[] {Boolean.TRUE, Boolean.FALSE}); + JComboBox comboBox = new JComboBox<>(new Boolean[] {Boolean.TRUE, Boolean.FALSE}); TableCellEditor cellEditor = new DefaultCellEditor(comboBox); editorMap.put(Boolean.class, cellEditor); editorMap.put(Boolean.TYPE, cellEditor); } { - Class[][] clsArr = { + Class[][] clsArr = { {int.class, Integer.class}, {byte.class, Byte.class}, {short.class, Short.class}, @@ -103,17 +103,17 @@ public static final class EditableProperty { {String.class, String.class} }; - for (Class[] classes : clsArr) { + for (Class[] classes : clsArr) { GenericEditorWithClass editor = new GenericEditorWithClass(classes[1]); - for (Class class1 : classes) { + for (Class class1 : classes) { editorMap.put(class1, editor); } } } { - JComboBox comboBox = - new JComboBox(new Theme[] {new XChartTheme(), new GGPlot2Theme(), new MatlabTheme()}); + JComboBox comboBox = + new JComboBox<>(new Theme[] {new XChartTheme(), new GGPlot2Theme(), new MatlabTheme()}); editorMap.put(Theme.class, new DefaultCellEditor(comboBox)); } @@ -125,7 +125,7 @@ public static final class EditableProperty { new LabelValue("DASH_DASH", SeriesLines.DASH_DASH), new LabelValue("DASH_DOT", SeriesLines.DASH_DOT) }; - JComboBox comboBox = new JComboBox(values); + JComboBox comboBox = new JComboBox<>(values); editorMap.put(BasicStroke.class, new DefaultCellEditor(comboBox)); } { @@ -156,13 +156,13 @@ public static final class EditableProperty { new LabelValue("GGPlot2 Tick Marks", new BasicStroke(1.5f)), // new LabelValue("Matlab Tick Marks", new BasicStroke(.5f)), // }; - JComboBox comboBox = new JComboBox(values); + JComboBox comboBox = new JComboBox<>(values); editorMap.put(Stroke.class, new DefaultCellEditor(comboBox)); } { Marker[] seriesMarkers = new BaseSeriesMarkers().getSeriesMarkers(); - JComboBox comboBox = new JComboBox(seriesMarkers); + JComboBox comboBox = new JComboBox<>(seriesMarkers); editorMap.put(Marker.class, new DefaultCellEditor(comboBox)); } @@ -178,7 +178,7 @@ public static final class EditableProperty { Locale.GERMAN, Locale.forLanguageTag("tr-TR") }; - JComboBox comboBox = new JComboBox(values); + JComboBox comboBox = new JComboBox<>(values); editorMap.put(Locale.class, new DefaultCellEditor(comboBox)); } @@ -188,7 +188,7 @@ public static final class EditableProperty { for (int i = 0; i < values.length; i++) { values[i] = TimeZone.getTimeZone(availableIDs[i]); } - JComboBox comboBox = new JComboBox(values); + JComboBox comboBox = new JComboBox<>(values); editorMap.put(TimeZone.class, new DefaultCellEditor(comboBox)); } } @@ -220,19 +220,19 @@ private void initEditor() { try { Object val = getValue(); - Class cls = val == null ? getValueClass() : val.getClass(); + Class cls = val == null ? getValueClass() : val.getClass(); cellEditor = editorMap.get(cls); if (cellEditor != null) { return; } if (cls.isEnum()) { - JComboBox comboBox = new JComboBox(cls.getEnumConstants()); + JComboBox comboBox = new JComboBox<>(cls.getEnumConstants()); cellEditor = new DefaultCellEditor(comboBox); return; } - for (Class class1 : assignableClasses) { + for (Class class1 : assignableClasses) { if (class1.isAssignableFrom(cls)) { cellEditor = editorMap.get(class1); return; @@ -316,7 +316,7 @@ public TableCellEditor getTableCellEditor() { return cellEditor; } - public Class getValueClass() { + public Class getValueClass() { if (readMethod == null) { // obj is array @@ -354,11 +354,11 @@ public Component getTableCellEditorComponent( static class GenericEditorWithClass extends DefaultCellEditor { - Class[] argTypes = new Class[] {String.class}; - java.lang.reflect.Constructor constructor; + Class[] argTypes = new Class[] {String.class}; + java.lang.reflect.Constructor constructor; Object value; - public GenericEditorWithClass(Class cls) { + public GenericEditorWithClass(Class cls) { super(new JTextField()); getComponent().setName("Table.editor"); try { @@ -409,11 +409,11 @@ public Object getCellEditorValue() { public static class EditorTableModel extends DefaultTableModel { ArrayList properties; - Chart chart; + Chart chart; int rowCount; ChartStylePanel csp; - public EditorTableModel(ChartStylePanel csp, Chart chart) { + public EditorTableModel(ChartStylePanel csp, Chart chart) { this.csp = csp; addColumn("Name"); addColumn("Type"); @@ -421,7 +421,7 @@ public EditorTableModel(ChartStylePanel csp, Chart chart) { changeChart(chart); } - public void changeChart(Chart chart) { + public void changeChart(Chart chart) { this.chart = chart; properties = getProperties(csp, chart); @@ -487,7 +487,7 @@ public int getRowCount() { public static class EditorTable extends JTable { EditorTableModel tableModel; - public EditorTable(ChartStylePanel csp, Chart chart) { + public EditorTable(ChartStylePanel csp, Chart chart) { tableModel = new EditorTableModel(csp, chart); setModel(tableModel); @@ -503,7 +503,7 @@ public EditorTable(ChartStylePanel csp, Chart chart) { setAutoCreateRowSorter(true); } - public void changeChart(Chart chart) { + public void changeChart(Chart chart) { tableModel.changeChart(chart); } @@ -517,7 +517,7 @@ public TableCellEditor getCellEditor(int row, int column) { if (editor != null) { return editor; } - Class valueClass = se.getValueClass(); + Class valueClass = se.getValueClass(); TableCellEditor defaultEditor = getDefaultEditor(valueClass); // System.out.println(valueClass + "=>" + defaultEditor); @@ -526,9 +526,9 @@ public TableCellEditor getCellEditor(int row, int column) { } private EditorTable table; - private XChartPanel chartPanel; + private XChartPanel chartPanel; - public ChartStylePanel(XChartPanel chartPanel) { + public ChartStylePanel(XChartPanel chartPanel) { this.chartPanel = chartPanel; table = new EditorTable(this, chartPanel.getChart()); JScrollPane scrollpane = new JScrollPane(table); @@ -538,7 +538,7 @@ public ChartStylePanel(XChartPanel chartPanel) { setPreferredSize(new Dimension(800, 600)); } - public void changeChart(XChartPanel chartPanel) { + public void changeChart(XChartPanel chartPanel) { this.chartPanel = chartPanel; table.changeChart(chartPanel.getChart()); @@ -575,7 +575,7 @@ protected void repaintChart() { "YAxisAlignment", "YAxisGroupPosition")); - public static ArrayList getProperties(ChartStylePanel csp, Chart chart) { + public static ArrayList getProperties(ChartStylePanel csp, Chart chart) { if (chart == null) { return new ArrayList(); @@ -585,10 +585,10 @@ public static ArrayList getProperties(ChartStylePanel csp, Cha getObjectProperties(csp, chart.getStyler(), "styler.", skipSet); list.addAll(list2); - Map seriesMap = chart.getSeriesMap(); + Map seriesMap = chart.getSeriesMap(); int ind = 0; TreeSet seriesIndSet = new TreeSet(); - for (Entry e : seriesMap.entrySet()) { + for (Entry e : seriesMap.entrySet()) { Series series = e.getValue(); list2 = getObjectProperties(csp, series, "series[" + e.getKey() + "].", skipSet); list.addAll(list2); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java index 7578e0224..95f07a7c8 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java @@ -33,7 +33,7 @@ public class XChartDemo extends JPanel implements TreeSelectionListener { private final JTree tree; /** The panel for chart */ - protected XChartPanel chartPanel; + protected XChartPanel chartPanel; Timer timer = new Timer(); @@ -57,7 +57,7 @@ public XChartDemo() { JScrollPane treeView = new JScrollPane(tree); // Create Chart Panel - chartPanel = new XChartPanel(new AreaChart01().getChart()); + chartPanel = new XChartPanel<>(new AreaChart01().getChart()); // Add the scroll panes to a split pane. splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT); @@ -86,9 +86,8 @@ public void valueChanged(TreeSelectionEvent e) { if (node.isLeaf()) { ChartInfo chartInfo = (ChartInfo) nodeInfo; // displayURL(chartInfo.bookURL); - ExampleChart exampleChart = chartInfo.getExampleChart(); - chartPanel = new XChartPanel(exampleChart.getChart()); - exampleChart.customizePanel(chartPanel); + ExampleChart exampleChart = chartInfo.getExampleChart(); + updateChartPanel(exampleChart); splitPane.setBottomComponent(chartPanel); // start running a simulated data feed for the sample real-time plot @@ -113,6 +112,16 @@ public void run() { } } + private void updateChartPanel(ExampleChart exampleChart) { + doUpdateChartPanel(exampleChart); + } + + private > void doUpdateChartPanel(ExampleChart exampleChart) { + XChartPanel panel = new XChartPanel<>(exampleChart.getChart()); + exampleChart.customizePanel(panel); + chartPanel = panel; + } + /** * Create the tree * @@ -127,7 +136,7 @@ private void createNodes(DefaultMutableTreeNode top) { List>> exampleList = DemoChartsUtil.getAllDemoCharts(); String categoryName = ""; - for (ExampleChart exampleChart : exampleList) { + for (ExampleChart> exampleChart : exampleList) { String name = exampleChart.getClass().getSimpleName(); name = name.substring(0, name.indexOf("Chart")); if (!categoryName.equals(name)) { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartStyleDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartStyleDemo.java index 71b48e339..51744c135 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartStyleDemo.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartStyleDemo.java @@ -21,7 +21,7 @@ public XChartStyleDemo() { @Override public void valueChanged(TreeSelectionEvent e) { - XChartPanel oldChartPanel = chartPanel; + XChartPanel oldChartPanel = chartPanel; super.valueChanged(e); if (chartPanel != oldChartPanel) { stylePanel.changeChart(chartPanel); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java index 0042ef859..9aeb81be2 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java @@ -10,7 +10,6 @@ import org.knowm.xchart.ToolTipType; import org.knowm.xchart.XChartPanel; import org.knowm.xchart.demo.charts.ExampleChart; -import org.knowm.xchart.style.Styler; import org.knowm.xchart.style.Styler.LegendPosition; /** diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart11.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart11.java index 3d5a9f605..10cfc8032 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart11.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart11.java @@ -5,7 +5,6 @@ import java.util.Random; import org.knowm.xchart.CategoryChart; import org.knowm.xchart.CategoryChartBuilder; -import org.knowm.xchart.CategorySeries; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.demo.charts.ExampleChart; @@ -72,10 +71,8 @@ public CategoryChart getChart() { chart.getStyler().setLabelsRotation(45); // Series - CategorySeries series1 = - chart.addSeries("series1", getLinearValues(0, 200, 6), getRandomValues(10, 50, 6)); - CategorySeries series2 = - chart.addSeries("series2", getLinearValues(0, 200, 6), getRandomValues(10, 50, 6)); + chart.addSeries("series1", getLinearValues(0, 200, 6), getRandomValues(10, 50, 6)); + chart.addSeries("series2", getLinearValues(0, 200, 6), getRandomValues(10, 50, 6)); return chart; } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java index a4e23395f..83fcb0ca0 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart12.java @@ -85,9 +85,9 @@ public CategoryChart getChart() { } // Series - CategorySeries staked1 = chart.addSeries("Period 1", months, period1Values); - CategorySeries staked2 = chart.addSeries("Period 2", months, period2Values); - CategorySeries staked3 = chart.addSeries("Period 3", months, period3Values); + chart.addSeries("Period 1", months, period1Values); + chart.addSeries("Period 2", months, period2Values); + chart.addSeries("Period 3", months, period3Values); CategorySeries overlappedLine = chart.addSeries("Average", months, averageValues); overlappedLine.setOverlapped(true); overlappedLine.setChartCategorySeriesRenderStyle(CategorySeries.CategorySeriesRenderStyle.Line); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/dial/DialChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/dial/DialChart02.java index a74745d3c..c6638d562 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/dial/DialChart02.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/dial/DialChart02.java @@ -5,7 +5,6 @@ import java.awt.Font; import org.knowm.xchart.DialChart; import org.knowm.xchart.DialChartBuilder; -import org.knowm.xchart.DialSeries; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XChartPanel; import org.knowm.xchart.demo.charts.ExampleChart; @@ -46,7 +45,7 @@ public DialChart getChart() { .build(); // Series - DialSeries series = chart.addSeries("Rate", 0.55, "55 %"); + chart.addSeries("Rate", 0.55, "55 %"); chart.getStyler().setLegendVisible(true); chart.getStyler().setArcAngle(330); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart08.java index 8270099f8..2a98d580b 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart08.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart08.java @@ -62,7 +62,7 @@ public XYChart getChart() { // chart.getStyler().setXAxisLabelRotation(0); // Series - XYSeries series = chart.addSeries("10^x", xData, yData); + chart.addSeries("10^x", xData, yData); return chart; } 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 cc30363c9..3c0fec276 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 @@ -1,7 +1,6 @@ package org.knowm.xchart.demo.charts.pie; import java.awt.Color; -import java.util.Collection; import java.util.function.Function; import java.util.stream.Stream; diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java index f7d35fd51..f9b18035c 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java @@ -16,6 +16,6 @@ public static void main(String[] args) throws Exception { XYChart chart = QuickChart.getChart("Sample Chart", "X", "Y", "y(x)", xData, yData); // Show it - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/JavaFXDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/JavaFXDemo.java index 6cc4c41a4..b720fcccd 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/JavaFXDemo.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/JavaFXDemo.java @@ -21,7 +21,7 @@ public static void main(String[] args) { public void start(Stage stage) { final SwingNode swingNode = new SwingNode(); - JPanel chartPanel = new XChartPanel(new AreaChart01().getChart()); + JPanel chartPanel = new XChartPanel<>(new AreaChart01().getChart()); swingNode.setContent(chartPanel); Scene scene = new Scene(new StackPane(swingNode), 640, 480); stage.setScene(scene); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java index 7f98dd469..26d617fae 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java @@ -20,7 +20,7 @@ private static void createAndShowGUI() { frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); // Add content to the window. - JPanel chartPanel = new XChartPanel(new AreaChart01().getChart()); + JPanel chartPanel = new XChartPanel<>(new AreaChart01().getChart()); frame.add(chartPanel); // Display the window. diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForExtremeEdgeCaseData.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForExtremeEdgeCaseData.java index 0aea82b8d..ad2ea7119 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForExtremeEdgeCaseData.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForExtremeEdgeCaseData.java @@ -1,6 +1,5 @@ package org.knowm.xchart.standalone.issues; -import java.io.IOException; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; import org.knowm.xchart.XYChartBuilder; diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue1.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue1.java index 1c7918fb0..55332d16d 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue1.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue1.java @@ -5,16 +5,16 @@ import org.knowm.xchart.BitmapEncoder; import org.knowm.xchart.BitmapEncoder.BitmapFormat; import org.knowm.xchart.XYChart; -import org.knowm.xchart.internal.chartpart.Chart; + /** Creates a list of Charts and saves it as a PNG file. */ public class TestForIssue1 { public static void main(String[] args) throws Exception { - List charts = + List charts = Arrays.asList( - new Chart[] { + new XYChart[] { createChart("chart1", new double[] {2.0, 1.0, 0.0}), createChart("chart2", new double[] {3.0, 4.0, 0.0}), createChart("chart3", new double[] {4.0, 1.5, 0.0}), diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue127.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue127.java index d80947ac4..c7f895dd6 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue127.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue127.java @@ -23,15 +23,15 @@ public static void main(String[] args) throws InterruptedException, ParseExcepti new XYChartBuilder().width(640).height(480).xAxisTitle("x").yAxisTitle("y").build(); chart.setTitle("TEst"); chart.getStyler().setLegendVisible(false); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); Thread.sleep(1000); chart.addSeries("test", x, y); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); Thread.sleep(1000); chart.removeSeries("test"); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); Thread.sleep(1000); DateFormat sdf = new SimpleDateFormat("dd-HH-mm"); @@ -45,7 +45,7 @@ public static void main(String[] args) throws InterruptedException, ParseExcepti yDate.add(3d); yDate.add(5d); chart.addSeries("test2", xDate, yDate); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); Thread.sleep(1000); } public static XYChart getChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue205.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue205.java index c2e9dc9d2..0bafec168 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue205.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue205.java @@ -12,7 +12,7 @@ public class TestForIssue205 { public static CategoryChart getChart() { - List myData = new ArrayList(); + List myData = new ArrayList<>(); myData.add(10.0); myData.add(20.0); myData.add(10.0); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue244.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue244.java index 2716c364c..3b1bc81d1 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue244.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue244.java @@ -5,8 +5,6 @@ import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; import org.knowm.xchart.XYChartBuilder; -import org.knowm.xchart.internal.chartpart.Chart; -import org.knowm.xchart.internal.series.Series; import org.knowm.xchart.style.AxesChartStyler; import org.knowm.xchart.style.Styler.LegendPosition; import org.knowm.xchart.style.Styler.YAxisPosition; @@ -18,17 +16,16 @@ public class TestForIssue244 { public static void main(String[] args) { - List charts = new ArrayList(); + List charts = new ArrayList<>(); { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("Default axis"); charts.add(chart); } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("sin(x) on second axis"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x) [-1, 1]"); chart.setYAxisGroupTitle(0, "cos(x) [-10, 10]"); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Right); @@ -36,30 +33,28 @@ public static void main(String[] args) { } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("2 axis, default y max & y min"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x) [-1, 1]"); chart.setYAxisGroupTitle(0, "cos(x) [-10, 10]"); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Right); - AxesChartStyler styler = (AxesChartStyler) chart.getStyler(); + AxesChartStyler styler = chart.getStyler(); styler.setYAxisMax(20.0); styler.setYAxisMin(-20.0); charts.add(chart); } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("2 axis, max on group 0"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x) [-1, 1]"); chart.setYAxisGroupTitle(0, "cos(x) [-10, 10]"); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Right); - AxesChartStyler styler = (AxesChartStyler) chart.getStyler(); + AxesChartStyler styler = chart.getStyler(); styler.setYAxisMax(0, 20.0); styler.setYAxisMin(0, -20.0); @@ -67,15 +62,14 @@ public static void main(String[] args) { } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("2 axis, max on group 0, 1"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x) [-1, 1]"); chart.setYAxisGroupTitle(0, "cos(x) [-10, 10]"); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Right); - AxesChartStyler styler = (AxesChartStyler) chart.getStyler(); + AxesChartStyler styler = chart.getStyler(); styler.setYAxisMax(0, 20.0); styler.setYAxisMin(0, -20.0); styler.setYAxisMax(1, 2.0); @@ -85,15 +79,14 @@ public static void main(String[] args) { } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("2 axis, max on group 0, 1, and default max"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x) [-1, 1]"); chart.setYAxisGroupTitle(0, "cos(x) [-10, 10]"); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Right); - AxesChartStyler styler = (AxesChartStyler) chart.getStyler(); + AxesChartStyler styler = chart.getStyler(); // these 2 lines will be overwritten by group max settings styler.setYAxisMax(100.0); styler.setYAxisMin(-100.0); @@ -106,14 +99,14 @@ public static void main(String[] args) { charts.add(chart); } - SwingWrapper wrapper = new SwingWrapper(charts); + SwingWrapper wrapper = new SwingWrapper<>(charts); wrapper.displayChartMatrix(); for (int i = 0; i < charts.size(); i++) { wrapper.getXChartPanel(i).setToolTipsEnabled(true); } } - static Chart getLineChart() { + static XYChart getLineChart() { XYChart chart = new XYChartBuilder().width(WIDTH).height(HEIGHT).xAxisTitle("X").yAxisTitle("Y").build(); @@ -142,7 +135,7 @@ static Chart getLineChart() { } public static XYChart getChart() { - return (XYChart) getLineChart(); + return getLineChart(); } } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue285.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue285.java index 77364211b..471910301 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue285.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue285.java @@ -10,13 +10,13 @@ import org.knowm.xchart.demo.charts.line.LineChart02; import org.knowm.xchart.demo.charts.pie.PieChart01; import org.knowm.xchart.demo.charts.pie.PieChart02; -import org.knowm.xchart.internal.chartpart.Chart; +import org.knowm.xchart.internal.chartpart.IChart; public class TestForIssue285 { public static void main(String[] args) throws IOException { - List charts = new ArrayList<>(); + List charts = new ArrayList<>(); charts.add(new AreaChart01().getChart()); charts.add(new AreaChart02().getChart()); charts.add(new LineChart01().getChart()); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue289.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue289.java index e5db82bc4..2d87efc88 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue289.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue289.java @@ -1,7 +1,6 @@ package org.knowm.xchart.standalone.issues; import java.awt.Color; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.knowm.xchart.SwingWrapper; diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue315.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue315.java index 8709cc48d..1ccbaa1a4 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue315.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue315.java @@ -5,7 +5,6 @@ import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; import org.knowm.xchart.XYSeries; -import org.knowm.xchart.internal.chartpart.Chart; import org.knowm.xchart.style.Styler.LegendPosition; public class TestForIssue315 { @@ -32,7 +31,7 @@ static XYChart getChart(boolean group0Enabled, boolean group1Enabled) { public static void main(String[] args) { - List charts = new ArrayList(); + List charts = new ArrayList<>(); boolean[] options = {true, false}; for (boolean g0 : options) { for (boolean g1 : options) { @@ -46,7 +45,7 @@ public static void main(String[] args) { } } - new SwingWrapper(charts).displayChartMatrix(); + new SwingWrapper<>(charts).displayChartMatrix(); } public static XYChart getChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue325.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue325.java index 932e45bcd..182c159f4 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue325.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue325.java @@ -4,7 +4,6 @@ import java.util.List; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; -import org.knowm.xchart.internal.chartpart.Chart; public class TestForIssue325 { @@ -13,7 +12,7 @@ public class TestForIssue325 { public static void main(String[] args) { - List charts = new ArrayList<>(); + List charts = new ArrayList<>(); int[] multiples = {1, 1000}; int[] widths = {0, 15, 55}; for (int m : multiples) { @@ -24,7 +23,7 @@ public static void main(String[] args) { } } - new SwingWrapper(charts, charts.size() / widths.length, widths.length).displayChartMatrix(); + new SwingWrapper<>(charts, charts.size() / widths.length, widths.length).displayChartMatrix(); try { // wait frame to appear diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue349.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue349.java index 009d2e01b..8046c712a 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue349.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue349.java @@ -16,7 +16,7 @@ public static void main(String[] args) { ExampleChart exampleChart = new TestForIssue349(); XYChart chart = exampleChart.getChart(); - XChartPanel chartPanel = new XChartPanel(chart); + XChartPanel chartPanel = new XChartPanel<>(chart); chartPanel.setZoomEnabled(true); // Create and set up the window. diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue390.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue390.java index e4284c2a8..27dd6adba 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue390.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue390.java @@ -16,10 +16,7 @@ public static XYChart getChart() { Random rand = new Random(); - double min = 0; - double max = 20; int nbServices = 20; - int nbInstances = 50; long s = 24; rand.setSeed(s); @@ -58,7 +55,7 @@ public static XYChart getChart() { public static void main(String[] args) throws IOException { XYChart chart = getChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); BitmapEncoder.saveBitmap(chart, "./Sample_Chart", BitmapFormat.PNG); } } \ No newline at end of file diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue545.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue545.java index 6f54e515c..1e1d49c2a 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue545.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue545.java @@ -4,7 +4,6 @@ import java.text.ParseException; import org.knowm.xchart.BubbleChart; import org.knowm.xchart.BubbleChartBuilder; -import org.knowm.xchart.BubbleSeries; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.style.BubbleStyler; import org.knowm.xchart.style.Styler; @@ -31,9 +30,8 @@ public static BubbleChart getBubbleChart() { .yAxisTitle("Rate") .build(); setBubbleStyler(chart); - BubbleSeries bubbleSeries = - chart.addSeries( - "serieName", new double[] {data[0]}, new double[] {data[1]}, new double[] {data[2]}); + chart.addSeries( + "serieName", new double[] {data[0]}, new double[] {data[1]}, new double[] {data[2]}); // bubbleSeries.setCustomToolTips(true); // String tooltip = // new DecimalFormat("#%").format(data[1]) + " (" + ((int) data[2]) + "/" + ((int) diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_1.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_1.java index 2293a6285..b9dd5d3a8 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_1.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_1.java @@ -15,7 +15,6 @@ import org.knowm.xchart.XYChartBuilder; import org.knowm.xchart.XYSeries.XYSeriesRenderStyle; import org.knowm.xchart.internal.chartpart.Chart; -import org.knowm.xchart.internal.series.Series; import org.knowm.xchart.style.Styler; import org.knowm.xchart.style.Styler.ChartTheme; import org.knowm.xchart.style.Styler.LegendPosition; @@ -28,23 +27,22 @@ public class TestForIssue54_1 { public static void main(String[] args) { - List charts = new ArrayList(); + List> charts = new ArrayList<>(); { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("Default axis"); charts.add(chart); } { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("sin(x) on second axis with title"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.setYAxisGroupTitle(1, "sin(x)"); charts.add(chart); } { - Chart chart = getAreaChart(); + XYChart chart = getAreaChart(); chart.setTitle("Default axis"); charts.add(chart); } @@ -56,57 +54,51 @@ public static void main(String[] args) { // charts.add(chart); // } { - Chart chart = getAreaChart(); + XYChart chart = getAreaChart(); chart.setTitle("all different axis, b & c axis on right"); - Series series = (Series) chart.getSeriesMap().get("b"); - series.setYAxisGroup(1); - series = (Series) chart.getSeriesMap().get("c"); - series.setYAxisGroup(2); + chart.getSeriesMap().get("b").setYAxisGroup(1); + chart.getSeriesMap().get("c").setYAxisGroup(2); chart.getStyler().setYAxisGroupPosition(1, Styler.YAxisPosition.Right); chart.getStyler().setYAxisGroupPosition(2, Styler.YAxisPosition.Right); charts.add(chart); } { - Chart chart = getCaregoryChart(); + CategoryChart chart = getCaregoryChart(); chart.setTitle("Default axis"); charts.add(chart); } { - Chart chart = getCaregoryChart(); + CategoryChart chart = getCaregoryChart(); chart.setTitle("b on second axis, b on right"); - Series series = (Series) chart.getSeriesMap().get("b"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("b").setYAxisGroup(1); chart.getStyler().setYAxisGroupPosition(1, Styler.YAxisPosition.Right); charts.add(chart); } { - Chart chart = getCategoryLineChart(); + CategoryChart chart = getCategoryLineChart(); chart.setTitle("Default axis"); charts.add(chart); } { - Chart chart = getCategoryLineChart(); + CategoryChart chart = getCategoryLineChart(); chart.setTitle("b&d on second axis"); - Series series = (Series) chart.getSeriesMap().get("b"); - series.setYAxisGroup(1); - series = (Series) chart.getSeriesMap().get("d"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("b").setYAxisGroup(1); + chart.getSeriesMap().get("d").setYAxisGroup(1); chart.getStyler().setYAxisGroupPosition(1, Styler.YAxisPosition.Right); charts.add(chart); } { - Chart chart = getBubleChart(); + BubbleChart chart = getBubleChart(); chart.setTitle("Default axis"); charts.add(chart); } { - Chart chart = getBubleChart(); + BubbleChart chart = getBubleChart(); chart.setTitle("b on second axis"); - Series series = (Series) chart.getSeriesMap().get("b"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("b").setYAxisGroup(1); charts.add(chart); } @@ -114,20 +106,20 @@ public static void main(String[] args) { // charts.clear(); // charts.add(chart); { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("Default axis on right"); chart.getStyler().setYAxisGroupPosition(0, Styler.YAxisPosition.Right); charts.add(chart); } - SwingWrapper wrapper = new SwingWrapper(charts); + SwingWrapper> wrapper = new SwingWrapper<>(charts); wrapper.displayChartMatrix(); for (int i = 0; i < charts.size(); i++) { wrapper.getXChartPanel(i).setToolTipsEnabled(true); } } - static Chart getLineChart() { + static XYChart getLineChart() { XYChart chart = new XYChartBuilder().width(WIDTH).height(HEIGHT).xAxisTitle("X").yAxisTitle("Y").build(); @@ -154,7 +146,7 @@ static Chart getLineChart() { return chart; } - static Chart getAreaChart() { + static XYChart getAreaChart() { // Create Chart XYChart chart = @@ -295,7 +287,7 @@ static BubbleChart getBubleChart() { } public static XYChart getChart() { - return (XYChart) getLineChart(); + return getLineChart(); } } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_2.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_2.java index 11d0fbd6d..79276e0da 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_2.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue54_2.java @@ -5,8 +5,6 @@ import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; import org.knowm.xchart.XYChartBuilder; -import org.knowm.xchart.internal.chartpart.Chart; -import org.knowm.xchart.internal.series.Series; import org.knowm.xchart.style.Styler.LegendPosition; import org.knowm.xchart.style.Styler.YAxisPosition; @@ -18,20 +16,19 @@ public class TestForIssue54_2 { public static void main(String[] args) { - Chart chart = getLineChart(); + XYChart chart = getLineChart(); chart.setTitle("sin(x) on second axis with title"); - Series series = (Series) chart.getSeriesMap().get("y=sin(x)"); - series.setYAxisGroup(1); + chart.getSeriesMap().get("y=sin(x)").setYAxisGroup(1); chart.getStyler().setYAxisGroupPosition(1, YAxisPosition.Left); chart.getStyler().setYAxisGroupPosition(0, YAxisPosition.Right); chart.setYAxisGroupTitle(1, "sin(x)"); - SwingWrapper sw = new SwingWrapper(chart); + SwingWrapper sw = new SwingWrapper<>(chart); sw.displayChart(); sw.getXChartPanel().setToolTipsEnabled(true); } - static Chart getLineChart() { + static XYChart getLineChart() { XYChart chart = new XYChartBuilder().width(WIDTH).height(HEIGHT).xAxisTitle("X").yAxisTitle("Y").build(); @@ -60,7 +57,7 @@ static Chart getLineChart() { } public static XYChart getChart() { - return (XYChart) getLineChart(); + return getLineChart(); } } diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue582.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue582.java index 20cd6749f..9b19d4df6 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue582.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue582.java @@ -11,7 +11,7 @@ public class TestForIssue582 { public static void main(String[] args) throws ParseException { XYChart chart = getXYChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static XYChart getXYChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue593.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue593.java index f69308844..18047ceda 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue593.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue593.java @@ -5,7 +5,6 @@ import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; import org.knowm.xchart.XYChartBuilder; -import org.knowm.xchart.XYSeries; /** * Demonstrates the fix for issue #593 — cursor dataPointList memory leak in live XYCharts. diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue617.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue617.java index ab49fe26e..3e53d5079 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue617.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue617.java @@ -12,7 +12,7 @@ public class TestForIssue617 { public static void main(String[] args) throws ParseException { CategoryChart chart = getCategoryChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static CategoryChart getCategoryChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue628.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue628.java index 4095e2e28..0870ec5b5 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue628.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue628.java @@ -11,7 +11,7 @@ public class TestForIssue628 { public static void main(String[] args) throws ParseException { XYChart chart = getCategoryChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static XYChart getCategoryChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue653.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue653.java index 666f5719e..5514c8c34 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue653.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue653.java @@ -12,7 +12,7 @@ public class TestForIssue653 { public static void main(String[] args) throws ParseException { CategoryChart chart = getCategoryChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static CategoryChart getCategoryChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue707.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue707.java index ab909ae83..36af889d2 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue707.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue707.java @@ -11,7 +11,7 @@ public class TestForIssue707 { public static void main(String[] args) throws ParseException { CategoryChart chart = getCategoryChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static CategoryChart getCategoryChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue826.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue826.java index d40709b23..4b92e4bff 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue826.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue826.java @@ -12,7 +12,7 @@ public class TestForIssue826 { public static void main(String[] args) throws ParseException { CategoryChart chart = getChart(); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } public static CategoryChart getChart() { diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue83.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue83.java index 9a15412d9..f39ffd885 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue83.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue83.java @@ -1,10 +1,9 @@ package org.knowm.xchart.standalone.issues; -import java.io.IOException; import org.knowm.xchart.SwingWrapper; import org.knowm.xchart.XYChart; -import org.knowm.xchart.style.Styler; import org.knowm.xchart.style.Styler.LegendPosition; +import org.knowm.xchart.style.XYStyler; import org.knowm.xchart.style.lines.SeriesLines; public class TestForIssue83 { @@ -13,7 +12,7 @@ public static XYChart getChart() { final XYChart chart = new XYChart(500, 580); - final Styler styleManager = chart.getStyler(); + final XYStyler styleManager = chart.getStyler(); styleManager.setLegendPosition(LegendPosition.InsideNW); styleManager.setLegendVisible(false); diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue98.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue98.java index 0c0e6c57c..a4a51df1b 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue98.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/issues/TestForIssue98.java @@ -1,6 +1,5 @@ package org.knowm.xchart.standalone.issues; -import java.io.IOException; import java.util.ArrayList; import java.util.Date; import org.knowm.xchart.SwingWrapper; diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/readme/IntermediateExample.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/readme/IntermediateExample.java index 3b377bf80..11f84697c 100644 --- a/xchart-demo/src/main/java/org/knowm/xchart/standalone/readme/IntermediateExample.java +++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/readme/IntermediateExample.java @@ -39,7 +39,7 @@ public static void main(String[] args) { chart.addSeries("Gaussian Blob 2", getGaussian(1000, 1, 10), getGaussian(1000, 0, 5)); series.setMarker(SeriesMarkers.DIAMOND); - new SwingWrapper(chart).displayChart(); + new SwingWrapper<>(chart).displayChart(); } private static List getGaussian(int number, double mean, double std) { diff --git a/xchart-site/src/main/java/org/knowm/xchart/site/GenerateSite.java b/xchart-site/src/main/java/org/knowm/xchart/site/GenerateSite.java index efb5a007f..6caa4c3b2 100644 --- a/xchart-site/src/main/java/org/knowm/xchart/site/GenerateSite.java +++ b/xchart-site/src/main/java/org/knowm/xchart/site/GenerateSite.java @@ -416,7 +416,6 @@ private String buildFooter() { // ── Package scanning ───────────────────────────────────────────────────────── - @SuppressWarnings("unchecked") private List> scanPackage(String packageName) throws Exception { List> classes = new ArrayList<>(); String packagePath = packageName.replace('.', '/'); diff --git a/xchart/src/main/java/org/knowm/xchart/AnnotationImage.java b/xchart/src/main/java/org/knowm/xchart/AnnotationImage.java index 723f06f27..e11fad21f 100644 --- a/xchart/src/main/java/org/knowm/xchart/AnnotationImage.java +++ b/xchart/src/main/java/org/knowm/xchart/AnnotationImage.java @@ -28,7 +28,7 @@ public AnnotationImage(BufferedImage image, double x, double y, boolean isValueI this.y = y; } - public void init(Chart chart) { + public void init(Chart chart) { super.init(chart); } diff --git a/xchart/src/main/java/org/knowm/xchart/AnnotationTextPanel.java b/xchart/src/main/java/org/knowm/xchart/AnnotationTextPanel.java index f9f0dddea..30b8292e5 100644 --- a/xchart/src/main/java/org/knowm/xchart/AnnotationTextPanel.java +++ b/xchart/src/main/java/org/knowm/xchart/AnnotationTextPanel.java @@ -39,7 +39,7 @@ public AnnotationTextPanel(String lines, double x, double y, boolean isValueInSc this.y = y; } - public void init(Chart chart) { + public void init(Chart chart) { super.init(chart); } diff --git a/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java b/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java index 4913cdb5e..4ad50661b 100644 --- a/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java +++ b/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java @@ -21,7 +21,7 @@ import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadataNode; import javax.imageio.stream.FileImageOutputStream; -import org.knowm.xchart.internal.chartpart.Chart; +import org.knowm.xchart.internal.chartpart.IChart; /** A helper class with static methods for saving Charts as bitmaps */ public final class BitmapEncoder { @@ -62,8 +62,8 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat * @param bitmapFormat * @throws IOException */ - public static > void saveBitmap( - T chart, String fileName, BitmapFormat bitmapFormat) throws IOException { + public static void saveBitmap( + IChart chart, String fileName, BitmapFormat bitmapFormat) throws IOException { try (OutputStream out = new FileOutputStream(addFileExtension(fileName, bitmapFormat))) { saveBitmap(chart, out, bitmapFormat); @@ -79,8 +79,8 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat * @param bitmapFormat * @throws IOException */ - public static > void saveBitmap( - T chart, OutputStream targetStream, BitmapFormat bitmapFormat) throws IOException { + public static void saveBitmap( + IChart chart, OutputStream targetStream, BitmapFormat bitmapFormat) throws IOException { BufferedImage bufferedImage = getBufferedImage(chart); ImageIO.write(bufferedImage, bitmapFormat.toString().toLowerCase(), targetStream); @@ -97,8 +97,8 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat * @param bitmapFormat * @throws IOException */ - public static > void saveBitmap( - List charts, + public static void saveBitmap( + List charts, Integer rows, Integer cols, String fileName, @@ -122,8 +122,8 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat * @param bitmapFormat * @throws IOException */ - public static > void saveBitmap( - List charts, + public static void saveBitmap( + List charts, Integer rows, Integer cols, OutputStream targetStream, @@ -131,7 +131,7 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat throws IOException { List chartImages = new LinkedList<>(); - for (T c : charts) chartImages.add(getBufferedImage(c)); + for (IChart c : charts) chartImages.add(getBufferedImage(c)); BufferedImage bufferedImage = mergeImages(chartImages, rows, cols); ImageIO.write(bufferedImage, bitmapFormat.toString().toLowerCase(), targetStream); @@ -146,8 +146,8 @@ public static String addFileExtension(String fileName, BitmapFormat bitmapFormat * @param DPI * @throws IOException */ - public static > void saveBitmapWithDPI( - T chart, String fileName, BitmapFormat bitmapFormat, int DPI) throws IOException { + public static void saveBitmapWithDPI( + IChart chart, String fileName, BitmapFormat bitmapFormat, int DPI) throws IOException { double scaleFactor = DPI / 72.0; @@ -230,8 +230,8 @@ private static void setDPI(IIOMetadata metadata, int DPI) throws IIOInvalidTreeE * @param quality - a float between 0 and 1 (1 = maximum quality) * @throws IOException */ - public static > void saveJPGWithQuality( - T chart, String fileName, float quality) throws IOException { + public static void saveJPGWithQuality( + IChart chart, String fileName, float quality) throws IOException { BufferedImage bufferedImage = getBufferedImage(chart); @@ -258,7 +258,7 @@ private static void setDPI(IIOMetadata metadata, int DPI) throws IIOInvalidTreeE * @return a byte[] for a given chart * @throws IOException */ - public static > byte[] getBitmapBytes(T chart, BitmapFormat bitmapFormat) + public static byte[] getBitmapBytes(IChart chart, BitmapFormat bitmapFormat) throws IOException { BufferedImage bufferedImage = getBufferedImage(chart); @@ -273,7 +273,7 @@ private static void setDPI(IIOMetadata metadata, int DPI) throws IIOInvalidTreeE return imageInBytes; } - public static > BufferedImage getBufferedImage(T chart) { + public static BufferedImage getBufferedImage(IChart chart) { BufferedImage bufferedImage = new BufferedImage(chart.getWidth(), chart.getHeight(), BufferedImage.TYPE_INT_RGB); diff --git a/xchart/src/main/java/org/knowm/xchart/PdfboxGraphicsEncoder.java b/xchart/src/main/java/org/knowm/xchart/PdfboxGraphicsEncoder.java index d01e5d2bc..7f4824e72 100644 --- a/xchart/src/main/java/org/knowm/xchart/PdfboxGraphicsEncoder.java +++ b/xchart/src/main/java/org/knowm/xchart/PdfboxGraphicsEncoder.java @@ -13,7 +13,7 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject; -import org.knowm.xchart.internal.chartpart.Chart; +import org.knowm.xchart.internal.chartpart.IChart; /** A helper class with static methods for saving Charts as a PDF file */ public class PdfboxGraphicsEncoder { @@ -30,7 +30,7 @@ private PdfboxGraphicsEncoder() {} * @param fileName file name path * @throws IOException */ - public static void savePdfboxGraphics(Chart chart, String fileName) throws IOException { + public static void savePdfboxGraphics(IChart chart, String fileName) throws IOException { savePdfboxGraphics(chart, new File(addFileExtension(fileName))); } @@ -42,7 +42,7 @@ public static void savePdfboxGraphics(Chart chart, String fileName) throws IOExc * @param file File * @throws IOException */ - public static void savePdfboxGraphics(Chart chart, File file) throws IOException { + public static void savePdfboxGraphics(IChart chart, File file) throws IOException { savePdfboxGraphics(chart, new BufferedOutputStream(new FileOutputStream(file))); } @@ -54,9 +54,9 @@ public static void savePdfboxGraphics(Chart chart, File file) throws IOException * @param os OutputStream * @throws IOException */ - public static void savePdfboxGraphics(Chart chart, OutputStream os) throws IOException { + public static void savePdfboxGraphics(IChart chart, OutputStream os) throws IOException { - List charts = new ArrayList<>(); + List charts = new ArrayList<>(); charts.add(chart); savePdfboxGraphics(charts, os); } @@ -64,11 +64,11 @@ public static void savePdfboxGraphics(Chart chart, OutputStream os) throws IOExc /** * Write multiple charts to a file * - * @param charts List<? extends Chart> + * @param charts List<? extends IChart> * @param fileName file name path * @throws IOException */ - public static void savePdfboxGraphics(List charts, String fileName) + public static void savePdfboxGraphics(List charts, String fileName) throws IOException { savePdfboxGraphics(charts, new File(addFileExtension(fileName))); @@ -77,11 +77,11 @@ public static void savePdfboxGraphics(List charts, String fileN /** * Write multiple charts to a file * - * @param charts List<? extends Chart> + * @param charts List<? extends IChart> * @param file File * @throws IOException */ - public static void savePdfboxGraphics(List charts, File file) + public static void savePdfboxGraphics(List charts, File file) throws IOException { savePdfboxGraphics(charts, new BufferedOutputStream(new FileOutputStream(file))); @@ -90,11 +90,11 @@ public static void savePdfboxGraphics(List charts, File file) /** * Write multiple charts to an OutputStream * - * @param charts List<? extends Chart> + * @param charts List<? extends IChart> * @param os OutputStream * @throws IOException */ - public static void savePdfboxGraphics(List charts, OutputStream os) + public static void savePdfboxGraphics(List charts, OutputStream os) throws IOException { PDDocument document = new PDDocument(); @@ -103,7 +103,7 @@ public static void savePdfboxGraphics(List charts, OutputStream PDPageContentStream contentStream = null; PdfBoxGraphics2D pdfBoxGraphics2D = null; PDFormXObject xform = null; - for (Chart chart : charts) { + for (IChart chart : charts) { mediaBox = new PDRectangle(chart.getWidth(), chart.getHeight()); page = new PDPage(mediaBox); // add page diff --git a/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java b/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java index d06598427..31847df22 100644 --- a/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java +++ b/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java @@ -197,7 +197,7 @@ public void repaintChart(int index) { * @param isCentered * @return */ - public SwingWrapper isCentered(boolean isCentered) { + public SwingWrapper isCentered(boolean isCentered) { this.isCentered = isCentered; return this; } @@ -208,7 +208,7 @@ public SwingWrapper isCentered(boolean isCentered) { * @param windowTitle * @return */ - public SwingWrapper setTitle(String windowTitle) { + public SwingWrapper setTitle(String windowTitle) { this.windowTitle = windowTitle; return this; } diff --git a/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java b/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java index f937d8dd4..5563f82ec 100644 --- a/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java +++ b/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java @@ -10,7 +10,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.knowm.xchart.internal.chartpart.Chart; +import org.knowm.xchart.internal.chartpart.IChart; /** A helper class with static methods for saving Charts as vectors */ public final class VectorGraphicsEncoder { @@ -20,7 +20,7 @@ private VectorGraphicsEncoder() {} /** Write a chart to a file. */ public static void saveVectorGraphic( - Chart chart, String fileName, VectorGraphicsFormat vectorGraphicsFormat) throws IOException { + IChart chart, String fileName, VectorGraphicsFormat vectorGraphicsFormat) throws IOException { FileOutputStream file = new FileOutputStream(addFileExtension(fileName, vectorGraphicsFormat)); try { @@ -32,7 +32,7 @@ public static void saveVectorGraphic( /** Write a chart to an OutputStream. */ public static void saveVectorGraphic( - Chart chart, OutputStream os, VectorGraphicsFormat vectorGraphicsFormat) throws IOException { + IChart chart, OutputStream os, VectorGraphicsFormat vectorGraphicsFormat) throws IOException { final Processor p; switch (vectorGraphicsFormat) { @@ -102,7 +102,7 @@ public Document getDocument(CommandSequence arg0, PageSize arg1) { return null; } - public void savePdf(Chart chart, OutputStream os) throws IOException { + public void savePdf(IChart chart, OutputStream os) throws IOException { PdfboxGraphicsEncoder.savePdfboxGraphics(chart, os); } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/ChartBuilder.java b/xchart/src/main/java/org/knowm/xchart/internal/ChartBuilder.java index 19735bc46..d041b1c06 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/ChartBuilder.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/ChartBuilder.java @@ -4,7 +4,7 @@ import org.knowm.xchart.style.Styler.ChartTheme; /** A "Builder" to make creating charts easier */ -public abstract class ChartBuilder, C extends Chart> { +public abstract class ChartBuilder, C extends Chart> { public int width = 800; public int height = 600; @@ -15,24 +15,28 @@ public abstract class ChartBuilder, C extends Chart /** Constructor */ protected ChartBuilder() {} + @SuppressWarnings("unchecked") public T width(int width) { this.width = width; return (T) this; } + @SuppressWarnings("unchecked") public T height(int height) { this.height = height; return (T) this; } + @SuppressWarnings("unchecked") public T title(String title) { this.title = title; return (T) this; } + @SuppressWarnings("unchecked") public T theme(ChartTheme chartTheme) { this.chartTheme = chartTheme; diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Annotation.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Annotation.java index 00091acad..d0d21b94a 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Annotation.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Annotation.java @@ -8,7 +8,7 @@ public abstract class Annotation implements ChartPart { protected boolean isVisible = true; protected boolean isValueInScreenSpace; - protected Chart chart; + protected Chart chart; protected Styler styler; protected Rectangle2D bounds; @@ -16,7 +16,7 @@ public Annotation(boolean isValueInScreenSpace) { this.isValueInScreenSpace = isValueInScreenSpace; } - public void init(Chart chart) { + public void init(Chart chart) { this.chart = chart; this.styler = chart.getStyler(); 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 b13f6d2f9..850019ad2 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 @@ -73,9 +73,7 @@ public void paint(Graphics2D g) { groupPainter.wireRelationships(); // Left side - double leftStart = - groupPainter.paintLeft( - g, chartPadding, leftYAxisBounds, styler.getYAxisLeftWidthHint()); + groupPainter.paintLeft(g, chartPadding, leftYAxisBounds, styler.getYAxisLeftWidthHint()); // Right side double legendWidth = 0; diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_.java index 0ce719106..554569158 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator_.java @@ -311,7 +311,6 @@ protected void calculate() { // This happens when the data values are almost the same but differ by a very tiny amount. // The solution for now is to create a single axis label and tick at the average value tickLabels.add(getAxisFormat().format(BigDecimal.valueOf((maxValue + minValue) / 2.0))); - double averageValue = (maxValue + minValue) / 2.0; tickLocations.add(workingSpace / 2.0); return; } else if (firstPositionAsDouble == Double.NEGATIVE_INFINITY) { 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 2c9ef0634..1c4c2a72b 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 @@ -25,7 +25,7 @@ public class AxisTitle implements * @param chart the Chart * @param direction the Direction */ - AxisTitle(Chart chart, Direction direction, Axis_ yAxis, int yIndex) { + AxisTitle(Chart chart, Direction direction, Axis_ yAxis, int yIndex) { this.chart = chart; this.direction = direction; 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 4e9dc4a90..34337a4cf 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 @@ -193,7 +193,7 @@ public double getScreenValueForMax() { * Returns the (possibly empty) list of colocated slave axes registered on this master. * Non-Y axes always return an empty list. */ - public List getColocatedSlaves() { + public List> getColocatedSlaves() { return java.util.Collections.emptyList(); } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis_X.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis_X.java index 11c8e616a..a74c2d39a 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis_X.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis_X.java @@ -8,7 +8,6 @@ import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Chart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Chart.java index e5fc7246f..cb188482d 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Chart.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Chart.java @@ -17,7 +17,7 @@ import org.knowm.xchart.style.Styler; /** An XChart Chart */ -public abstract class Chart { +public abstract class Chart implements IChart { protected final ST styler; protected final ChartTitle chartTitle; @@ -27,7 +27,7 @@ public abstract class Chart { /** Chart Parts */ // TODO maybe move this to a secondary abstract class for inheritors with axes. Pie charts don't // have an axis for example - protected AxisPair axisPair; + protected AxisPair axisPair; protected Plot_ plot; protected Legend_ legend; @@ -202,22 +202,22 @@ Plot_ getPlot() { return plot; } - Axis_X getXAxis() { + Axis_X getXAxis() { return axisPair.getXAxis(); } - Axis_Y getYAxis() { + Axis_Y getYAxis() { return axisPair.getYAxis(); } - Axis_Y getYAxis(int yIndex) { + Axis_Y getYAxis(int yIndex) { return axisPair.getYAxis(yIndex); } - AxisPair getAxisPair() { + AxisPair getAxisPair() { return axisPair; } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ColocatedSlaveLabels.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ColocatedSlaveLabels.java index c66f1159b..fe7dc1e87 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ColocatedSlaveLabels.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ColocatedSlaveLabels.java @@ -79,7 +79,7 @@ void paint( double maxTickLabelWidth, Map masterLayouts) { - List colocatedSlaves = yAxis.getColocatedSlaves(); + List> colocatedSlaves = yAxis.getColocatedSlaves(); if (colocatedSlaves.isEmpty()) { return; } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Cursor.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Cursor.java index 53ab192aa..0396db54a 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Cursor.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Cursor.java @@ -29,7 +29,6 @@ public class Cursor extends MouseAdapter implements ChartPart { private final List dataPointList = new ArrayList<>(); private final List matchingDataPointList = new ArrayList<>(); - private final Chart chart; private final XYStyler styler; private final Map seriesMap; @@ -47,15 +46,16 @@ public class Cursor extends MouseAdapter implements ChartPart { * * @param chart */ - public Cursor(Chart chart) { + public Cursor(Chart chart) { - this.chart = chart; this.styler = (XYStyler) chart.getStyler(); // clear lists dataPointList.clear(); - this.seriesMap = chart.getSeriesMap(); + @SuppressWarnings("unchecked") + Map tmp = (Map) (Map) chart.getSeriesMap(); + this.seriesMap = tmp; } @Override diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/IChart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/IChart.java new file mode 100644 index 000000000..d2e17d006 --- /dev/null +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/IChart.java @@ -0,0 +1,19 @@ +package org.knowm.xchart.internal.chartpart; + +import java.awt.Graphics2D; + +/** + * Minimal rendering contract for all XChart chart types. Use this type (instead of the generic + * {@code Chart}) whenever code only needs to paint a chart or query its dimensions/title — + * e.g. bitmap/vector/PDF encoders. + */ +public interface IChart { + + void paint(Graphics2D g, int width, int height); + + int getWidth(); + + int getHeight(); + + String getTitle(); +} diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend_HorizontalBar.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend_HorizontalBar.java index cd15604e9..c899eea39 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend_HorizontalBar.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend_HorizontalBar.java @@ -10,8 +10,6 @@ public class Legend_HorizontalBar extends Legend_ { - private final ST axesChartStyler; - /** * Constructor * @@ -20,7 +18,6 @@ public class Legend_HorizontalBar chart) { super(chart); - axesChartStyler = chart.getStyler(); } @Override diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_OHLC.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_OHLC.java index afa768aae..c55766f5f 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_OHLC.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_OHLC.java @@ -328,7 +328,4 @@ public void doPaint(Graphics2D g) { } } } - - // line chart drawing logic - private void paintLine(Graphics2D g, S series) {} } 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 d5db6289a..10de06547 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 @@ -55,7 +55,7 @@ public void doPaint(Graphics2D g) { if (!series.isEnabled()) { continue; } - Axis_Y yAxis = chart.getYAxis(series.getYAxisGroup()); + Axis_Y yAxis = chart.getYAxis(series.getYAxisGroup()); double yMin = yAxis.getMin(); double yMax = yAxis.getMax(); if (xyStyler.isYAxisLogarithmic()) { diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ToolTips.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ToolTips.java index 15ecb5849..6c98752da 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ToolTips.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ToolTips.java @@ -27,7 +27,6 @@ public class ToolTips extends MouseAdapter implements ChartPart { private static final int MARGIN = 5; private static final int MOUSE_MARGIN = 20; - private final Chart chart; private final Styler styler; private final boolean alwaysVisible; private final ToolTipType toolTipType; @@ -44,9 +43,8 @@ public class ToolTips extends MouseAdapter implements ChartPart { * @param alwaysVisible * @param toolTipType */ - public ToolTips(Chart chart, boolean alwaysVisible, ToolTipType toolTipType) { + public ToolTips(Chart chart, boolean alwaysVisible, ToolTipType toolTipType) { - this.chart = chart; this.styler = chart.getStyler(); this.alwaysVisible = alwaysVisible; this.toolTipType = toolTipType; diff --git a/xchart/src/main/java/org/knowm/xchart/style/markers/Trapezoid.java b/xchart/src/main/java/org/knowm/xchart/style/markers/Trapezoid.java index 8f0db8174..1f4b500bf 100644 --- a/xchart/src/main/java/org/knowm/xchart/style/markers/Trapezoid.java +++ b/xchart/src/main/java/org/knowm/xchart/style/markers/Trapezoid.java @@ -6,7 +6,6 @@ public class Trapezoid extends Marker { @Override public void paint(Graphics2D g, double xOffset, double yOffset, int markerSize) { g.setStroke(stroke); - double halfSize = (double) markerSize / 2; Polygon polygon = new Polygon(); for (int i = 1; i <= 4; i++) { diff --git a/xchart/src/main/java/org/knowm/xchart/style/theme/Theme.java b/xchart/src/main/java/org/knowm/xchart/style/theme/Theme.java index b462f55cf..eed0003d9 100644 --- a/xchart/src/main/java/org/knowm/xchart/style/theme/Theme.java +++ b/xchart/src/main/java/org/knowm/xchart/style/theme/Theme.java @@ -4,7 +4,6 @@ import java.awt.Color; import java.awt.Font; import org.knowm.xchart.style.PieStyler.LabelType; -import org.knowm.xchart.style.Styler; import org.knowm.xchart.style.Styler.LegendPosition; import org.knowm.xchart.style.colors.ChartColor; import org.knowm.xchart.style.colors.SeriesColors; diff --git a/xchart/src/test/java/org/knowm/xchart/internal/chartpart/RegressionIssue536Test.java b/xchart/src/test/java/org/knowm/xchart/internal/chartpart/RegressionIssue536Test.java index 85030a640..8337f5179 100644 --- a/xchart/src/test/java/org/knowm/xchart/internal/chartpart/RegressionIssue536Test.java +++ b/xchart/src/test/java/org/knowm/xchart/internal/chartpart/RegressionIssue536Test.java @@ -73,7 +73,7 @@ public void issue536RegressionTest() throws Exception { XYSeries xyseries = chart.addSeries(series, x, y); xyseries.setMarker(SeriesMarkers.NONE); xyseries.setYAxisGroup(1); - byte[] bytes = BitmapEncoder.getBitmapBytes(chart, BitmapEncoder.BitmapFormat.PNG); + BitmapEncoder.getBitmapBytes(chart, BitmapEncoder.BitmapFormat.PNG); List tickLabels = chart.axisPair.getXAxis().getAxisTickCalculator().getTickLabels(); diff --git a/xchart/src/test/java/org/knowm/xchart/regressiontests/RegressionTestIssue536.java b/xchart/src/test/java/org/knowm/xchart/regressiontests/RegressionTestIssue536.java index 01ffad8e1..403308929 100644 --- a/xchart/src/test/java/org/knowm/xchart/regressiontests/RegressionTestIssue536.java +++ b/xchart/src/test/java/org/knowm/xchart/regressiontests/RegressionTestIssue536.java @@ -25,6 +25,6 @@ public void issue546RegressionTest() throws Exception { XYSeries series = chart.addSeries("Series", times, values); series.setMarker(SeriesMarkers.NONE); - byte[] bytes = BitmapEncoder.getBitmapBytes(chart, BitmapEncoder.BitmapFormat.PNG); + BitmapEncoder.getBitmapBytes(chart, BitmapEncoder.BitmapFormat.PNG); } }