From: <mu...@us...> - 2008-09-04 20:04:43
|
Revision: 1518 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1518&view=rev Author: mungady Date: 2008-09-04 20:04:38 +0000 (Thu, 04 Sep 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotPackageTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------------ @@ -72,15 +72,15 @@ /** * Tests for the {@link CombinedDomainCategoryPlot} class. */ -public class CombinedDomainCategoryPlotTests extends TestCase +public class CombinedDomainCategoryPlotTests extends TestCase implements ChartChangeListener { /** A list of the events received. */ private List events = new java.util.ArrayList(); - + /** * Receives a chart change event. - * + * * @param event the event. */ public void chartChanged(ChartChangeEvent event) { @@ -120,21 +120,21 @@ assertTrue(plots.get(0) == plot1); assertEquals(1, plots.size()); } - + /** * Some checks for the equals() method. */ public void testEquals() { CombinedDomainCategoryPlot plot1 = createPlot(); CombinedDomainCategoryPlot plot2 = createPlot(); - assertTrue(plot1.equals(plot2)); + assertTrue(plot1.equals(plot2)); } /** * Some checks for cloning. */ public void testCloning() { - CombinedDomainCategoryPlot plot1 = createPlot(); + CombinedDomainCategoryPlot plot1 = createPlot(); CombinedDomainCategoryPlot plot2 = null; try { plot2 = (CombinedDomainCategoryPlot) plot1.clone(); @@ -168,7 +168,7 @@ } assertEquals(plot1, plot2); } - + /** * Check that only one chart change event is generated by a change to a * subplot. @@ -181,16 +181,16 @@ NumberAxis yAxis = (NumberAxis) subplot1.getRangeAxis(); yAxis.setAutoRangeIncludesZero(!yAxis.getAutoRangeIncludesZero()); assertEquals(1, this.events.size()); - + // a redraw should NOT trigger another change event - BufferedImage image = new BufferedImage(200, 100, + BufferedImage image = new BufferedImage(200, 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); this.events.clear(); chart.draw(g2, new Rectangle2D.Double(0.0, 0.0, 200.0, 100.0)); assertTrue(this.events.isEmpty()); - } - + } + /** * Creates a dataset. * @@ -283,11 +283,11 @@ /** * Creates a sample plot. - * + * * @return A sample plot. */ private CombinedDomainCategoryPlot createPlot() { - + CategoryDataset dataset1 = createDataset1(); NumberAxis rangeAxis1 = new NumberAxis("Value"); rangeAxis1.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); @@ -299,7 +299,7 @@ dataset1, null, rangeAxis1, renderer1 ); subplot1.setDomainGridlinesVisible(true); - + CategoryDataset dataset2 = createDataset2(); NumberAxis rangeAxis2 = new NumberAxis("Value"); rangeAxis2.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); @@ -313,12 +313,12 @@ subplot2.setDomainGridlinesVisible(true); CategoryAxis domainAxis = new CategoryAxis("Category"); - CombinedDomainCategoryPlot plot + CombinedDomainCategoryPlot plot = new CombinedDomainCategoryPlot(domainAxis); plot.add(subplot1, 2); plot.add(subplot2, 1); return plot; - + } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------ @@ -75,15 +75,15 @@ /** * Tests for the {@link CombinedDomainXYPlot} class. */ -public class CombinedDomainXYPlotTests extends TestCase +public class CombinedDomainXYPlotTests extends TestCase implements ChartChangeListener { /** A list of the events received. */ private List events = new java.util.ArrayList(); - + /** * Receives a chart change event. - * + * * @param event the event. */ public void chartChanged(ChartChangeEvent event) { @@ -115,7 +115,7 @@ CombinedDomainXYPlot plot = new CombinedDomainXYPlot(null); assertEquals(null, plot.getDomainAxis()); } - + /** * This is a test to replicate the bug report 987080. */ @@ -130,14 +130,14 @@ List plots = plot.getSubplots(); assertTrue(plots.get(0) == plot1); } - + /** * Tests the equals() method. */ public void testEquals() { CombinedDomainXYPlot plot1 = createPlot(); CombinedDomainXYPlot plot2 = createPlot(); - assertTrue(plot1.equals(plot2)); + assertTrue(plot1.equals(plot2)); assertTrue(plot2.equals(plot1)); } @@ -145,7 +145,7 @@ * Confirm that cloning works. */ public void testCloning() { - CombinedDomainXYPlot plot1 = createPlot(); + CombinedDomainXYPlot plot1 = createPlot(); CombinedDomainXYPlot plot2 = null; try { plot2 = (CombinedDomainXYPlot) plot1.clone(); @@ -180,7 +180,7 @@ } assertEquals(plot1, plot2); } - + /** * Check that only one chart change event is generated by a change to a * subplot. @@ -193,16 +193,16 @@ NumberAxis yAxis = (NumberAxis) subplot1.getRangeAxis(); yAxis.setAutoRangeIncludesZero(!yAxis.getAutoRangeIncludesZero()); assertEquals(1, this.events.size()); - + // a redraw should NOT trigger another change event - BufferedImage image = new BufferedImage(200, 100, + BufferedImage image = new BufferedImage(200, 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); this.events.clear(); chart.draw(g2, new Rectangle2D.Double(0.0, 0.0, 200.0, 100.0)); assertTrue(this.events.isEmpty()); - } - + } + /** * Creates a sample dataset. * @@ -282,7 +282,7 @@ /** * Creates a sample plot. - * + * * @return A sample plot. */ private CombinedDomainXYPlot createPlot() { @@ -292,13 +292,13 @@ NumberAxis rangeAxis1 = new NumberAxis("Range 1"); XYPlot subplot1 = new XYPlot(data1, null, rangeAxis1, renderer1); subplot1.setRangeAxisLocation(AxisLocation.BOTTOM_OR_LEFT); - - XYTextAnnotation annotation + + XYTextAnnotation annotation = new XYTextAnnotation("Hello!", 50.0, 10000.0); annotation.setFont(new Font("SansSerif", Font.PLAIN, 9)); annotation.setRotationAngle(Math.PI / 4.0); subplot1.addAnnotation(annotation); - + // create subplot 2... XYDataset data2 = createDataset2(); XYItemRenderer renderer2 = new StandardXYItemRenderer(); @@ -308,10 +308,10 @@ subplot2.setRangeAxisLocation(AxisLocation.TOP_OR_LEFT); // parent plot... - CombinedDomainXYPlot plot + CombinedDomainXYPlot plot = new CombinedDomainXYPlot(new NumberAxis("Domain")); plot.setGap(10.0); - + // add the subplots... plot.add(subplot1, 1); plot.add(subplot2, 1); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------------ @@ -72,15 +72,15 @@ /** * Tests for the {@link CombinedRangeCategoryPlot} class. */ -public class CombinedRangeCategoryPlotTests extends TestCase +public class CombinedRangeCategoryPlotTests extends TestCase implements ChartChangeListener { /** A list of the events received. */ private List events = new java.util.ArrayList(); - + /** * Receives a chart change event. - * + * * @param event the event. */ public void chartChanged(ChartChangeEvent event) { @@ -111,14 +111,14 @@ public void testEquals() { CombinedRangeCategoryPlot plot1 = createPlot(); CombinedRangeCategoryPlot plot2 = createPlot(); - assertTrue(plot1.equals(plot2)); + assertTrue(plot1.equals(plot2)); } /** * Confirm that cloning works. */ public void testCloning() { - CombinedRangeCategoryPlot plot1 = createPlot(); + CombinedRangeCategoryPlot plot1 = createPlot(); CombinedRangeCategoryPlot plot2 = null; try { plot2 = (CombinedRangeCategoryPlot) plot1.clone(); @@ -153,7 +153,7 @@ assertEquals(plot1, plot2); } - + /** * This is a test to replicate the bug report 1121172. */ @@ -169,7 +169,7 @@ List plots = plot.getSubplots(); assertEquals(2, plots.size()); } - + /** * Check that only one chart change event is generated by a change to a * subplot. @@ -182,16 +182,16 @@ NumberAxis yAxis = (NumberAxis) subplot1.getRangeAxis(); yAxis.setAutoRangeIncludesZero(!yAxis.getAutoRangeIncludesZero()); assertEquals(1, this.events.size()); - + // a redraw should NOT trigger another change event - BufferedImage image = new BufferedImage(200, 100, + BufferedImage image = new BufferedImage(200, 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); this.events.clear(); chart.draw(g2, new Rectangle2D.Double(0.0, 0.0, 200.0, 100.0)); assertTrue(this.events.isEmpty()); - } - + } + /** * Creates a dataset. * @@ -284,7 +284,7 @@ /** * Creates a sample plot. - * + * * @return A plot. */ private CombinedRangeCategoryPlot createPlot() { @@ -293,16 +293,16 @@ LineAndShapeRenderer renderer1 = new LineAndShapeRenderer(); renderer1.setBaseToolTipGenerator( new StandardCategoryToolTipGenerator()); - CategoryPlot subplot1 = new CategoryPlot(dataset1, catAxis1, null, + CategoryPlot subplot1 = new CategoryPlot(dataset1, catAxis1, null, renderer1); subplot1.setDomainGridlinesVisible(true); - + CategoryDataset dataset2 = createDataset2(); CategoryAxis catAxis2 = new CategoryAxis("Category"); BarRenderer renderer2 = new BarRenderer(); renderer2.setBaseToolTipGenerator( new StandardCategoryToolTipGenerator()); - CategoryPlot subplot2 = new CategoryPlot(dataset2, catAxis2, null, + CategoryPlot subplot2 = new CategoryPlot(dataset2, catAxis2, null, renderer2); subplot2.setDomainGridlinesVisible(true); @@ -313,5 +313,5 @@ plot.add(subplot2, 1); return plot; } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------------- @@ -75,15 +75,15 @@ /** * Tests for the {@link CombinedRangeXYPlot} class. */ -public class CombinedRangeXYPlotTests extends TestCase +public class CombinedRangeXYPlotTests extends TestCase implements ChartChangeListener { /** A list of the events received. */ private List events = new java.util.ArrayList(); - + /** * Receives a chart change event. - * + * * @param event the event. */ public void chartChanged(ChartChangeEvent event) { @@ -114,7 +114,7 @@ public void testEquals() { CombinedRangeXYPlot plot1 = createPlot(); CombinedRangeXYPlot plot2 = createPlot(); - assertTrue(plot1.equals(plot2)); + assertTrue(plot1.equals(plot2)); assertTrue(plot2.equals(plot1)); } @@ -132,12 +132,12 @@ List plots = plot.getSubplots(); assertTrue(plots.get(0) == plot1); } - + /** * Confirm that cloning works. */ public void testCloning() { - CombinedRangeXYPlot plot1 = createPlot(); + CombinedRangeXYPlot plot1 = createPlot(); CombinedRangeXYPlot plot2 = null; try { plot2 = (CombinedRangeXYPlot) plot1.clone(); @@ -172,7 +172,7 @@ } assertEquals(plot1, plot2); } - + /** * Check that only one chart change event is generated by a change to a * subplot. @@ -185,16 +185,16 @@ NumberAxis xAxis = (NumberAxis) subplot1.getDomainAxis(); xAxis.setAutoRangeIncludesZero(!xAxis.getAutoRangeIncludesZero()); assertEquals(1, this.events.size()); - + // a redraw should NOT trigger another change event - BufferedImage image = new BufferedImage(200, 100, + BufferedImage image = new BufferedImage(200, 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); this.events.clear(); chart.draw(g2, new Rectangle2D.Double(0.0, 0.0, 200.0, 100.0)); assertTrue(this.events.isEmpty()); } - + /** * Creates a sample dataset. * @@ -274,7 +274,7 @@ /** * Creates a sample plot. - * + * * @return A sample plot. */ private CombinedRangeXYPlot createPlot() { @@ -284,31 +284,31 @@ NumberAxis xAxis1 = new NumberAxis("X1"); XYPlot subplot1 = new XYPlot(data1, xAxis1, null, renderer1); subplot1.setRangeAxisLocation(AxisLocation.BOTTOM_OR_LEFT); - - XYTextAnnotation annotation + + XYTextAnnotation annotation = new XYTextAnnotation("Hello!", 50.0, 10000.0); annotation.setFont(new Font("SansSerif", Font.PLAIN, 9)); annotation.setRotationAngle(Math.PI / 4.0); subplot1.addAnnotation(annotation); - + // create subplot 2... XYDataset data2 = createDataset2(); XYItemRenderer renderer2 = new StandardXYItemRenderer(); NumberAxis xAxis2 = new NumberAxis("X2"); xAxis2.setAutoRangeIncludesZero(false); XYPlot subplot2 = new XYPlot(data2, xAxis2, null, renderer2); - subplot2.setRangeAxisLocation(AxisLocation.TOP_OR_LEFT); + subplot2.setRangeAxisLocation(AxisLocation.TOP_OR_LEFT); // parent plot... CombinedRangeXYPlot plot = new CombinedRangeXYPlot(new NumberAxis( "Range")); plot.setGap(10.0); - + // add the subplots... plot.add(subplot1, 1); plot.add(subplot2, 1); plot.setOrientation(PlotOrientation.VERTICAL); return plot; } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------------- * CompassPlotTests.java * --------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -87,58 +87,58 @@ public void testEquals() { CompassPlot plot1 = new CompassPlot(); CompassPlot plot2 = new CompassPlot(); - assertTrue(plot1.equals(plot2)); - + assertTrue(plot1.equals(plot2)); + // labelType... plot1.setLabelType(CompassPlot.VALUE_LABELS); assertFalse(plot1.equals(plot2)); plot2.setLabelType(CompassPlot.VALUE_LABELS); assertTrue(plot1.equals(plot2)); - + // labelFont plot1.setLabelFont(new Font("Serif", Font.PLAIN, 10)); assertFalse(plot1.equals(plot2)); plot2.setLabelFont(new Font("Serif", Font.PLAIN, 10)); assertTrue(plot1.equals(plot2)); - + // drawBorder plot1.setDrawBorder(true); assertFalse(plot1.equals(plot2)); plot2.setDrawBorder(true); assertTrue(plot1.equals(plot2)); - + // rosePaint - plot1.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.blue, + plot1.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.blue, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.blue, + plot2.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.blue, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); - + // roseCenterPaint - plot1.setRoseCenterPaint(new GradientPaint(1.0f, 2.0f, Color.red, + plot1.setRoseCenterPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setRoseCenterPaint(new GradientPaint(1.0f, 2.0f, Color.red, + plot2.setRoseCenterPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); - + // roseHighlightPaint - plot1.setRoseHighlightPaint(new GradientPaint(1.0f, 2.0f, Color.green, + plot1.setRoseHighlightPaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setRoseHighlightPaint(new GradientPaint(1.0f, 2.0f, Color.green, + plot2.setRoseHighlightPaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); } - + /** * Serialize an instance, restore it, and check for equality. */ public void testSerialization() { CompassPlot p1 = new CompassPlot(null); - p1.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, + p1.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); p1.setRoseCenterPaint(new GradientPaint(4.0f, 3.0f, Color.red, 2.0f, 1.0f, Color.green)); @@ -163,7 +163,7 @@ assertEquals(p1, p2); } - + /** * Confirm that cloning works. */ Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------------------- * DefaultDrawingSupplierTests.java * -------------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -81,7 +81,7 @@ public DefaultDrawingSupplierTests(String name) { super(name); } - + /** * Check that the equals() method can distinguish all required fields. */ @@ -90,17 +90,17 @@ DefaultDrawingSupplier r2 = new DefaultDrawingSupplier(); assertTrue(r1.equals(r2)); assertTrue(r2.equals(r1)); - + // set up some objects... Paint[] ps1A = new Paint[] {Color.red, Color.blue}; Paint[] ps2A = new Paint[] {Color.green, Color.yellow, Color.white}; Paint[] ops1A = new Paint[] {Color.lightGray, Color.blue}; Paint[] ops2A = new Paint[] {Color.black, Color.yellow, Color.cyan}; Stroke[] ss1A = new Stroke[] {new BasicStroke(1.1f)}; - Stroke[] ss2A + Stroke[] ss2A = new Stroke[] {new BasicStroke(2.2f), new BasicStroke(3.3f)}; Stroke[] oss1A = new Stroke[] {new BasicStroke(4.4f)}; - Stroke[] oss2A + Stroke[] oss2A = new Stroke[] {new BasicStroke(5.5f), new BasicStroke(6.6f)}; Shape[] shapes1A = new Shape[] { new Rectangle2D.Double(1.0, 1.0, 1.0, 1.0) @@ -114,10 +114,10 @@ Paint[] ops1B = new Paint[] {Color.lightGray, Color.blue}; Paint[] ops2B = new Paint[] {Color.black, Color.yellow, Color.cyan}; Stroke[] ss1B = new Stroke[] {new BasicStroke(1.1f)}; - Stroke[] ss2B + Stroke[] ss2B = new Stroke[] {new BasicStroke(2.2f), new BasicStroke(3.3f)}; Stroke[] oss1B = new Stroke[] {new BasicStroke(4.4f)}; - Stroke[] oss2B + Stroke[] oss2B = new Stroke[] {new BasicStroke(5.5f), new BasicStroke(6.6f)}; Shape[] shapes1B = new Shape[] { new Rectangle2D.Double(1.0, 1.0, 1.0, 1.0) @@ -126,11 +126,11 @@ new Rectangle2D.Double(2.0, 2.0, 2.0, 2.0), new Rectangle2D.Double(2.0, 2.0, 2.0, 2.0) }; - + r1 = new DefaultDrawingSupplier(ps1A, ops1A, ss1A, oss1A, shapes1A); r2 = new DefaultDrawingSupplier(ps1B, ops1B, ss1B, oss1B, shapes1B); assertTrue(r1.equals(r2)); - + // paint sequence r1 = new DefaultDrawingSupplier(ps2A, ops1A, ss1A, oss1A, shapes1A); assertFalse(r1.equals(r2)); @@ -156,31 +156,31 @@ assertFalse(r1.equals(r2)); r2 = new DefaultDrawingSupplier(ps2B, ops2B, ss2B, oss2B, shapes2B); assertTrue(r1.equals(r2)); - + // paint index r1.getNextPaint(); assertFalse(r1.equals(r2)); r2.getNextPaint(); assertTrue(r1.equals(r2)); - + // outline paint index r1.getNextOutlinePaint(); assertFalse(r1.equals(r2)); r2.getNextOutlinePaint(); assertTrue(r1.equals(r2)); - + // stroke index r1.getNextStroke(); assertFalse(r1.equals(r2)); r2.getNextStroke(); assertTrue(r1.equals(r2)); - + // outline stroke index r1.getNextOutlineStroke(); assertFalse(r1.equals(r2)); r2.getNextOutlineStroke(); assertTrue(r1.equals(r2)); - + // shape index r1.getNextShape(); assertFalse(r1.equals(r2)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * FastScatterPlotTests.java * ------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -87,55 +87,55 @@ * Some checks for the equals() method. */ public void testEquals() { - + FastScatterPlot plot1 = new FastScatterPlot(); FastScatterPlot plot2 = new FastScatterPlot(); - assertTrue(plot1.equals(plot2)); + assertTrue(plot1.equals(plot2)); assertTrue(plot2.equals(plot1)); - - plot1.setPaint(new GradientPaint(1.0f, 2.0f, Color.red, + + plot1.setPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setPaint(new GradientPaint(1.0f, 2.0f, Color.red, + plot2.setPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); - + plot1.setDomainGridlinesVisible(false); assertFalse(plot1.equals(plot2)); plot2.setDomainGridlinesVisible(false); assertTrue(plot1.equals(plot2)); - - plot1.setDomainGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.blue, + + plot1.setDomainGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.blue, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setDomainGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.blue, + plot2.setDomainGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.blue, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); - + Stroke s = new BasicStroke(1.5f); plot1.setDomainGridlineStroke(s); assertFalse(plot1.equals(plot2)); plot2.setDomainGridlineStroke(s); assertTrue(plot1.equals(plot2)); - + plot1.setRangeGridlinesVisible(false); assertFalse(plot1.equals(plot2)); plot2.setRangeGridlinesVisible(false); assertTrue(plot1.equals(plot2)); - - plot1.setRangeGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, + + plot1.setRangeGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.yellow)); assertFalse(plot1.equals(plot2)); - plot2.setRangeGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, + plot2.setRangeGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.yellow)); assertTrue(plot1.equals(plot2)); - + Stroke s2 = new BasicStroke(1.5f); plot1.setRangeGridlineStroke(s2); assertFalse(plot1.equals(plot2)); plot2.setRangeGridlineStroke(s2); assertTrue(plot1.equals(plot2)); - + } /** @@ -188,7 +188,7 @@ } /** - * Draws the chart with a <code>null</code> info object to make sure that + * Draws the chart with a <code>null</code> info object to make sure that * no exceptions are thrown. */ public void testDrawWithNullInfo() { @@ -198,10 +198,10 @@ ValueAxis domainAxis = new NumberAxis("X"); ValueAxis rangeAxis = new NumberAxis("Y"); - FastScatterPlot plot = new FastScatterPlot(data, domainAxis, + FastScatterPlot plot = new FastScatterPlot(data, domainAxis, rangeAxis); JFreeChart chart = new JFreeChart(plot); - /* BufferedImage image = */ chart.createBufferedImage(300, 200, + /* BufferedImage image = */ chart.createBufferedImage(300, 200, null); success = true; } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------- * MeterIntervalTests.java * ----------------------- - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -83,31 +83,31 @@ * Confirm that the equals method can distinguish all the required fields. */ public void testEquals() { - + MeterInterval m1 = new MeterInterval( - "Label 1", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), + "Label 1", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), Color.blue ); MeterInterval m2 = new MeterInterval( - "Label 1", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), + "Label 1", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), Color.blue ); assertTrue(m1.equals(m2)); assertTrue(m2.equals(m1)); - + m1 = new MeterInterval( - "Label 2", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), + "Label 2", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), Color.blue ); assertFalse(m1.equals(m2)); m2 = new MeterInterval( - "Label 2", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), + "Label 2", new Range(1.2, 3.4), Color.red, new BasicStroke(1.0f), Color.blue ); assertTrue(m1.equals(m2)); - + } - + /** * This class is immutable so cloning isn't required. */ Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------- * MeterPlotTests.java * ------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -36,7 +36,7 @@ * ------- * 27-Mar-2003 : Version 1 (DG); * 12-May-2004 : Updated testEquals() (DG); - * 29-Nov-2007 : Updated testEquals() and testSerialization1() for + * 29-Nov-2007 : Updated testEquals() and testSerialization1() for * dialOutlinePaint (DG) * */ @@ -88,54 +88,54 @@ } /** - * Test the equals method to ensure that it can distinguish the required + * Test the equals method to ensure that it can distinguish the required * fields. Note that the dataset is NOT considered in the equals test. */ public void testEquals() { MeterPlot plot1 = new MeterPlot(); MeterPlot plot2 = new MeterPlot(); - assertTrue(plot1.equals(plot2)); - + assertTrue(plot1.equals(plot2)); + // units plot1.setUnits("mph"); assertFalse(plot1.equals(plot2)); plot2.setUnits("mph"); assertTrue(plot1.equals(plot2)); - + // range plot1.setRange(new Range(50.0, 70.0)); assertFalse(plot1.equals(plot2)); plot2.setRange(new Range(50.0, 70.0)); assertTrue(plot1.equals(plot2)); - + // interval plot1.addInterval(new MeterInterval("Normal", new Range(55.0, 60.0))); assertFalse(plot1.equals(plot2)); plot2.addInterval(new MeterInterval("Normal", new Range(55.0, 60.0))); assertTrue(plot1.equals(plot2)); - + // dial outline paint - plot1.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, + plot1.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); assertFalse(plot1.equals(plot2)); - plot2.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, + plot2.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); assertTrue(plot1.equals(plot2)); - + // dial shape plot1.setDialShape(DialShape.CHORD); assertFalse(plot1.equals(plot2)); plot2.setDialShape(DialShape.CHORD); assertTrue(plot1.equals(plot2)); - + // dial background paint - plot1.setDialBackgroundPaint(new GradientPaint(9.0f, 8.0f, Color.red, + plot1.setDialBackgroundPaint(new GradientPaint(9.0f, 8.0f, Color.red, 7.0f, 6.0f, Color.blue)); assertFalse(plot1.equals(plot2)); - plot2.setDialBackgroundPaint(new GradientPaint(9.0f, 8.0f, Color.red, + plot2.setDialBackgroundPaint(new GradientPaint(9.0f, 8.0f, Color.red, 7.0f, 6.0f, Color.blue)); assertTrue(plot1.equals(plot2)); - + // dial outline paint plot1.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.red)); @@ -143,77 +143,77 @@ plot2.setDialOutlinePaint(new GradientPaint(1.0f, 2.0f, Color.green, 3.0f, 4.0f, Color.red)); assertTrue(plot1.equals(plot2)); - + // needle paint - plot1.setNeedlePaint(new GradientPaint(9.0f, 8.0f, Color.red, + plot1.setNeedlePaint(new GradientPaint(9.0f, 8.0f, Color.red, 7.0f, 6.0f, Color.blue)); assertFalse(plot1.equals(plot2)); - plot2.setNeedlePaint(new GradientPaint(9.0f, 8.0f, Color.red, + plot2.setNeedlePaint(new GradientPaint(9.0f, 8.0f, Color.red, 7.0f, 6.0f, Color.blue)); assertTrue(plot1.equals(plot2)); - + // value font plot1.setValueFont(new Font("Serif", Font.PLAIN, 6)); assertFalse(plot1.equals(plot2)); plot2.setValueFont(new Font("Serif", Font.PLAIN, 6)); assertTrue(plot1.equals(plot2)); - + // value paint - plot1.setValuePaint(new GradientPaint(1.0f, 2.0f, Color.black, + plot1.setValuePaint(new GradientPaint(1.0f, 2.0f, Color.black, 3.0f, 4.0f, Color.white)); assertFalse(plot1.equals(plot2)); - plot2.setValuePaint(new GradientPaint(1.0f, 2.0f, Color.black, + plot2.setValuePaint(new GradientPaint(1.0f, 2.0f, Color.black, 3.0f, 4.0f, Color.white)); assertTrue(plot1.equals(plot2)); - + // tick labels visible plot1.setTickLabelsVisible(false); assertFalse(plot1.equals(plot2)); plot2.setTickLabelsVisible(false); assertTrue(plot1.equals(plot2)); - + // tick label font plot1.setTickLabelFont(new Font("Serif", Font.PLAIN, 6)); assertFalse(plot1.equals(plot2)); plot2.setTickLabelFont(new Font("Serif", Font.PLAIN, 6)); assertTrue(plot1.equals(plot2)); - + // tick label paint plot1.setTickLabelPaint(Color.red); assertFalse(plot1.equals(plot2)); plot2.setTickLabelPaint(Color.red); - assertTrue(plot1.equals(plot2)); - + assertTrue(plot1.equals(plot2)); + // tick label format plot1.setTickLabelFormat(new DecimalFormat("0")); assertFalse(plot1.equals(plot2)); plot2.setTickLabelFormat(new DecimalFormat("0")); assertTrue(plot1.equals(plot2)); - + // tick paint plot1.setTickPaint(Color.green); assertFalse(plot1.equals(plot2)); plot2.setTickPaint(Color.green); assertTrue(plot1.equals(plot2)); - + // tick size plot1.setTickSize(1.23); assertFalse(plot1.equals(plot2)); plot2.setTickSize(1.23); - assertTrue(plot1.equals(plot2)); - + assertTrue(plot1.equals(plot2)); + // draw border plot1.setDrawBorder(!plot1.getDrawBorder()); assertFalse(plot1.equals(plot2)); plot2.setDrawBorder(plot1.getDrawBorder()); assertTrue(plot1.equals(plot2)); - + // meter angle plot1.setMeterAngle(22); assertFalse(plot1.equals(plot2)); plot2.setMeterAngle(22); assertTrue(plot1.equals(plot2)); - + } /** @@ -231,24 +231,24 @@ assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); - + // the clone and the original share a reference to the SAME dataset assertTrue(p1.getDataset() == p2.getDataset()); - + // try a few checks to ensure that the clone is independent of the // original p1.getTickLabelFormat().setMinimumIntegerDigits(99); assertFalse(p1.equals(p2)); p2.getTickLabelFormat().setMinimumIntegerDigits(99); assertTrue(p1.equals(p2)); - + p1.addInterval(new MeterInterval("Test", new Range(1.234, 5.678))); assertFalse(p1.equals(p2)); p2.addInterval(new MeterInterval("Test", new Range(1.234, 5.678))); assertTrue(p1.equals(p2)); - + } - + /** * Serialize an instance, restore it, and check for equality. */ @@ -305,5 +305,5 @@ assertEquals(p1, p2); } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------- * MyPlotChangeListener.java * ------------------------- - * (C) Copyright 2005, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2005-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -35,7 +35,7 @@ * Changes * ------- * 21-Mar-2005 : Version 1 (DG); - * + * */ package org.jfree.chart.plot.junit; @@ -47,41 +47,41 @@ * A utility class for testing plot events. */ public class MyPlotChangeListener implements PlotChangeListener { - + private PlotChangeEvent event; - + /** * Creates a new instance. */ public MyPlotChangeListener() { this.event = null; } - + /** * Returns the last event received by the listener. - * + * * @return The event. */ public PlotChangeEvent getEvent() { - return this.event; + return this.event; } - + /** * Sets the event for the listener. - * + * * @param e the event. */ public void setEvent(PlotChangeEvent e) { - this.event = e; + this.event = e; } - + /** * Receives notification of a plot change event. - * + * * @param e the event. */ public void plotChanged(PlotChangeEvent e) { this.event = e; } - + } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2008-09-04 20:03:44 UTC (rev 1517) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2008-09-04 20:04:38 UTC (rev 1518) @@ -2,32 +2,32 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-20... [truncated message content] |
From: <mu...@us...> - 2009-07-13 12:38:16
|
Revision: 2208 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2208&view=rev Author: mungady Date: 2009-07-13 12:38:15 +0000 (Mon, 13 Jul 2009) Log Message: ----------- 2009-07-13 David Gilbert <dav...@ob...> * source/org/jfree:chart:plot:CategoryPlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (integerise): New private method, (draw): Apply drop shadow, (equals): Check new field, * source/org/jfree/chart/plot/PiePlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (draw): Apply drop shadow, (drawItem): Skip vector shadow if drop shadow is applied, (drawSimpleLabels): Likewise, (drawLeftLabels): Likewise, (drawRightLabels): Likewise, (equals): Updated for new field, * source/org/jfree/chart/plot/PiePlot3D.java (draw): Apply drop shadow, * source/org/jfree/chart/plot/RingPlot.java (drawItem): Skip vector shadow if drop shadow is applied, * source/org/jfree/chart/plot/XYPlot.java (shadowGenerator): New field, (getShadowGenerator): New method, (setShadowGenerator): Likewise, (integerise): New private method, (draw): Apply drop shadow, (equals): Check new field, * source/org/jfree/chart/util/DefaultShadowGenerator.java: New class, * source/org/jfree/chart/util/ShadowGenerator.java: New class. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2009-07-13 12:37:37 UTC (rev 2207) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2009-07-13 12:38:15 UTC (rev 2208) @@ -45,6 +45,7 @@ * testCloning2() and testCloning3() (DG); * 26-Jun-2008 : Updated testEquals() (DG); * 21-Jan-2009 : Updated testEquals() for new fields (DG); + * 10-Jul-2009 : Updated testEquals() for new field (DG); * */ @@ -95,6 +96,7 @@ import org.jfree.chart.renderer.category.CategoryItemRenderer; import org.jfree.chart.renderer.category.DefaultCategoryItemRenderer; import org.jfree.chart.renderer.category.LineAndShapeRenderer; +import org.jfree.chart.util.DefaultShadowGenerator; import org.jfree.data.Range; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; @@ -491,6 +493,18 @@ plot2.setRangeZeroBaselineStroke(new BasicStroke(1.23f)); assertTrue(plot1.equals(plot2)); + // shadowGenerator + plot1.setShadowGenerator(new DefaultShadowGenerator(5, Color.gray, + 0.6f, 4, -Math.PI / 4)); + assertFalse(plot1.equals(plot2)); + plot2.setShadowGenerator(new DefaultShadowGenerator(5, Color.gray, + 0.6f, 4, -Math.PI / 4)); + assertTrue(plot1.equals(plot2)); + + plot1.setShadowGenerator(null); + assertFalse(plot1.equals(plot2)); + plot2.setShadowGenerator(null); + assertTrue(plot1.equals(plot2)); } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2009-07-13 12:37:37 UTC (rev 2207) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2009-07-13 12:38:15 UTC (rev 2208) @@ -92,6 +92,7 @@ import org.jfree.chart.renderer.xy.XYBarRenderer; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; +import org.jfree.chart.util.DefaultShadowGenerator; import org.jfree.data.time.Day; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; @@ -436,6 +437,19 @@ assertFalse(plot1.equals(plot2)); plot2.mapDatasetToRangeAxes(0, axisIndices); assertTrue(plot1.equals(plot2)); + + // shadowGenerator + plot1.setShadowGenerator(new DefaultShadowGenerator(5, Color.gray, + 0.6f, 4, -Math.PI / 4)); + assertFalse(plot1.equals(plot2)); + plot2.setShadowGenerator(new DefaultShadowGenerator(5, Color.gray, + 0.6f, 4, -Math.PI / 4)); + assertTrue(plot1.equals(plot2)); + + plot1.setShadowGenerator(null); + assertFalse(plot1.equals(plot2)); + plot2.setShadowGenerator(null); + assertTrue(plot1.equals(plot2)); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-30 21:12:56
|
Revision: 2402 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2402&view=rev Author: mungady Date: 2011-10-30 21:12:48 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Update headers for Oracle trademarks. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryMarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotPackageTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryMarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryMarkerTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryMarkerTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------ * CategoryMarkerTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CategoryPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * CategoryPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * ColorPaletteTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------------ * CombinedDomainCategoryPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------ * CombinedDomainXYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------------ * CombinedRangeCategoryPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------------- * CombinedRangeXYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * CompassPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * ContourPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * CrosshairTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------------------- * DefaultDrawingSupplierTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * FastScatterPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------ * IntervalMarkerTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MarkerTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MarkerTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * MarkerTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * MeterIntervalTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * MeterPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * MultiplePiePlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MyPlotChangeListener.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * MyPlotChangeListener.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------ * PieLabelRecordTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * Pie3DPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * PiePlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * PlotOrientationTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotPackageTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotPackageTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotPackageTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * PlotPackageTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * PlotRenderingInfoTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------- * PlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * PolarPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------ * RingPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * SpiderWebPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------- * ThermometerPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * ValueMarkerTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2011-10-30 21:07:41 UTC (rev 2401) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2011-10-30 21:12:48 UTC (rev 2402) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * XYPlotTests.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-08-02 05:06:52
|
Revision: 2796 http://sourceforge.net/p/jfreechart/code/2796 Author: mungady Date: 2013-08-02 05:06:49 +0000 (Fri, 02 Aug 2013) Log Message: ----------- Remove System.err.println. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ColorPaletteTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -27,7 +27,7 @@ * ---------------------- * ColorPaletteTests.java * ---------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2003-2013, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -73,15 +73,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { ColorPalette p1 = new GreyPalette(); - ColorPalette p2 = null; - try { - p2 = (ColorPalette) p1.clone(); - } - catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); - } + ColorPalette p2 = (ColorPalette) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainCategoryPlotTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -46,6 +46,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -133,15 +134,10 @@ /** * Some checks for cloning. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { CombinedDomainCategoryPlot plot1 = createPlot(); - CombinedDomainCategoryPlot plot2 = null; - try { - plot2 = (CombinedDomainCategoryPlot) plot1.clone(); - } - catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); - } + CombinedDomainCategoryPlot plot2 = (CombinedDomainCategoryPlot) + plot1.clone(); assertTrue(plot1 != plot2); assertTrue(plot1.getClass() == plot2.getClass()); assertTrue(plot1.equals(plot2)); @@ -150,22 +146,17 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { CombinedDomainCategoryPlot plot1 = createPlot(); - CombinedDomainCategoryPlot plot2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(plot1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - plot2 = (CombinedDomainCategoryPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + CombinedDomainCategoryPlot plot2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(plot1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + plot2 = (CombinedDomainCategoryPlot) in.readObject(); + in.close(); assertEquals(plot1, plot2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeCategoryPlotTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -46,6 +46,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -117,15 +118,10 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { CombinedRangeCategoryPlot plot1 = createPlot(); - CombinedRangeCategoryPlot plot2 = null; - try { - plot2 = (CombinedRangeCategoryPlot) plot1.clone(); - } - catch (CloneNotSupportedException e) { - System.err.println("Failed to clone."); - } + CombinedRangeCategoryPlot plot2 = (CombinedRangeCategoryPlot) + plot1.clone(); assertTrue(plot1 != plot2); assertTrue(plot1.getClass() == plot2.getClass()); assertTrue(plot1.equals(plot2)); @@ -134,24 +130,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { CombinedRangeCategoryPlot plot1 = createPlot(); - CombinedRangeCategoryPlot plot2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(plot1); - out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - plot2 = (CombinedRangeCategoryPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + CombinedRangeCategoryPlot plot2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(plot1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + plot2 = (CombinedRangeCategoryPlot) in.readObject(); + in.close(); assertEquals(plot1, plot2); - } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ContourPlotTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -79,28 +80,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { ContourPlot p1 = new ContourPlot(null, null, null, null); - ContourPlot p2 = null; + ContourPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - p2 = (ContourPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (ContourPlot) in.readObject(); + in.close(); assertEquals(p1, p2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/DefaultDrawingSupplierTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -48,6 +48,7 @@ import java.awt.geom.Rectangle2D; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -191,16 +192,9 @@ /** * Some basic checks for the clone() method. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { DefaultDrawingSupplier r1 = new DefaultDrawingSupplier(); - DefaultDrawingSupplier r2 = null; - try { - r2 = (DefaultDrawingSupplier) r1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - System.err.println("Failed to clone."); - } + DefaultDrawingSupplier r2 = (DefaultDrawingSupplier) r1.clone(); assertTrue(r1 != r2); assertTrue(r1.getClass() == r2.getClass()); assertTrue(r1.equals(r2)); @@ -209,28 +203,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { DefaultDrawingSupplier r1 = new DefaultDrawingSupplier(); - DefaultDrawingSupplier r2 = null; + DefaultDrawingSupplier r2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(r1); + out.close(); - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(r1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - r2 = (DefaultDrawingSupplier) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + r2 = (DefaultDrawingSupplier) in.readObject(); + in.close(); assertEquals(r1, r2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterIntervalTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -44,6 +44,7 @@ import java.awt.Color; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -119,28 +120,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { MeterInterval m1 = new MeterInterval("X", new Range(1.0, 2.0)); - MeterInterval m2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - m2 = (MeterInterval) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + MeterInterval m2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(m1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + m2 = (MeterInterval) in.readObject(); + in.close(); boolean b = m1.equals(m2); assertTrue(b); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotOrientationTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -94,26 +95,17 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { PlotOrientation orientation1 = PlotOrientation.HORIZONTAL; - PlotOrientation orientation2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(orientation1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - orientation2 = (PlotOrientation) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + PlotOrientation orientation2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(orientation1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + orientation2 = (PlotOrientation) in.readObject(); + in.close(); assertEquals(orientation1, orientation2); boolean same = orientation1 == orientation2; assertEquals(true, same); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -44,6 +44,7 @@ import java.awt.geom.Rectangle2D; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -141,28 +142,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { PlotRenderingInfo p1 = new PlotRenderingInfo(new ChartRenderingInfo()); - PlotRenderingInfo p2 = null; + PlotRenderingInfo p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - p2 = (PlotRenderingInfo) in.readObject(); - in.close(); - } - catch (Exception e) { - System.out.println(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (PlotRenderingInfo) in.readObject(); + in.close(); assertEquals(p1, p2); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -55,6 +55,7 @@ import java.awt.geom.Rectangle2D; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -245,7 +246,7 @@ /** * Some basic checks for the clone() method. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { PolarPlot p1 = new PolarPlot(); PolarPlot p2 = null; try { @@ -266,14 +267,7 @@ p1 = new PolarPlot(new DefaultXYDataset(), new NumberAxis("A1"), new DefaultPolarItemRenderer()); - p2 = null; - try { - p2 = (PolarPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - System.err.println("Failed to clone."); - } + p2 = (PolarPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -283,13 +277,12 @@ assertFalse(p1.equals(p2)); p2.getAxis().setLabel("ABC"); assertTrue(p1.equals(p2)); - } /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { PolarPlot p1 = new PolarPlot(); p1.setAngleGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, @@ -298,24 +291,17 @@ 4.0f, Color.blue)); p1.setRadiusGridlinePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); - PolarPlot p2 = null; + PolarPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (PolarPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ObjectInput in = new ObjectInputStream( + new ByteArrayInputStream(buffer.toByteArray())); + p2 = (PolarPlot) in.readObject(); + in.close(); assertEquals(p1, p2); - } public void testTranslateToJava2D_NumberAxis() { Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2013-08-02 04:56:21 UTC (rev 2795) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2013-08-02 05:06:49 UTC (rev 2796) @@ -481,7 +481,7 @@ /** * Tests cloning for a more complex plot. */ - public void testCloning2() { + public void testCloning2() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(null, new NumberAxis("Domain Axis"), new NumberAxis("Range Axis"), new StandardXYItemRenderer()); p1.setRangeAxis(1, new NumberAxis("Range Axis 2")); @@ -490,13 +490,7 @@ p1.mapDatasetToDomainAxes(0, axisIndices); p1.mapDatasetToRangeAxes(0, axisIndices); p1.setRenderer(1, new XYBarRenderer()); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -506,18 +500,12 @@ * Tests cloning for a plot where the fixed legend items have been * specified. */ - public void testCloning3() { + public void testCloning3() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(null, new NumberAxis("Domain Axis"), new NumberAxis("Range Axis"), new StandardXYItemRenderer()); LegendItemCollection c1 = new LegendItemCollection(); p1.setFixedLegendItems(c1); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -531,17 +519,11 @@ * Tests cloning to ensure that the cloned plot is registered as a listener * on the cloned renderer. */ - public void testCloning4() { + public void testCloning4() throws CloneNotSupportedException { XYLineAndShapeRenderer r1 = new XYLineAndShapeRenderer(); XYPlot p1 = new XYPlot(null, new NumberAxis("Domain Axis"), new NumberAxis("Range Axis"), r1); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -554,17 +536,11 @@ /** * Confirm that cloning captures the quadrantOrigin field. */ - public void testCloning_QuadrantOrigin() { + public void testCloning_QuadrantOrigin() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(); Point2D p = new Point2D.Double(1.2, 3.4); p1.setQuadrantOrigin(p); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -574,17 +550,11 @@ /** * Confirm that cloning captures the quadrantOrigin field. */ - public void testCloning_QuadrantPaint() { + public void testCloning_QuadrantPaint() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(); p1.setQuadrantPaint(3, new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -600,17 +570,11 @@ * Renderers that belong to the plot are being cloned but they are * retaining a reference to the original plot. */ - public void testBug2817504() { + public void testBug2817504() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(); XYLineAndShapeRenderer r1 = new XYLineAndShapeRenderer(); p1.setRenderer(r1); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -623,7 +587,7 @@ /** * Tests the independence of the clones. */ - public void testCloneIndependence() { + public void testCloneIndependence() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(null, new NumberAxis("Domain Axis"), new NumberAxis("Range Axis"), new StandardXYItemRenderer()); p1.setDomainAxis(1, new NumberAxis("Domain Axis 2")); @@ -631,14 +595,7 @@ p1.setRangeAxis(1, new NumberAxis("Range Axis 2")); p1.setRangeAxisLocation(1, AxisLocation.TOP_OR_RIGHT); p1.setRenderer(1, new XYBarRenderer()); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - System.err.println("Failed to clone."); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1.equals(p2)); p1.getDomainAxis().setLabel("Label"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-08-02 08:32:40
|
Revision: 2817 http://sourceforge.net/p/jfreechart/code/2817 Author: mungady Date: 2013-08-02 08:32:35 +0000 (Fri, 02 Aug 2013) Log Message: ----------- Remove printStackTrace(). Modified Paths: -------------- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedDomainXYPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -47,6 +47,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -144,15 +145,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { CombinedDomainXYPlot plot1 = createPlot(); - CombinedDomainXYPlot plot2 = null; - try { - plot2 = (CombinedDomainXYPlot) plot1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + CombinedDomainXYPlot plot2 = (CombinedDomainXYPlot) plot1.clone(); assertTrue(plot1 != plot2); assertTrue(plot1.getClass() == plot2.getClass()); assertTrue(plot1.equals(plot2)); @@ -161,23 +156,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { CombinedDomainXYPlot plot1 = createPlot(); - CombinedDomainXYPlot plot2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(plot1); - out.close(); + CombinedDomainXYPlot plot2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(plot1); + out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - plot2 = (CombinedDomainXYPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + plot2 = (CombinedDomainXYPlot) in.readObject(); + in.close(); assertEquals(plot1, plot2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CombinedRangeXYPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -47,6 +47,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -136,15 +137,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { CombinedRangeXYPlot plot1 = createPlot(); - CombinedRangeXYPlot plot2 = null; - try { - plot2 = (CombinedRangeXYPlot) plot1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + CombinedRangeXYPlot plot2 = (CombinedRangeXYPlot) plot1.clone(); assertTrue(plot1 != plot2); assertTrue(plot1.getClass() == plot2.getClass()); assertTrue(plot1.equals(plot2)); @@ -153,23 +148,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { CombinedRangeXYPlot plot1 = createPlot(); - CombinedRangeXYPlot plot2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(plot1); - out.close(); + CombinedRangeXYPlot plot2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(plot1); + out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - plot2 = (CombinedRangeXYPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + plot2 = (CombinedRangeXYPlot) in.readObject(); + in.close(); assertEquals(plot1, plot2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CompassPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -46,6 +46,7 @@ import java.awt.GradientPaint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -135,8 +136,7 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { CompassPlot p1 = new CompassPlot(null); p1.setRosePaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); @@ -144,38 +144,25 @@ 1.0f, Color.green)); p1.setRoseHighlightPaint(new GradientPaint(4.0f, 3.0f, Color.red, 2.0f, 1.0f, Color.green)); - CompassPlot p2 = null; + CompassPlot p2; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (CompassPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (CompassPlot) in.readObject(); + in.close(); assertEquals(p1, p2); - } /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { CompassPlot p1 = new CompassPlot(new DefaultValueDataset(15.0)); - CompassPlot p2 = null; - try { - p2 = (CompassPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + CompassPlot p2 = (CompassPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/CrosshairTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -47,6 +47,7 @@ import java.awt.GradientPaint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -185,16 +186,10 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { Crosshair c1 = new Crosshair(1.0, new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.BLUE), new BasicStroke(1.0f)); - Crosshair c2 = null; - try { - c2 = (Crosshair) c1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + Crosshair c2 = (Crosshair) c1.clone(); assertTrue(c1 != c2); assertTrue(c1.getClass() == c2.getClass()); assertTrue(c1.equals(c2)); @@ -211,24 +206,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { Crosshair c1 = new Crosshair(1.0, new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.BLUE), new BasicStroke(1.0f)); - Crosshair c2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(c1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - c2 = (Crosshair) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + Crosshair c2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(c1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + c2 = (Crosshair) in.readObject(); + in.close(); assertEquals(c1, c2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/FastScatterPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -48,6 +48,7 @@ import java.awt.Stroke; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -195,15 +196,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { FastScatterPlot p1 = new FastScatterPlot(); - FastScatterPlot p2 = null; - try { - p2 = (FastScatterPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + FastScatterPlot p2 = (FastScatterPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -212,27 +207,20 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { float[][] data = createData(); ValueAxis domainAxis = new NumberAxis("X"); ValueAxis rangeAxis = new NumberAxis("Y"); FastScatterPlot p1 = new FastScatterPlot(data, domainAxis, rangeAxis); - FastScatterPlot p2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - p2 = (FastScatterPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + FastScatterPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (FastScatterPlot) in.readObject(); + in.close(); assertEquals(p1, p2); } @@ -241,7 +229,6 @@ * no exceptions are thrown. */ public void testDrawWithNullInfo() { - boolean success = false; try { float[][] data = createData(); @@ -252,13 +239,10 @@ JFreeChart chart = new JFreeChart(plot); /* BufferedImage image = */ chart.createBufferedImage(300, 200, null); - success = true; } catch (NullPointerException e) { - e.printStackTrace(); - success = false; + fail("No exception should be thrown."); } - assertTrue(success); } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/IntervalMarkerTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -43,6 +43,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -127,15 +128,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { IntervalMarker m1 = new IntervalMarker(45.0, 50.0); - IntervalMarker m2 = null; - try { - m2 = (IntervalMarker) m1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + IntervalMarker m2 = (IntervalMarker) m1.clone(); assertTrue(m1 != m2); assertTrue(m1.getClass() == m2.getClass()); assertTrue(m1.equals(m2)); @@ -144,27 +139,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { IntervalMarker m1 = new IntervalMarker(45.0, 50.0); - IntervalMarker m2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - m2 = (IntervalMarker) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + IntervalMarker m2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(m1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + m2 = (IntervalMarker) in.readObject(); + in.close(); boolean b = m1.equals(m2); assertTrue(b); - } private static final double EPSILON = 0.0000000001; Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MeterPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -48,6 +48,7 @@ import java.awt.GradientPaint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -219,15 +220,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { MeterPlot p1 = new MeterPlot(); - MeterPlot p2 = null; - try { - p2 = (MeterPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + MeterPlot p2 = (MeterPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -252,7 +247,7 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization1() { + public void testSerialization1() throws IOException, ClassNotFoundException { MeterPlot p1 = new MeterPlot(null); p1.setDialBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); @@ -264,44 +259,32 @@ 3.0f, 4.0f, Color.blue)); p1.setTickPaint(new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); - MeterPlot p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (MeterPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + MeterPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (MeterPlot) in.readObject(); + in.close(); assertEquals(p1, p2); } /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization2() { + public void testSerialization2() throws IOException, ClassNotFoundException { MeterPlot p1 = new MeterPlot(new DefaultValueDataset(1.23)); - MeterPlot p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (MeterPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + MeterPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (MeterPlot) in.readObject(); + in.close(); assertEquals(p1, p2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/MultiplePiePlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -50,6 +50,7 @@ import java.awt.geom.Rectangle2D; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -167,17 +168,11 @@ /** * Some basic checks for the clone() method. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { MultiplePiePlot p1 = new MultiplePiePlot(); Rectangle2D rect = new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0); p1.setLegendItemShape(rect); - MultiplePiePlot p2 = null; - try { - p2 = (MultiplePiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + MultiplePiePlot p2 = (MultiplePiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -190,25 +185,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { MultiplePiePlot p1 = new MultiplePiePlot(null); p1.setAggregatedItemsPaint(new GradientPaint(1.0f, 2.0f, Color.yellow, 3.0f, 4.0f, Color.red)); - MultiplePiePlot p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - p2 = (MultiplePiePlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + MultiplePiePlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (MultiplePiePlot) in.readObject(); + in.close(); assertEquals(p1, p2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PieLabelRecordTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -42,6 +42,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -138,27 +139,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { PieLabelRecord p1 = new PieLabelRecord("A", 1.0, 2.0, new TextBox("B"), 3.0, 4.0, 5.0); - PieLabelRecord p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (PieLabelRecord) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + PieLabelRecord p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (PieLabelRecord) in.readObject(); + in.close(); boolean b = p1.equals(p2); assertTrue(b); - } } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlot3DTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -48,6 +48,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -107,27 +108,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { PiePlot3D p1 = new PiePlot3D(null); - PiePlot3D p2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (PiePlot3D) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + PiePlot3D p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (PiePlot3D) in.readObject(); + in.close(); assertEquals(p1, p2); - } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PiePlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -57,6 +57,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -455,15 +456,9 @@ /** * Some basic checks for the clone() method. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { PiePlot p1 = new PiePlot(); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -472,17 +467,11 @@ /** * Check cloning of the urlGenerator field. */ - public void testCloning_URLGenerator() { + public void testCloning_URLGenerator() throws CloneNotSupportedException { CustomPieURLGenerator generator = new CustomPieURLGenerator(); PiePlot p1 = new PiePlot(); p1.setURLGenerator(generator); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -494,17 +483,11 @@ /** * Check cloning of the legendItemShape field. */ - public void testCloning_LegendItemShape() { + public void testCloning_LegendItemShape() throws CloneNotSupportedException { Rectangle shape = new Rectangle(-4, -4, 8, 8); PiePlot p1 = new PiePlot(); p1.setLegendItemShape(shape); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -517,18 +500,12 @@ /** * Check cloning of the legendLabelGenerator field. */ - public void testCloning_LegendLabelGenerator() { + public void testCloning_LegendLabelGenerator() throws CloneNotSupportedException { StandardPieSectionLabelGenerator generator = new StandardPieSectionLabelGenerator(); PiePlot p1 = new PiePlot(); p1.setLegendLabelGenerator(generator); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -541,18 +518,12 @@ /** * Check cloning of the legendLabelToolTipGenerator field. */ - public void testCloning_LegendLabelToolTipGenerator() { + public void testCloning_LegendLabelToolTipGenerator() throws CloneNotSupportedException { StandardPieSectionLabelGenerator generator = new StandardPieSectionLabelGenerator(); PiePlot p1 = new PiePlot(); p1.setLegendLabelToolTipGenerator(generator); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -565,17 +536,11 @@ /** * Check cloning of the legendLabelURLGenerator field. */ - public void testCloning_LegendLabelURLGenerator() { + public void testCloning_LegendLabelURLGenerator() throws CloneNotSupportedException { CustomPieURLGenerator generator = new CustomPieURLGenerator(); PiePlot p1 = new PiePlot(); p1.setLegendLabelURLGenerator(generator); - PiePlot p2 = null; - try { - p2 = (PiePlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PiePlot p2 = (PiePlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -588,23 +553,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { + public void testSerialization() throws IOException, ClassNotFoundException { PiePlot p1 = new PiePlot(null); - PiePlot p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); + PiePlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - p2 = (PiePlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (PiePlot) in.readObject(); + in.close(); assertEquals(p1, p2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PlotRenderingInfoTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -113,16 +113,10 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { PlotRenderingInfo p1 = new PlotRenderingInfo(new ChartRenderingInfo()); p1.setPlotArea(new Rectangle2D.Double()); - PlotRenderingInfo p2 = null; - try { - p2 = (PlotRenderingInfo) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PlotRenderingInfo p2 = (PlotRenderingInfo) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/PolarPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -248,13 +248,7 @@ */ public void testCloning() throws CloneNotSupportedException { PolarPlot p1 = new PolarPlot(); - PolarPlot p2 = null; - try { - p2 = (PolarPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + PolarPlot p2 = (PolarPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/RingPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -47,6 +47,7 @@ import java.awt.Stroke; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -135,18 +136,12 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { RingPlot p1 = new RingPlot(null); GradientPaint gp = new GradientPaint(1.0f, 2.0f, Color.yellow, 3.0f, 4.0f, Color.red); p1.setSeparatorPaint(gp); - RingPlot p2 = null; - try { - p2 = (RingPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + RingPlot p2 = (RingPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -155,27 +150,21 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { RingPlot p1 = new RingPlot(null); GradientPaint gp = new GradientPaint(1.0f, 2.0f, Color.yellow, 3.0f, 4.0f, Color.red); p1.setSeparatorPaint(gp); - RingPlot p2 = null; - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); + RingPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (RingPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (RingPlot) in.readObject(); + in.close(); assertEquals(p1, p2); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/SpiderWebPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -54,6 +54,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -278,17 +279,11 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { SpiderWebPlot p1 = new SpiderWebPlot(new DefaultCategoryDataset()); Rectangle2D legendShape = new Rectangle2D.Double(1.0, 2.0, 3.0, 4.0); p1.setLegendItemShape(legendShape); - SpiderWebPlot p2 = null; - try { - p2 = (SpiderWebPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + SpiderWebPlot p2 = (SpiderWebPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -322,27 +317,18 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { SpiderWebPlot p1 = new SpiderWebPlot(new DefaultCategoryDataset()); - SpiderWebPlot p2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (SpiderWebPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + SpiderWebPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (SpiderWebPlot) in.readObject(); + in.close(); assertEquals(p1, p2); - } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -49,6 +49,7 @@ import java.awt.GradientPaint; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -198,15 +199,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { ThermometerPlot p1 = new ThermometerPlot(); - ThermometerPlot p2 = null; - try { - p2 = (ThermometerPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + ThermometerPlot p2 = (ThermometerPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -215,52 +210,36 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { ThermometerPlot p1 = new ThermometerPlot(); - ThermometerPlot p2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (ThermometerPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ThermometerPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (ThermometerPlot) in.readObject(); + in.close(); assertTrue(p1.equals(p2)); - } /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization2() { + public void testSerialization2() throws IOException, ClassNotFoundException { ThermometerPlot p1 = new ThermometerPlot(); p1.setSubrangePaint(1, new GradientPaint(1.0f, 2.0f, Color.red, 3.0f, 4.0f, Color.blue)); - ThermometerPlot p2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(p1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - p2 = (ThermometerPlot) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ThermometerPlot p2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(p1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + p2 = (ThermometerPlot) in.readObject(); + in.close(); assertTrue(p1.equals(p2)); } Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/ValueMarkerTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -52,6 +52,7 @@ import java.awt.Stroke; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -186,15 +187,9 @@ /** * Confirm that cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { ValueMarker m1 = new ValueMarker(25.0); - ValueMarker m2 = null; - try { - m2 = (ValueMarker) m1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + ValueMarker m2 = (ValueMarker) m1.clone(); assertTrue(m1 != m2); assertTrue(m1.getClass() == m2.getClass()); assertTrue(m1.equals(m2)); @@ -203,28 +198,19 @@ /** * Serialize an instance, restore it, and check for equality. */ - public void testSerialization() { - + public void testSerialization() throws IOException, ClassNotFoundException { ValueMarker m1 = new ValueMarker(25.0); - ValueMarker m2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - m2 = (ValueMarker) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ValueMarker m2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(m1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + m2 = (ValueMarker) in.readObject(); + in.close(); boolean b = m1.equals(m2); assertTrue(b); - } private static final double EPSILON = 0.000000001; @@ -254,37 +240,26 @@ /** * A test for bug 1802195. */ - public void test1802195() { - + public void test1802195() throws IOException, ClassNotFoundException { ValueMarker m1 = new ValueMarker(25.0); - ValueMarker m2 = null; - - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(m1); - out.close(); - - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray())); - m2 = (ValueMarker) in.readObject(); - in.close(); - } - catch (Exception e) { - e.printStackTrace(); - } + ValueMarker m2; + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(m1); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + m2 = (ValueMarker) in.readObject(); + in.close(); boolean b = m1.equals(m2); assertTrue(b); - boolean pass = true; try { m2.setValue(-10.0); } catch (NullPointerException e) { - pass = false; + fail("No exception should be thrown."); } - assertTrue(pass); - } /** Modified: branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java =================================================================== --- branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2013-08-02 08:08:57 UTC (rev 2816) +++ branches/jfreechart-1.0.x-branch/tests/org/jfree/chart/plot/junit/XYPlotTests.java 2013-08-02 08:32:35 UTC (rev 2817) @@ -61,6 +61,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectInputStream; import java.io.ObjectOutput; @@ -464,15 +465,9 @@ /** * Confirm that basic cloning works. */ - public void testCloning() { + public void testCloning() throws CloneNotSupportedException { XYPlot p1 = new XYPlot(); - XYPlot p2 = null; - try { - p2 = (XYPlot) p1.clone(); - } - catch (CloneNotSupportedException e) { - e.printStackTrace(); - } + XYPlot p2 = (XYPlot) p1.clone(); assertTrue(p1 != p2); assertTrue(p1.getClass() == p2.getClass()); assertTrue(p1.equals(p2)); @@ -738,7 +733,7 @@ * method following deserialization. This test has been written to * reproduce the bug (now fixed). */ - public void testSerialization3() { + public void testSerialization3() throws IOException, ClassNotFoundException { XYSeriesCollection dataset = new XYSeriesCollection(); JFreeChart chart = ChartFactory.createXYLineChart( @@ -751,42 +746,32 @@ true, false ); - JFreeChart chart2 = null; + JFreeChart chart2; // serialize and deserialize the chart.... - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(chart); - out.close(); + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(chart); + out.close(); + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + chart2 = (JFreeChart) in.readObject(); + in.close(); - ObjectInput in = new ObjectInputStream( - new ByteArrayInputStream(buffer.toByteArray()) - ); - chart2 = (JFreeChart) in.readObject(); - in.close(); - } - catch (Exception e) { - fail(e.toString()); - } - assertEquals(chart, chart2); - boolean passed = true; try { chart2.createBufferedImage(300, 200); } catch (Exception e) { - passed = false; - e.printStackTrace(); + fail("No exception should be thrown."); } - assertTrue(passed); } /** * A test to reproduce a bug in serialization: the domain and/or range * markers for a plot are not being serialized. */ - public void testSerialization4() { + public void testSerialization4() throws IOException, ClassNotFoundException { XYSeriesCollection dataset = new XYSeriesCollection(); JFreeChart chart = ChartFactory.createXYLineChart( @@ -804,34 +789,26 @@ plot.addDomainMarker(new IntervalMarker(2.0, 3.0), Layer.BACKGROUND); plot.addRangeMarker(new ValueMarker(4.0), Layer.FOREGROUND); plot.addRangeMarker(new IntervalMarker(5.0, 6.0), Layer.BACKGROUND); - JFreeChart chart2 = null; + JFreeChart chart2; // serialize and deserialize the chart.... - try { - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutput out = new ObjectOutputStream(buffer); - out.writeObject(chart); - out.close(); + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(chart); + out.close(); - ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( - buffer.toByteArray())); - chart2 = (JFreeChart) in.readObject(); - in.close(); - } - catch (Exception e) { - fail(e.toString()); - } + ObjectInput in = new ObjectInputStream(new ByteArrayInputStream( + buffer.toByteArray())); + chart2 = (JFreeChart) in.readObject(); + in.close(); assertEquals(chart, chart2); - boolean passed = true; try { chart2.createBufferedImage(300, 200); } catch (Exception e) { - passed = false; - e.printStackTrace(); + fail("No exception should be thrown."); } - assertTrue(passed); } /** @@ -1055,20 +1032,16 @@ dataset, PlotOrientation.VERTICAL, true, false, false); XYPlot plot = (XYPlot) chart.getPlot(); plot.setRenderer(1, new XYLineAndShapeRenderer()); - boolean success = false; try { BufferedImage image = new BufferedImage(200 , 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null, null); g2.dispose(); - success = true; } catch (Exception e) { - e.printStackTrace(); - success = false; + fail("No exception should be thrown."); } - assertTrue(success); } /** @@ -1081,20 +1054,16 @@ dataset, PlotOrientation.VERTICAL, true, false, false); XYPlot plot = (XYPlot) chart.getPlot(); plot.setRenderer(null); - boolean success = false; try { BufferedImage image = new BufferedImage(200 , 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null, null); g2.dispose(); - success = true; } catch (Exception e) { - e.printStackTrace(); - success = false; + fail("No exception should be thrown."); } - assertTrue(success); } /** @@ -1107,20 +1076,16 @@ dataset.addSeries("Series 2", new double[][] {{}, {}}); JFreeChart chart = ChartFactory.createXYLineChart("Title", "X", "Y", dataset, PlotOrientation.VERTICAL, true, false, false); - boolean success = false; try { BufferedImage image = new BufferedImage(200 , 100, BufferedImage.TYPE_INT_RGB); Graphics2D g2 = image.createGraphics(); chart.draw(g2, new Rectangle2D.Double(0, 0, 200, 100), null, null); g2.dispose(); - success = true; } catch (Exception e) { - e.printStackTrace(); - success = false; + fail("No exception should be thrown."); } - assertTrue(success); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |