Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [89] trunk
|
From: <mu...@us...> - 2007-06-29 12:56:10
|
Revision: 89
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=89&view=rev
Author: mungady
Date: 2007-06-29 05:56:09 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
2007-06-29 David Gilbert <dav...@ob...>
* source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
(getItemURLGenerator): Renamed getURLGenerator(),
(addItemEntity): Updated for renamed method,
* source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
(drawHorizontalItem): Call addEntity() to handle entity generation,
(drawVerticalItem): Likewise,
* source/org/jfree/chart/renderer/category/CategoryItemRenderer.java:
Reorganised source file,
* source/org/jfree/chart/renderer/category/GanttRenderer.java
(drawTasks): Call addEntity() to handle entity generation,
(drawTask): Likewise,
* source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
(drawItem): Likewise,
* source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
(drawItem): Likewise,
* source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
(drawHorizontalItem): Likewise,
(drawVerticalItem): Likewise,
* source/org/jfree/chart/renderer/category/LevelRenderer.java
(drawItem): Likewise,
* source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
(drawItem): Likewise.
Modified Paths:
--------------
trunk/ChangeLog
trunk/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
trunk/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
trunk/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java
trunk/source/org/jfree/chart/renderer/category/GanttRenderer.java
trunk/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
trunk/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
trunk/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
trunk/source/org/jfree/chart/renderer/category/LevelRenderer.java
trunk/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
trunk/tests/org/jfree/chart/junit/AreaChartTests.java
trunk/tests/org/jfree/chart/junit/BarChart3DTests.java
trunk/tests/org/jfree/chart/junit/BarChartTests.java
trunk/tests/org/jfree/chart/junit/GanttChartTests.java
trunk/tests/org/jfree/chart/junit/LineChart3DTests.java
trunk/tests/org/jfree/chart/junit/LineChartTests.java
trunk/tests/org/jfree/chart/junit/StackedAreaChartTests.java
trunk/tests/org/jfree/chart/junit/StackedBarChart3DTests.java
trunk/tests/org/jfree/chart/junit/StackedBarChartTests.java
trunk/tests/org/jfree/chart/junit/WaterfallChartTests.java
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/ChangeLog 2007-06-29 12:56:09 UTC (rev 89)
@@ -1,3 +1,28 @@
+2007-06-29 David Gilbert <dav...@ob...>
+
+ * source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
+ (getItemURLGenerator): Renamed getURLGenerator(),
+ (addItemEntity): Updated for renamed method,
+ * source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
+ (drawHorizontalItem): Call addEntity() to handle entity generation,
+ (drawVerticalItem): Likewise,
+ * source/org/jfree/chart/renderer/category/CategoryItemRenderer.java:
+ Reorganised source file,
+ * source/org/jfree/chart/renderer/category/GanttRenderer.java
+ (drawTasks): Call addEntity() to handle entity generation,
+ (drawTask): Likewise,
+ * source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
+ (drawItem): Likewise,
+ * source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
+ (drawItem): Likewise,
+ * source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
+ (drawHorizontalItem): Likewise,
+ (drawVerticalItem): Likewise,
+ * source/org/jfree/chart/renderer/category/LevelRenderer.java
+ (drawItem): Likewise,
+ * source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
+ (drawItem): Likewise.
+
2007-06-27 David Gilbert <dav...@ob...>
* source/org/jfree/chart/ChartFactory.java
Modified: trunk/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -493,7 +493,7 @@
*
* @return The URL generator.
*/
- public CategoryURLGenerator getItemURLGenerator(int row, int column) {
+ public CategoryURLGenerator getURLGenerator(int row, int column) {
CategoryURLGenerator generator
= (CategoryURLGenerator) this.urlGeneratorList.get(row);
if (generator == null) {
@@ -1549,7 +1549,7 @@
tip = tipster.generateToolTip(dataset, row, column);
}
String url = null;
- CategoryURLGenerator urlster = getItemURLGenerator(row, column);
+ CategoryURLGenerator urlster = getURLGenerator(row, column);
if (urlster != null) {
url = urlster.generateURL(dataset, row, column);
}
Modified: trunk/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -66,6 +66,7 @@
* 17-May-2007 : Set datasetIndex and seriesIndex in getLegendItem() (DG);
* 18-May-2007 : Set dataset and seriesKey for LegendItem (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -92,10 +93,8 @@
import org.jfree.chart.LegendItem;
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.event.RendererChangeEvent;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.PlotRenderingInfo;
@@ -497,21 +496,7 @@
if (state.getInfo() != null && box != null) {
EntityCollection entities = state.getEntityCollection();
if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster
- = getToolTipGenerator(row, column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(box, tip,
- url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
+ addItemEntity(entities, dataset, row, column, box);
}
}
@@ -729,21 +714,7 @@
if (state.getInfo() != null && box != null) {
EntityCollection entities = state.getEntityCollection();
if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster
- = getToolTipGenerator(row, column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(dataset,
- row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(box, tip,
- url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
+ addItemEntity(entities, dataset, row, column, box);
}
}
Modified: trunk/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/CategoryItemRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -151,16 +151,6 @@
public interface CategoryItemRenderer extends LegendItemSource {
/**
- * Returns the number of passes through the dataset required by the
- * renderer. Usually this will be one, but some renderers may use
- * a second or third pass to overlay items on top of things that were
- * drawn in an earlier pass.
- *
- * @return The pass count.
- */
- public int getPassCount();
-
- /**
* Returns the plot that the renderer has been assigned to (where
* <code>null</code> indicates that the renderer is not currently assigned
* to a plot).
@@ -183,6 +173,27 @@
public void setPlot(CategoryPlot plot);
/**
+ * Returns the number of passes through the dataset required by the
+ * renderer. Usually this will be one, but some renderers may use
+ * a second or third pass to overlay items on top of things that were
+ * drawn in an earlier pass.
+ *
+ * @return The pass count.
+ */
+ public int getPassCount();
+
+ /**
+ * Returns the range of values the renderer requires to display all the
+ * items from the specified dataset.
+ *
+ * @param dataset the dataset (<code>null</code> permitted).
+ *
+ * @return The range (or <code>null</code> if the dataset is
+ * <code>null</code> or empty).
+ */
+ public Range findRangeBounds(CategoryDataset dataset);
+
+ /**
* Adds a change listener.
*
* @param listener the listener.
@@ -200,39 +211,9 @@
*/
public void removeChangeListener(RendererChangeListener listener);
- /**
- * Returns the range of values the renderer requires to display all the
- * items from the specified dataset.
- *
- * @param dataset the dataset (<code>null</code> permitted).
- *
- * @return The range (or <code>null</code> if the dataset is
- * <code>null</code> or empty).
- */
- public Range findRangeBounds(CategoryDataset dataset);
+ //// VISIBILITY ///////////////////////////////////////////////////////////
/**
- * Initialises the renderer. This method will be called before the first
- * item is rendered, giving the renderer an opportunity to initialise any
- * state information it wants to maintain. The renderer can do nothing if
- * it chooses.
- *
- * @param g2 the graphics device.
- * @param dataArea the area inside the axes.
- * @param plot the plot.
- * @param rendererIndex the renderer index.
- * @param info collects chart rendering information for return to caller.
- *
- * @return A state object (maintains state information relevant to one
- * chart drawing).
- */
- public CategoryItemRendererState initialise(Graphics2D g2,
- Rectangle2D dataArea,
- CategoryPlot plot,
- int rendererIndex,
- PlotRenderingInfo info);
-
- /**
* Returns a boolean that indicates whether or not the specified item
* should be drawn (this is typically used to hide an entire series).
*
@@ -318,6 +299,7 @@
*/
public void setBaseSeriesVisible(boolean visible, boolean notify);
+
// SERIES VISIBLE IN LEGEND (not yet respected by all renderers)
/**
@@ -400,7 +382,7 @@
public void setBaseSeriesVisibleInLegend(boolean visible, boolean notify);
- //// PAINT /////////////////////////////////////////////////////////////////
+ //// PAINT ////////////////////////////////////////////////////////////////
/**
* Returns the paint used to fill data items as they are drawn.
@@ -475,6 +457,7 @@
* @since 1.2.0
*/
public void setBasePaint(Paint paint, boolean notify);
+
//// FILL PAINT /////////////////////////////////////////////////////////
@@ -896,6 +879,262 @@
public void setBaseShape(Shape shape, boolean notify);
+ //// LEGEND ITEMS /////////////////////////////////////////////////////////
+
+ /**
+ * Returns a legend item for a series. This method can return
+ * <code>null</code>, in which case the series will have no entry in the
+ * legend.
+ *
+ * @param datasetIndex the dataset index (zero-based).
+ * @param series the series (zero-based index).
+ *
+ * @return The legend item (possibly <code>null</code>).
+ */
+ public LegendItem getLegendItem(int datasetIndex, int series);
+
+ /**
+ * Returns the legend item label generator.
+ *
+ * @return The label generator (never <code>null</code>).
+ *
+ * @see #setLegendItemLabelGenerator(CategorySeriesLabelGenerator)
+ *
+ * @since 1.2.0
+ */
+ public CategorySeriesLabelGenerator getLegendItemLabelGenerator();
+
+ /**
+ * Sets the legend item label generator and sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param generator the generator (<code>null</code> not permitted).
+ *
+ * @see #getLegendItemLabelGenerator()
+ *
+ * @since 1.2.0
+ */
+ public void setLegendItemLabelGenerator(
+ CategorySeriesLabelGenerator generator);
+
+ /**
+ * Returns the legend item tool tip generator.
+ *
+ * @return The tool tip generator (possibly <code>null</code>).
+ *
+ * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator)
+ *
+ * @since 1.2.0
+ */
+ public CategorySeriesLabelGenerator getLegendItemToolTipGenerator();
+
+ /**
+ * Sets the legend item tool tip generator and sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param generator the generator (<code>null</code> permitted).
+ *
+ * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator)
+ *
+ * @since 1.2.0
+ */
+ public void setLegendItemToolTipGenerator(
+ CategorySeriesLabelGenerator generator);
+
+ /**
+ * Returns the legend item URL generator.
+ *
+ * @return The URL generator (possibly <code>null</code>).
+ *
+ * @see #setLegendItemURLGenerator(CategorySeriesLabelGenerator)
+ *
+ * @since 1.2.0
+ */
+ public CategorySeriesLabelGenerator getLegendItemURLGenerator();
+
+ /**
+ * Sets the legend item URL generator and sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param generator the generator (<code>null</code> permitted).
+ *
+ * @see #getLegendItemURLGenerator()
+ *
+ * @since 1.2.0
+ */
+ public void setLegendItemURLGenerator(
+ CategorySeriesLabelGenerator generator);
+
+
+ // TOOL TIP GENERATOR
+
+ /**
+ * Returns the tool tip generator that should be used for the specified
+ * item. This method looks up the generator using the "three-layer"
+ * approach outlined in the general description of this interface.
+ *
+ * @param row the row index (zero-based).
+ * @param column the column index (zero-based).
+ *
+ * @return The generator (possibly <code>null</code>).
+ */
+ public CategoryToolTipGenerator getToolTipGenerator(int row, int column);
+
+ /**
+ * Returns the tool tip generator for the specified series (a "layer 1"
+ * generator).
+ *
+ * @param series the series index (zero-based).
+ *
+ * @return The tool tip generator (possibly <code>null</code>).
+ *
+ * @see #setSeriesToolTipGenerator(int, CategoryToolTipGenerator)
+ */
+ public CategoryToolTipGenerator getSeriesToolTipGenerator(int series);
+
+ /**
+ * Sets the tool tip generator for a series and sends a
+ * {@link org.jfree.chart.event.RendererChangeEvent} to all registered
+ * listeners.
+ *
+ * @param series the series index (zero-based).
+ * @param generator the generator (<code>null</code> permitted).
+ *
+ * @see #getSeriesToolTipGenerator(int)
+ */
+ public void setSeriesToolTipGenerator(int series,
+ CategoryToolTipGenerator generator);
+
+ /**
+ * Sets the tool tip generator for a series and, if requested, sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param series the series index.
+ * @param generator the generator (<code>null</code> permitted)
+ * @param notify notify listeners?
+ *
+ * @since 1.2.0
+ *
+ * @see #getSeriesToolTipGenerator(int)
+ */
+ public void setSeriesToolTipGenerator(int series,
+ CategoryToolTipGenerator generator, boolean notify);
+
+ /**
+ * Returns the base tool tip generator (the "layer 2" generator).
+ *
+ * @return The tool tip generator (possibly <code>null</code>).
+ *
+ * @see #setBaseToolTipGenerator(CategoryToolTipGenerator)
+ */
+ public CategoryToolTipGenerator getBaseToolTipGenerator();
+
+ /**
+ * Sets the base tool tip generator and sends a
+ * {@link org.jfree.chart.event.RendererChangeEvent} to all registered
+ * listeners.
+ *
+ * @param generator the generator (<code>null</code> permitted).
+ *
+ * @see #getBaseToolTipGenerator()
+ */
+ public void setBaseToolTipGenerator(CategoryToolTipGenerator generator);
+
+ /**
+ * Sets the default tool tip generator and, if requested, sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param generator the generator (<code>null</code> permitted).
+ * @param notify notify listeners?
+ *
+ * @since 1.2.0
+ *
+ * @see #getBaseToolTipGenerator()
+ */
+ public void setBaseToolTipGenerator(CategoryToolTipGenerator generator,
+ boolean notify);
+
+
+ // ITEM URL GENERATOR
+
+ /**
+ * Returns the URL generator for an item.
+ *
+ * @param series the series index (zero-based).
+ * @param item the item index (zero-based).
+ *
+ * @return The item URL generator.
+ */
+ public CategoryURLGenerator getURLGenerator(int series, int item);
+
+ /**
+ * Returns the URL generator for a series.
+ *
+ * @param series the series index (zero-based).
+ *
+ * @return The URL generator.
+ *
+ * @see #setSeriesURLGenerator(int, CategoryURLGenerator)
+ */
+ public CategoryURLGenerator getSeriesURLGenerator(int series);
+
+ /**
+ * Sets the URL generator for a series and sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param series the series index (zero-based).
+ * @param generator the generator.
+ *
+ * @see #getSeriesURLGenerator(int)
+ */
+ public void setSeriesURLGenerator(int series,
+ CategoryURLGenerator generator);
+
+ /**
+ * Sets the URL generator for a series and, if requested, sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param series the series index.
+ * @param generator the generator (<code>null</code> permitted).
+ * @param notify notify listeners?
+ *
+ * @since 1.2.0
+ */
+ public void setSeriesURLGenerator(int series,
+ CategoryURLGenerator generator, boolean notify);
+
+ /**
+ * Returns the base URL generator.
+ *
+ * @return The URL generator (possibly <code>null</code>).
+ *
+ * @see #setBaseURLGenerator(CategoryURLGenerator)
+ */
+ public CategoryURLGenerator getBaseURLGenerator();
+
+ /**
+ * Sets the base URL generator and sends a {@link RendererChangeEvent}
+ * to all registered listeners.
+ *
+ * @param generator the URL generator (<code>null</code> permitted).
+ *
+ * @see #getBaseURLGenerator()
+ */
+ public void setBaseURLGenerator(CategoryURLGenerator generator);
+
+ /**
+ * Sets the default URL generator and, if requested, sends a
+ * {@link RendererChangeEvent} to all registered listeners.
+ *
+ * @param generator the generator (<code>null</code> permitted).
+ * @param notify notify listeners?
+ *
+ * @since 1.2.0
+ */
+ public void setBaseURLGenerator(CategoryURLGenerator generator,
+ boolean notify);
+
+
// ITEM LABELS VISIBLE
/**
@@ -999,6 +1238,7 @@
*/
public void setBaseItemLabelsVisible(boolean visible, boolean notify);
+
// ITEM LABEL GENERATOR
/**
@@ -1082,95 +1322,6 @@
boolean notify);
- // TOOL TIP GENERATOR
-
- /**
- * Returns the tool tip generator that should be used for the specified
- * item. This method looks up the generator using the "three-layer"
- * approach outlined in the general description of this interface.
- *
- * @param row the row index (zero-based).
- * @param column the column index (zero-based).
- *
- * @return The generator (possibly <code>null</code>).
- */
- public CategoryToolTipGenerator getToolTipGenerator(int row, int column);
-
- /**
- * Returns the tool tip generator for the specified series (a "layer 1"
- * generator).
- *
- * @param series the series index (zero-based).
- *
- * @return The tool tip generator (possibly <code>null</code>).
- *
- * @see #setSeriesToolTipGenerator(int, CategoryToolTipGenerator)
- */
- public CategoryToolTipGenerator getSeriesToolTipGenerator(int series);
-
- /**
- * Sets the tool tip generator for a series and sends a
- * {@link org.jfree.chart.event.RendererChangeEvent} to all registered
- * listeners.
- *
- * @param series the series index (zero-based).
- * @param generator the generator (<code>null</code> permitted).
- *
- * @see #getSeriesToolTipGenerator(int)
- */
- public void setSeriesToolTipGenerator(int series,
- CategoryToolTipGenerator generator);
-
- /**
- * Sets the tool tip generator for a series and, if requested, sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param series the series index.
- * @param generator the generator (<code>null</code> permitted)
- * @param notify notify listeners?
- *
- * @since 1.2.0
- *
- * @see #getSeriesToolTipGenerator(int)
- */
- public void setSeriesToolTipGenerator(int series,
- CategoryToolTipGenerator generator, boolean notify);
-
- /**
- * Returns the base tool tip generator (the "layer 2" generator).
- *
- * @return The tool tip generator (possibly <code>null</code>).
- *
- * @see #setBaseToolTipGenerator(CategoryToolTipGenerator)
- */
- public CategoryToolTipGenerator getBaseToolTipGenerator();
-
- /**
- * Sets the base tool tip generator and sends a
- * {@link org.jfree.chart.event.RendererChangeEvent} to all registered
- * listeners.
- *
- * @param generator the generator (<code>null</code> permitted).
- *
- * @see #getBaseToolTipGenerator()
- */
- public void setBaseToolTipGenerator(CategoryToolTipGenerator generator);
-
- /**
- * Sets the default tool tip generator and, if requested, sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param generator the generator (<code>null</code> permitted).
- * @param notify notify listeners?
- *
- * @since 1.2.0
- *
- * @see #getBaseToolTipGenerator()
- */
- public void setBaseToolTipGenerator(CategoryToolTipGenerator generator,
- boolean notify);
-
-
//// ITEM LABEL FONT //////////////////////////////////////////////////////
/**
@@ -1585,179 +1736,55 @@
public void setBaseCreateEntities(boolean create, boolean notify);
- // ITEM URL GENERATOR
+ //// DRAWING //////////////////////////////////////////////////////////////
/**
- * Returns the URL generator for an item.
+ * Initialises the renderer. This method will be called before the first
+ * item is rendered, giving the renderer an opportunity to initialise any
+ * state information it wants to maintain. The renderer can do nothing if
+ * it chooses.
*
- * @param series the series index (zero-based).
- * @param item the item index (zero-based).
- *
- * @return The item URL generator.
- */
- public CategoryURLGenerator getItemURLGenerator(int series, int item);
-
- /**
- * Returns the URL generator for a series.
- *
- * @param series the series index (zero-based).
- *
- * @return The URL generator.
+ * @param g2 the graphics device.
+ * @param dataArea the area inside the axes.
+ * @param plot the plot.
+ * @param rendererIndex the renderer index.
+ * @param info collects chart rendering information for return to caller.
*
- * @see #setSeriesURLGenerator(int, CategoryURLGenerator)
+ * @return A state object (maintains state information relevant to one
+ * chart drawing).
*/
- public CategoryURLGenerator getSeriesURLGenerator(int series);
+ public CategoryItemRendererState initialise(Graphics2D g2,
+ Rectangle2D dataArea, CategoryPlot plot, int rendererIndex,
+ PlotRenderingInfo info);
/**
- * Sets the URL generator for a series and sends a
- * {@link RendererChangeEvent} to all registered listeners.
+ * Draws a single data item.
*
- * @param series the series index (zero-based).
- * @param generator the generator.
- *
- * @see #getSeriesURLGenerator(int)
+ * @param g2 the graphics device.
+ * @param state state information for one chart.
+ * @param dataArea the data plot area.
+ * @param plot the plot.
+ * @param domainAxis the domain axis.
+ * @param rangeAxis the range axis.
+ * @param dataset the data.
+ * @param row the row index (zero-based).
+ * @param column the column index (zero-based).
+ * @param pass the pass index.
*/
- public void setSeriesURLGenerator(int series,
- CategoryURLGenerator generator);
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
+ int pass);
/**
- * Sets the URL generator for a series and, if requested, sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param series the series index.
- * @param generator the generator (<code>null</code> permitted).
- * @param notify notify listeners?
- *
- * @since 1.2.0
- */
- public void setSeriesURLGenerator(int series,
- CategoryURLGenerator generator, boolean notify);
-
- /**
- * Returns the base URL generator.
- *
- * @return The URL generator (possibly <code>null</code>).
- *
- * @see #setBaseURLGenerator(CategoryURLGenerator)
- */
- public CategoryURLGenerator getBaseURLGenerator();
-
- /**
- * Sets the base URL generator and sends a {@link RendererChangeEvent}
- * to all registered listeners.
- *
- * @param generator the URL generator (<code>null</code> permitted).
- *
- * @see #getBaseURLGenerator()
- */
- public void setBaseURLGenerator(CategoryURLGenerator generator);
-
- /**
- * Sets the default URL generator and, if requested, sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param generator the generator (<code>null</code> permitted).
- * @param notify notify listeners?
- *
- * @since 1.2.0
- */
- public void setBaseURLGenerator(CategoryURLGenerator generator,
- boolean notify);
-
- /**
- * Returns a legend item for a series. This method can return
- * <code>null</code>, in which case the series will have no entry in the
- * legend.
- *
- * @param datasetIndex the dataset index (zero-based).
- * @param series the series (zero-based index).
- *
- * @return The legend item (possibly <code>null</code>).
- */
- public LegendItem getLegendItem(int datasetIndex, int series);
-
- /**
- * Returns the legend item label generator.
- *
- * @return The label generator (never <code>null</code>).
- *
- * @see #setLegendItemLabelGenerator(CategorySeriesLabelGenerator)
- *
- * @since 1.2.0
- */
- public CategorySeriesLabelGenerator getLegendItemLabelGenerator();
-
- /**
- * Sets the legend item label generator and sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param generator the generator (<code>null</code> not permitted).
- *
- * @see #getLegendItemLabelGenerator()
- *
- * @since 1.2.0
- */
- public void setLegendItemLabelGenerator(
- CategorySeriesLabelGenerator generator);
-
- /**
- * Returns the legend item tool tip generator.
- *
- * @return The tool tip generator (possibly <code>null</code>).
- *
- * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator)
- *
- * @since 1.2.0
- */
- public CategorySeriesLabelGenerator getLegendItemToolTipGenerator();
-
- /**
- * Sets the legend item tool tip generator and sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param generator the generator (<code>null</code> permitted).
- *
- * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator)
- *
- * @since 1.2.0
- */
- public void setLegendItemToolTipGenerator(
- CategorySeriesLabelGenerator generator);
-
- /**
- * Returns the legend item URL generator.
- *
- * @return The URL generator (possibly <code>null</code>).
- *
- * @see #setLegendItemURLGenerator(CategorySeriesLabelGenerator)
- *
- * @since 1.2.0
- */
- public CategorySeriesLabelGenerator getLegendItemURLGenerator();
-
- /**
- * Sets the legend item URL generator and sends a
- * {@link RendererChangeEvent} to all registered listeners.
- *
- * @param generator the generator (<code>null</code> permitted).
- *
- * @see #getLegendItemURLGenerator()
- *
- * @since 1.2.0
- */
- public void setLegendItemURLGenerator(
- CategorySeriesLabelGenerator generator);
-
- /**
* Draws a background for the data area.
*
* @param g2 the graphics device.
* @param plot the plot.
* @param dataArea the data area.
*/
- public void drawBackground(Graphics2D g2,
- CategoryPlot plot,
- Rectangle2D dataArea);
+ public void drawBackground(Graphics2D g2, CategoryPlot plot,
+ Rectangle2D dataArea);
/**
* Draws an outline for the data area.
@@ -1766,36 +1793,10 @@
* @param plot the plot.
* @param dataArea the data area.
*/
- public void drawOutline(Graphics2D g2,
- CategoryPlot plot,
- Rectangle2D dataArea);
+ public void drawOutline(Graphics2D g2, CategoryPlot plot,
+ Rectangle2D dataArea);
/**
- * Draws a single data item.
- *
- * @param g2 the graphics device.
- * @param state state information for one chart.
- * @param dataArea the data plot area.
- * @param plot the plot.
- * @param domainAxis the domain axis.
- * @param rangeAxis the range axis.
- * @param dataset the data.
- * @param row the row index (zero-based).
- * @param column the column index (zero-based).
- * @param pass the pass index.
- */
- public void drawItem(Graphics2D g2,
- CategoryItemRendererState state,
- Rectangle2D dataArea,
- CategoryPlot plot,
- CategoryAxis domainAxis,
- ValueAxis rangeAxis,
- CategoryDataset dataset,
- int row,
- int column,
- int pass);
-
- /**
* Draws a grid line against the domain axis.
*
* @param g2 the graphics device.
@@ -1807,10 +1808,8 @@
* @see #drawRangeGridline(Graphics2D, CategoryPlot, ValueAxis,
* Rectangle2D, double)
*/
- public void drawDomainGridline(Graphics2D g2,
- CategoryPlot plot,
- Rectangle2D dataArea,
- double value);
+ public void drawDomainGridline(Graphics2D g2, CategoryPlot plot,
+ Rectangle2D dataArea, double value);
/**
* Draws a grid line against the range axis.
@@ -1824,11 +1823,8 @@
*
* @see #drawDomainGridline(Graphics2D, CategoryPlot, Rectangle2D, double)
*/
- public void drawRangeGridline(Graphics2D g2,
- CategoryPlot plot,
- ValueAxis axis,
- Rectangle2D dataArea,
- double value);
+ public void drawRangeGridline(Graphics2D g2, CategoryPlot plot,
+ ValueAxis axis, Rectangle2D dataArea, double value);
/**
* Draws a line (or some other marker) to indicate a particular category on
@@ -1843,11 +1839,8 @@
* @see #drawRangeMarker(Graphics2D, CategoryPlot, ValueAxis, Marker,
* Rectangle2D)
*/
- public void drawDomainMarker(Graphics2D g2,
- CategoryPlot plot,
- CategoryAxis axis,
- CategoryMarker marker,
- Rectangle2D dataArea);
+ public void drawDomainMarker(Graphics2D g2, CategoryPlot plot,
+ CategoryAxis axis, CategoryMarker marker, Rectangle2D dataArea);
/**
* Draws a line (or some other marker) to indicate a particular value on
@@ -1862,10 +1855,7 @@
* @see #drawDomainMarker(Graphics2D, CategoryPlot, CategoryAxis,
* CategoryMarker, Rectangle2D)
*/
- public void drawRangeMarker(Graphics2D g2,
- CategoryPlot plot,
- ValueAxis axis,
- Marker marker,
- Rectangle2D dataArea);
-
+ public void drawRangeMarker(Graphics2D g2, CategoryPlot plot,
+ ValueAxis axis, Marker marker, Rectangle2D dataArea);
+
}
Modified: trunk/source/org/jfree/chart/renderer/category/GanttRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/GanttRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/GanttRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -49,6 +49,7 @@
* 17-Jan-2006 : Set includeBaseInRange flag to false (DG);
* 20-Mar-2007 : Implemented equals() and fixed serialization (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -66,11 +67,9 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.event.RendererChangeEvent;
import org.jfree.chart.labels.CategoryItemLabelGenerator;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.util.PaintUtilities;
@@ -381,20 +380,7 @@
if (state.getInfo() != null) {
EntityCollection entities = state.getEntityCollection();
if (entities != null) {
- String tip = null;
- if (getToolTipGenerator(row, column) != null) {
- tip = getToolTipGenerator(row, column).generateToolTip(
- dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(
- bar, tip, url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
+ addItemEntity(entities, dataset, row, column, bar);
}
}
}
@@ -526,27 +512,10 @@
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster = getToolTipGenerator(row,
- column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(bar, tip,
- url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
- }
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, bar);
}
-
}
/**
Modified: trunk/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -44,6 +44,7 @@
* --> CategoryItemLabelGenerator (DG);
* 22-Sep-2005 : Renamed getMaxBarWidth() --> getMaximumBarWidth() (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -57,11 +58,9 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.event.RendererChangeEvent;
import org.jfree.chart.labels.CategoryItemLabelGenerator;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.util.PublicCloneable;
@@ -331,35 +330,17 @@
g2.draw(bar);
}
- CategoryItemLabelGenerator generator
- = getItemLabelGenerator(row, column);
+ CategoryItemLabelGenerator generator = getItemLabelGenerator(row,
+ column);
if (generator != null && isItemLabelVisible(row, column)) {
- drawItemLabel(
- g2, dataset, row, column, plot, generator, bar,
- (value < 0.0)
- );
+ drawItemLabel(g2, dataset, row, column, plot, generator, bar,
+ (value < 0.0));
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster = getToolTipGenerator(row,
- column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(
- bar, tip, url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
- }
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, bar);
}
}
Modified: trunk/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -58,6 +58,7 @@
* --> CategoryItemLabelGenerator (DG);
* 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -71,10 +72,8 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.labels.CategoryItemLabelGenerator;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.util.PublicCloneable;
@@ -269,25 +268,9 @@
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster
- = getToolTipGenerator(row, column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(bar, tip,
- url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
- }
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, bar);
}
}
Modified: trunk/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -48,6 +48,7 @@
* width setting (thanks to Zoheb Borbora) (DG);
* 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -62,10 +63,8 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.labels.CategoryItemLabelGenerator;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.util.GradientPaintTransformer;
@@ -215,7 +214,7 @@
* @param plot the plot.
* @param domainAxis the domain axis.
* @param rangeAxis the range axis.
- * @param data the data.
+ * @param dataset the dataset.
* @param row the row index (zero-based).
* @param column the column index (zero-based).
*/
@@ -225,12 +224,12 @@
CategoryPlot plot,
CategoryAxis domainAxis,
ValueAxis rangeAxis,
- CategoryDataset data,
+ CategoryDataset dataset,
int row,
int column) {
// nothing is drawn for null values...
- Number dataValue = data.getValue(row, column);
+ Number dataValue = dataset.getValue(row, column);
if (dataValue == null) {
return;
}
@@ -322,31 +321,16 @@
CategoryItemLabelGenerator generator
= getItemLabelGenerator(row, column);
if (generator != null && isItemLabelVisible(row, column)) {
- drawItemLabel(g2, data, row, column, plot, generator, bar,
+ drawItemLabel(g2, dataset, row, column, plot, generator, bar,
(transX1 > transX2));
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster
- = getToolTipGenerator(row, column);
- if (tipster != null) {
- tip = tipster.generateToolTip(data, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(data,
- row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(bar, tip,
- url, data, data.getRowKey(row),
- data.getColumnKey(column));
- entities.add(entity);
- }
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, bar);
}
+
}
/**
@@ -358,7 +342,7 @@
* @param plot the plot.
* @param domainAxis the domain axis.
* @param rangeAxis the range axis.
- * @param data the data.
+ * @param dataset the dataset.
* @param row the row index (zero-based).
* @param column the column index (zero-based).
*/
@@ -368,12 +352,12 @@
CategoryPlot plot,
CategoryAxis domainAxis,
ValueAxis rangeAxis,
- CategoryDataset data,
+ CategoryDataset dataset,
int row,
int column) {
// nothing is drawn for null values...
- Number dataValue = data.getValue(row, column);
+ Number dataValue = dataset.getValue(row, column);
if (dataValue == null) {
return;
}
@@ -472,30 +456,14 @@
CategoryItemLabelGenerator generator
= getItemLabelGenerator(row, column);
if (generator != null && isItemLabelVisible(row, column)) {
- drawItemLabel(g2, data, row, column, plot, generator, bar,
+ drawItemLabel(g2, dataset, row, column, plot, generator, bar,
(transX1 > transX2));
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster
- = getToolTipGenerator(row, column);
- if (tipster != null) {
- tip = tipster.generateToolTip(data, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- data, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(bar, tip,
- url, data, data.getRowKey(row),
- data.getColumnKey(column));
- entities.add(entity);
- }
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, bar);
}
}
Modified: trunk/source/org/jfree/chart/renderer/category/LevelRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/LevelRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/LevelRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -44,6 +44,7 @@
* 23-Jan-2006 : Renamed getMaxItemWidth() --> getMaximumItemWidth() (DG);
* 19-Jun-2007 : Removed deprecated code (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -58,11 +59,9 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.event.RendererChangeEvent;
import org.jfree.chart.labels.CategoryItemLabelGenerator;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.PlotRenderingInfo;
@@ -331,28 +330,12 @@
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null) {
- String tip = null;
- CategoryToolTipGenerator tipster = getToolTipGenerator(row,
- column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(dataset,
- row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(
- line.getBounds(), tip, url, dataset,
- dataset.getRowKey(row), dataset.getColumnKey(column));
- entities.add(entity);
- }
-
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, line.getBounds());
}
+
}
/**
Modified: trunk/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -48,6 +48,7 @@
* 14-Jun-2007 : If the dataset is not a StatisticalCategoryDataset, revert
* to the drawing behaviour of LineAndShapeRenderer (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 29-Jun-2007 : Simplified entity generation by calling addEntity() (DG);
*
*/
@@ -65,10 +66,8 @@
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.CategoryItemEntity;
import org.jfree.chart.entity.EntityCollection;
import org.jfree.chart.event.RendererChangeEvent;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.util.PaintUtilities;
@@ -317,29 +316,12 @@
}
// collect entity and tool tip information...
- if (state.getInfo() != null) {
- EntityCollection entities = state.getEntityCollection();
- if (entities != null && shape != null) {
- String tip = null;
- CategoryToolTipGenerator tipster = getToolTipGenerator(row,
- column);
- if (tipster != null) {
- tip = tipster.generateToolTip(dataset, row, column);
- }
- String url = null;
- if (getItemURLGenerator(row, column) != null) {
- url = getItemURLGenerator(row, column).generateURL(
- dataset, row, column);
- }
- CategoryItemEntity entity = new CategoryItemEntity(shape, tip,
- url, dataset, dataset.getRowKey(row),
- dataset.getColumnKey(column));
- entities.add(entity);
-
- }
-
+ EntityCollection entities = state.getEntityCollection();
+ if (entities != null) {
+ addItemEntity(entities, dataset, row, column, shape);
}
+
}
/**
Modified: trunk/tests/org/jfree/chart/junit/AreaChartTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/AreaChartTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/org/jfree/chart/junit/AreaChartTests.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -37,7 +37,8 @@
* Changes:
* --------
* 12-Apr-2005 : Version 1 (DG);
- *
+ * 27-Jun-2007 : Updated for method name change in CategoryItemRenderer
+ * interface (DG);
*/
package org.jfree.chart.junit;
@@ -123,7 +124,7 @@
StandardCategoryURLGenerator url1
= new StandardCategoryURLGenerator();
renderer.setSeriesURLGenerator(0, url1);
- CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
+ CategoryURLGenerator url2 = renderer.getURLGenerator(0, 0);
assertTrue(url2 == url1);
}
Modified: trunk/tests/org/jfree/chart/junit/BarChart3DTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/BarChart3DTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/org/jfree/chart/junit/BarChart3DTests.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -40,6 +40,8 @@
* 25-Jun-2002 : Removed redundant code (DG);
* 17-Oct-2002 : Fixed errors reported by Checkstyle (DG);
* 14-Jul-2003 : Renamed BarChart3DTests.java (DG);
+ * 27-Jun-2007 : Updated for method name change in CategoryItemRenderer
+ * interface (DG);
*
*/
@@ -175,7 +177,7 @@
StandardCategoryURLGenerator url1
= new StandardCategoryURLGenerator();
renderer.setSeriesURLGenerator(0, url1);
- CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
+ CategoryURLGenerator url2 = renderer.getURLGenerator(0, 0);
assertTrue(url2 == url1);
}
Modified: trunk/tests/org/jfree/chart/junit/BarChartTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/BarChartTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/org/jfree/chart/junit/BarChartTests.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -40,6 +40,8 @@
* 25-Jun-2002 : Removed redundant code (DG);
* 17-Oct-2002 : Fixed errors reported by Checkstyle (DG);
* 14-Jul-2003 : Renamed BarChartTests.java (DG);
+ * 27-Jun-2007 : Updated for method name change in CategoryItemRenderer
+ * interface (DG);
*
*/
@@ -179,7 +181,7 @@
StandardCategoryURLGenerator url1
= new StandardCategoryURLGenerator();
renderer.setSeriesURLGenerator(0, url1);
- CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
+ CategoryURLGenerator url2 = renderer.getURLGenerator(0, 0);
assertTrue(url2 == url1);
}
Modified: trunk/tests/org/jfree/chart/junit/GanttChartTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/GanttChartTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/org/jfree/chart/junit/GanttChartTests.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -37,6 +37,8 @@
* Changes:
* --------
* 12-Apr-2005 : Version 1 (DG);
+ * 27-Jun-2007 : Updated for method name change in CategoryItemRenderer
+ * interface (DG);
*
*/
@@ -176,7 +178,7 @@
StandardCategoryURLGenerator url1
= new StandardCategoryURLGenerator();
renderer.setSeriesURLGenerator(0, url1);
- CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
+ CategoryURLGenerator url2 = renderer.getURLGenerator(0, 0);
assertTrue(url2 == url1);
}
Modified: trunk/tests/org/jfree/chart/junit/LineChart3DTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/LineChart3DTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/org/jfree/chart/junit/LineChart3DTests.java 2007-06-29 12:56:09 UTC (rev 89)
@@ -37,6 +37,8 @@
* Changes:
* --------
* 12-Apr-2005 : Version 1 (DG);
+ * 27-Jun-2007 : Updated for method name change in CategoryItemRenderer
+ * interface (DG);
*
*/
@@ -174,7 +176,7 @@
StandardCategoryURLGenerator url1
= new StandardCategoryURLGenerator();
renderer.setSeriesURLGenerator(0, url1);
- CategoryURLGenerator url2 = renderer.getItemURLGenerator(0, 0);
+ CategoryURLGenerator url2 = renderer.getURLGenerator(0, 0);
assertTrue(url2 == url1);
}
Modified: trunk/tests/org/jfree/chart/junit/LineChartTests.java
===================================================================
--- trunk/tests/org/jfree/chart/junit/LineChartTests.java 2007-06-27 15:19:13 UTC (rev 88)
+++ trunk/tests/or...
[truncated message content] |