From: David G. <mu...@us...> - 2006-06-21 14:12:10
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/xy/junit In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15448/source/org/jfree/chart/renderer/xy/junit Modified Files: Tag: STABLE_1-0-0 XYBarRendererTests.java Log Message: 2006-06-21 David Gilbert <dav...@ob...> * source/org/jfree/chart/renderer/xy/XYBarRenderer.java (positiveItemLabelPositionFallback): New field, (negativeItemLabelPositionFallback): Likewise, (getPositiveItemLabelPositionFallback): New method, (setPositiveItemLabelPositionFallback): Likewise, (getNegativeItemLabelPositionFallback): Likewise, (setNegativeItemLabelPositionFallback): Likewise, (drawItem): Call new drawItemLabel() method, (drawItemLabel): New method, (calculateLabelAnchorPoint): New method, (isInternalAnchor): New method, (equals): Updated for new fields, * source/org/jfree/chart/renderer/xy/junit/XYBarRendererTests.java (testEquals): Extended to cover new fields, (testSerialization2): New test. Index: XYBarRendererTests.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/xy/junit/XYBarRendererTests.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** XYBarRendererTests.java 25 Oct 2005 20:56:44 -0000 1.6.2.1 --- XYBarRendererTests.java 21 Jun 2006 14:12:03 -0000 1.6.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * XYBarRendererTests.java * ----------------------- ! * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); --- 28,32 ---- * XYBarRendererTests.java * ----------------------- ! * (C) Copyright 2003-2006, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); *************** *** 59,62 **** --- 59,63 ---- import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.NumberAxis; + import org.jfree.chart.labels.ItemLabelPosition; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.plot.XYPlot; *************** *** 94,97 **** --- 95,99 ---- */ public void testEquals() { + // default instances XYBarRenderer r1 = new XYBarRenderer(); *************** *** 125,139 **** // setGradientPaintTransformer() ! r1.setGradientPaintTransformer( ! new StandardGradientPaintTransformer( ! GradientPaintTransformType.CENTER_HORIZONTAL ! ) ! ); assertFalse(r1.equals(r2)); ! r2.setGradientPaintTransformer( ! new StandardGradientPaintTransformer( ! GradientPaintTransformType.CENTER_HORIZONTAL ! ) ! ); assertTrue(r1.equals(r2)); --- 127,135 ---- // setGradientPaintTransformer() ! r1.setGradientPaintTransformer(new StandardGradientPaintTransformer( ! GradientPaintTransformType.CENTER_HORIZONTAL)); assertFalse(r1.equals(r2)); ! r2.setGradientPaintTransformer(new StandardGradientPaintTransformer( ! GradientPaintTransformType.CENTER_HORIZONTAL)); assertTrue(r1.equals(r2)); *************** *** 144,148 **** assertTrue(r1.equals(r2)); ! } --- 140,154 ---- assertTrue(r1.equals(r2)); ! // positiveItemLabelFallbackPosition ! r1.setPositiveItemLabelPositionFallback(new ItemLabelPosition()); ! assertFalse(r1.equals(r2)); ! r2.setPositiveItemLabelPositionFallback(new ItemLabelPosition()); ! assertTrue(r1.equals(r2)); ! ! // negativeItemLabelFallbackPosition ! r1.setNegativeItemLabelPositionFallback(new ItemLabelPosition()); ! assertFalse(r1.equals(r2)); ! r2.setNegativeItemLabelPositionFallback(new ItemLabelPosition()); ! assertTrue(r1.equals(r2)); } *************** *** 204,207 **** --- 210,241 ---- /** + * Serialize an instance, restore it, and check for equality. + */ + public void testSerialization2() { + + XYBarRenderer r1 = new XYBarRenderer(); + r1.setPositiveItemLabelPositionFallback(new ItemLabelPosition()); + XYBarRenderer r2 = null; + + try { + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + ObjectOutput out = new ObjectOutputStream(buffer); + out.writeObject(r1); + out.close(); + + ObjectInput in = new ObjectInputStream( + new ByteArrayInputStream(buffer.toByteArray()) + ); + r2 = (XYBarRenderer) in.readObject(); + in.close(); + } + catch (Exception e) { + System.out.println(e.toString()); + } + assertEquals(r1, r2); + + } + + /** * Check that the renderer is calculating the domain bounds correctly. */ |