From: <mu...@us...> - 2007-11-12 10:10:22
|
Revision: 485 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=485&view=rev Author: mungady Date: 2007-11-12 02:10:20 -0800 (Mon, 12 Nov 2007) Log Message: ----------- 2007-11-12 David Gilbert <dav...@ob...> * source/org/jfree/chart/renderer/xy/XYAreaRenderer.java (drawItem): Simplified entity generation, * source/org/jfree/chart/renderer/xy/XYBarRenderer.java (drawItem): Likewise. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/ChangeLog branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBarRenderer.java Modified: branches/jfreechart-1.0.x-branch/ChangeLog =================================================================== --- branches/jfreechart-1.0.x-branch/ChangeLog 2007-11-12 10:01:02 UTC (rev 484) +++ branches/jfreechart-1.0.x-branch/ChangeLog 2007-11-12 10:10:20 UTC (rev 485) @@ -1,3 +1,10 @@ +2007-11-12 David Gilbert <dav...@ob...> + + * source/org/jfree/chart/renderer/xy/XYAreaRenderer.java + (drawItem): Simplified entity generation, + * source/org/jfree/chart/renderer/xy/XYBarRenderer.java + (drawItem): Likewise. + 2007-11-09 David Gilbert <dav...@ob...> * source/org/jfree/chart/renderer/xy/XYDotRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java 2007-11-12 10:01:02 UTC (rev 484) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java 2007-11-12 10:10:20 UTC (rev 485) @@ -34,8 +34,6 @@ * Richard Atkinson; * Christian W. Zuckschwerdt; * - * $Id: XYAreaRenderer.java,v 1.12.2.11 2007/05/18 10:28:31 mungady Exp $ - * * Changes: * -------- * 03-Apr-2002 : Version 1, contributed by Hari. This class is based on the @@ -560,23 +558,9 @@ rangeAxisIndex, transX1, transY1, orientation); // collect entity and tool tip information... - if (state.getInfo() != null) { - EntityCollection entities = state.getEntityCollection(); - if (entities != null && hotspot != null) { - String tip = null; - XYToolTipGenerator generator - = getToolTipGenerator(series, item); - if (generator != null) { - tip = generator.generateToolTip(dataset, series, item); - } - String url = null; - if (getURLGenerator() != null) { - url = getURLGenerator().generateURL(dataset, series, item); - } - XYItemEntity entity = new XYItemEntity(hotspot, dataset, - series, item, tip, url); - entities.add(entity); - } + EntityCollection entities = state.getEntityCollection(); + if (entities != null && hotspot != null) { + addEntity(entities, hotspot, dataset, series, item, 0.0, 0.0); } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBarRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBarRenderer.java 2007-11-12 10:01:02 UTC (rev 484) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBarRenderer.java 2007-11-12 10:10:20 UTC (rev 485) @@ -35,8 +35,6 @@ * Bill Kelemen; * Marc van Glabbeek (bug 1775452); * - * $Id: XYBarRenderer.java,v 1.14.2.17 2007/06/15 12:43:24 mungady Exp $ - * * Changes * ------- * 13-Dec-2001 : Version 1, makes VerticalXYBarPlot class redundant (DG); @@ -110,13 +108,11 @@ import org.jfree.chart.LegendItem; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.entity.EntityCollection; -import org.jfree.chart.entity.XYItemEntity; import org.jfree.chart.event.RendererChangeEvent; import org.jfree.chart.labels.ItemLabelAnchor; import org.jfree.chart.labels.ItemLabelPosition; import org.jfree.chart.labels.XYItemLabelGenerator; import org.jfree.chart.labels.XYSeriesLabelGenerator; -import org.jfree.chart.labels.XYToolTipGenerator; import org.jfree.chart.plot.CrosshairState; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.plot.PlotRenderingInfo; @@ -692,24 +688,9 @@ updateCrosshairValues(crosshairState, x1, y1, domainAxisIndex, rangeAxisIndex, transX1, transY1, plot.getOrientation()); - // add an entity for the item... - if (info != null) { - EntityCollection entities = info.getOwner().getEntityCollection(); - if (entities != null) { - String tip = null; - XYToolTipGenerator generator = getToolTipGenerator(series, - item); - if (generator != null) { - tip = generator.generateToolTip(dataset, series, item); - } - String url = null; - if (getURLGenerator() != null) { - url = getURLGenerator().generateURL(dataset, series, item); - } - XYItemEntity entity = new XYItemEntity(bar, dataset, series, - item, tip, url); - entities.add(entity); - } + EntityCollection entities = state.getEntityCollection(); + if (entities != null) { + addEntity(entities, bar, dataset, series, item, 0.0, 0.0); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |