From: <mu...@us...> - 2008-09-01 20:51:32
|
Revision: 1450 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1450&view=rev Author: mungady Date: 2008-09-01 20:51:30 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Fixed Javadoc warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2008-09-01 20:37:59 UTC (rev 1449) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2008-09-01 20:51:30 UTC (rev 1450) @@ -1310,10 +1310,10 @@ * * @param crosshairState the crosshair state (<code>null</code> permitted, * but the method does nothing in that case). - * @param x the category key, or <code>null</code>. - * @param y the y-value (in data space). - * @param domainAxisIndex the index of the domain axis for the point. - * @param rangeAxisIndex the index of the range axis for the point. + * @param rowKey the row key. + * @param columnKey the column key. + * @param value the data value. + * @param datasetIndex the dataset index. * @param transX the x-value translated to Java2D space. * @param transY the y-value translated to Java2D space. * @param orientation the plot orientation (<code>null</code> not This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2009-03-19 09:07:39
|
Revision: 1899 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1899&view=rev Author: mungady Date: 2009-03-19 09:07:35 +0000 (Thu, 19 Mar 2009) Log Message: ----------- API doc update. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-03-18 10:00:29 UTC (rev 1898) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-03-19 09:07:35 UTC (rev 1899) @@ -858,8 +858,8 @@ * @param dataArea the area for plotting data (not yet adjusted for any 3D * effect). * @param value the value at which the grid line should be drawn. - * @param paint the paint. - * @param stroke the stroke. + * @param paint the paint (<code>null</code> not permitted). + * @param stroke the stroke (<code>null</code> not permitted). * * @see #drawRangeGridline * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2009-04-08 07:34:48
|
Revision: 1970 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1970&view=rev Author: mungady Date: 2009-04-08 07:34:40 +0000 (Wed, 08 Apr 2009) Log Message: ----------- Fixed deprecation warning. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-04-07 20:08:37 UTC (rev 1969) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-04-08 07:34:40 UTC (rev 1970) @@ -1728,7 +1728,7 @@ url = urlster.generateURL(dataset, row, column); } CategoryItemEntity entity = new CategoryItemEntity(s, tip, url, - dataset, row, column); + dataset, dataset.getRowKey(row), dataset.getColumnKey(column)); entities.add(entity); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2009-04-20 07:48:42
|
Revision: 2007 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2007&view=rev Author: mungady Date: 2009-04-20 07:48:40 +0000 (Mon, 20 Apr 2009) Log Message: ----------- Added Javadoc entry. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-04-20 07:26:24 UTC (rev 2006) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-04-20 07:48:40 UTC (rev 2007) @@ -614,6 +614,7 @@ * items from the specified dataset. * * @param dataset the dataset (<code>null</code> permitted). + * @param includeInterval include the y-interval if the dataset has one. * * @return The range (<code>null</code> if the dataset is <code>null</code> * or empty). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2009-05-11 19:35:57
|
Revision: 2032 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2032&view=rev Author: mungady Date: 2009-05-11 19:35:49 +0000 (Mon, 11 May 2009) Log Message: ----------- Fixed Checkstyle warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-05-11 19:34:45 UTC (rev 2031) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2009-05-11 19:35:49 UTC (rev 2032) @@ -583,11 +583,11 @@ CategoryItemRendererState state = createState(info); int[] visibleSeriesTemp = new int[this.rowCount]; int visibleSeriesCount = 0; - for (int row = 0; row < this.rowCount; row++){ - if (isSeriesVisible(row)) { - visibleSeriesTemp[visibleSeriesCount] = row; - visibleSeriesCount++; - } + for (int row = 0; row < this.rowCount; row++) { + if (isSeriesVisible(row)) { + visibleSeriesTemp[visibleSeriesCount] = row; + visibleSeriesCount++; + } } int[] visibleSeries = new int[visibleSeriesCount]; System.arraycopy(visibleSeriesTemp, 0, visibleSeries, 0, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-12-03 14:53:05
|
Revision: 2444 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2444&view=rev Author: mungady Date: 2011-12-03 14:52:59 +0000 (Sat, 03 Dec 2011) Log Message: ----------- Use ParamChecks class to check for null arguments. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2011-12-03 14:46:19 UTC (rev 2443) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2011-12-03 14:52:59 UTC (rev 2444) @@ -147,6 +147,7 @@ import org.jfree.chart.plot.ValueMarker; import org.jfree.chart.renderer.AbstractRenderer; import org.jfree.chart.urls.CategoryURLGenerator; +import org.jfree.chart.util.ParamChecks; import org.jfree.data.Range; import org.jfree.data.category.CategoryDataset; import org.jfree.data.general.DatasetUtilities; @@ -262,9 +263,7 @@ * @see #getPlot() */ public void setPlot(CategoryPlot plot) { - if (plot == null) { - throw new IllegalArgumentException("Null 'plot' argument."); - } + ParamChecks.nullNotPermitted(plot, "plot"); this.plot = plot; } @@ -1609,9 +1608,7 @@ */ public void setLegendItemLabelGenerator( CategorySeriesLabelGenerator generator) { - if (generator == null) { - throw new IllegalArgumentException("Null 'generator' argument."); - } + ParamChecks.nullNotPermitted(generator, "generator"); this.legendItemLabelGenerator = generator; fireChangeEvent(); } @@ -1678,9 +1675,7 @@ protected void addItemEntity(EntityCollection entities, CategoryDataset dataset, int row, int column, Shape hotspot) { - if (hotspot == null) { - throw new IllegalArgumentException("Null 'hotspot' argument."); - } + ParamChecks.nullNotPermitted(hotspot, "hotspot"); if (!getItemCreateEntity(row, column)) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-07-02 17:04:29
|
Revision: 2598 http://sourceforge.net/p/jfreechart/code/2598 Author: mungady Date: 2013-07-02 17:04:26 +0000 (Tue, 02 Jul 2013) Log Message: ----------- Use ParamChecks class. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-07-02 16:56:45 UTC (rev 2597) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-07-02 17:04:26 UTC (rev 2598) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------------------- * AbstractCategoryItemRenderer.java * --------------------------------- - * (C) Copyright 2002-2010, by Object Refinery Limited. + * (C) Copyright 2002-2013, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Richard Atkinson; @@ -103,6 +103,7 @@ * series (DG); * 01-Apr-2009 : Added new addEntity() method (DG); * 09-Feb-2010 : Fixed bug 2947660 (DG); + * 02-Jul-2013 : Use ParamChecks (DG); * */ @@ -321,7 +322,7 @@ * @see #getSeriesItemLabelGenerator(int) */ public void setSeriesItemLabelGenerator(int series, - CategoryItemLabelGenerator generator) { + CategoryItemLabelGenerator generator) { this.itemLabelGeneratorList.set(series, generator); fireChangeEvent(); } @@ -367,7 +368,7 @@ */ public CategoryToolTipGenerator getToolTipGenerator(int row, int column) { - CategoryToolTipGenerator result = null; + CategoryToolTipGenerator result; if (this.toolTipGenerator != null) { result = this.toolTipGenerator; } @@ -404,7 +405,7 @@ * @see #getSeriesToolTipGenerator(int) */ public void setSeriesToolTipGenerator(int series, - CategoryToolTipGenerator generator) { + CategoryToolTipGenerator generator) { this.toolTipGeneratorList.set(series, generator); fireChangeEvent(); } @@ -485,7 +486,7 @@ * @see #getSeriesItemURLGenerator(int) */ public void setSeriesItemURLGenerator(int series, - CategoryURLGenerator generator) { + CategoryURLGenerator generator) { this.itemURLGeneratorList.set(series, generator); fireChangeEvent(); } @@ -566,10 +567,8 @@ * @return The renderer state. */ public CategoryItemRendererState initialise(Graphics2D g2, - Rectangle2D dataArea, - CategoryPlot plot, - int rendererIndex, - PlotRenderingInfo info) { + Rectangle2D dataArea, CategoryPlot plot, int rendererIndex, + PlotRenderingInfo info) { setPlot(plot); CategoryDataset data = plot.getDataset(rendererIndex); @@ -673,12 +672,9 @@ * @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) { plot.drawBackground(g2, dataArea); - } /** @@ -690,12 +686,9 @@ * @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) { plot.drawOutline(g2, dataArea); - } /** @@ -714,10 +707,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) { Line2D line = null; PlotOrientation orientation = plot.getOrientation(); @@ -744,7 +735,6 @@ g2.setStroke(stroke); g2.draw(line); - } /** @@ -759,11 +749,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) { Range range = axis.getRange(); if (!range.contains(value)) { @@ -854,11 +841,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) { Comparable category = marker.getKey(); CategoryDataset dataset = plot.getDataset(plot.getIndexOf(this)); @@ -872,7 +856,7 @@ AlphaComposite.SRC_OVER, marker.getAlpha())); PlotOrientation orientation = plot.getOrientation(); - Rectangle2D bounds = null; + Rectangle2D bounds; if (marker.getDrawAsLine()) { double v = axis.getCategoryMiddle(columnIndex, dataset.getColumnCount(), dataArea, @@ -940,11 +924,8 @@ * @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) { if (marker instanceof ValueMarker) { ValueMarker vm = (ValueMarker) marker; @@ -1111,12 +1092,9 @@ * @return The coordinates for drawing the marker label. */ protected Point2D calculateDomainMarkerTextAnchorPoint(Graphics2D g2, - PlotOrientation orientation, - Rectangle2D dataArea, - Rectangle2D markerArea, - RectangleInsets markerOffset, - LengthAdjustmentType labelOffsetType, - RectangleAnchor anchor) { + PlotOrientation orientation, Rectangle2D dataArea, + Rectangle2D markerArea, RectangleInsets markerOffset, + LengthAdjustmentType labelOffsetType, RectangleAnchor anchor) { Rectangle2D anchorRect = null; if (orientation == PlotOrientation.HORIZONTAL) { @@ -1145,12 +1123,9 @@ * @return The coordinates for drawing the marker label. */ protected Point2D calculateRangeMarkerTextAnchorPoint(Graphics2D g2, - PlotOrientation orientation, - Rectangle2D dataArea, - Rectangle2D markerArea, - RectangleInsets markerOffset, - LengthAdjustmentType labelOffsetType, - RectangleAnchor anchor) { + PlotOrientation orientation, Rectangle2D dataArea, + Rectangle2D markerArea, RectangleInsets markerOffset, + LengthAdjustmentType labelOffsetType, RectangleAnchor anchor) { Rectangle2D anchorRect = null; if (orientation == PlotOrientation.HORIZONTAL) { @@ -1337,9 +1312,7 @@ int datasetIndex, double transX, double transY, PlotOrientation orientation) { - if (orientation == null) { - throw new IllegalArgumentException("Null 'orientation' argument."); - } + ParamChecks.nullNotPermitted(orientation, "orientation"); if (crosshairState != null) { if (this.plot.isRangeCrosshairLockedOnData()) { @@ -1673,8 +1646,7 @@ * @param hotspot the hotspot (<code>null</code> not permitted). */ protected void addItemEntity(EntityCollection entities, - CategoryDataset dataset, int row, int column, - Shape hotspot) { + CategoryDataset dataset, int row, int column, Shape hotspot) { ParamChecks.nullNotPermitted(hotspot, "hotspot"); if (!getItemCreateEntity(row, column)) { return; @@ -1832,5 +1804,4 @@ fireChangeEvent(); } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2013-09-13 11:09:51
|
Revision: 2922 http://sourceforge.net/p/jfreechart/code/2922 Author: mungady Date: 2013-09-13 11:09:47 +0000 (Fri, 13 Sep 2013) Log Message: ----------- Add override tags. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-09-13 07:23:00 UTC (rev 2921) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-09-13 11:09:47 UTC (rev 2922) @@ -237,6 +237,7 @@ * * @return The pass count. */ + @Override public int getPassCount() { return 1; } @@ -250,6 +251,7 @@ * * @see #setPlot(CategoryPlot) */ + @Override public CategoryPlot getPlot() { return this.plot; } @@ -263,6 +265,7 @@ * * @see #getPlot() */ + @Override public void setPlot(CategoryPlot plot) { ParamChecks.nullNotPermitted(plot, "plot"); this.plot = plot; @@ -281,6 +284,7 @@ * * @return The generator (possibly <code>null</code>). */ + @Override public CategoryItemLabelGenerator getItemLabelGenerator(int row, int column) { return getSeriesItemLabelGenerator(row); @@ -295,6 +299,7 @@ * * @see #setSeriesItemLabelGenerator(int, CategoryItemLabelGenerator) */ + @Override public CategoryItemLabelGenerator getSeriesItemLabelGenerator(int series) { // return the generator for ALL series, if there is one... @@ -321,6 +326,7 @@ * * @see #getSeriesItemLabelGenerator(int) */ + @Override public void setSeriesItemLabelGenerator(int series, CategoryItemLabelGenerator generator) { this.itemLabelGeneratorList.set(series, generator); @@ -334,6 +340,7 @@ * * @see #setBaseItemLabelGenerator(CategoryItemLabelGenerator) */ + @Override public CategoryItemLabelGenerator getBaseItemLabelGenerator() { return this.baseItemLabelGenerator; } @@ -346,6 +353,7 @@ * * @see #getBaseItemLabelGenerator() */ + @Override public void setBaseItemLabelGenerator( CategoryItemLabelGenerator generator) { this.baseItemLabelGenerator = generator; @@ -366,6 +374,7 @@ * * @return The generator (possibly <code>null</code>). */ + @Override public CategoryToolTipGenerator getToolTipGenerator(int row, int column) { CategoryToolTipGenerator result; @@ -391,6 +400,7 @@ * * @see #setSeriesToolTipGenerator(int, CategoryToolTipGenerator) */ + @Override public CategoryToolTipGenerator getSeriesToolTipGenerator(int series) { return (CategoryToolTipGenerator) this.toolTipGeneratorList.get(series); } @@ -404,6 +414,7 @@ * * @see #getSeriesToolTipGenerator(int) */ + @Override public void setSeriesToolTipGenerator(int series, CategoryToolTipGenerator generator) { this.toolTipGeneratorList.set(series, generator); @@ -417,6 +428,7 @@ * * @see #setBaseToolTipGenerator(CategoryToolTipGenerator) */ + @Override public CategoryToolTipGenerator getBaseToolTipGenerator() { return this.baseToolTipGenerator; } @@ -429,6 +441,7 @@ * * @see #getBaseToolTipGenerator() */ + @Override public void setBaseToolTipGenerator(CategoryToolTipGenerator generator) { this.baseToolTipGenerator = generator; fireChangeEvent(); @@ -446,6 +459,7 @@ * * @return The URL generator. */ + @Override public CategoryURLGenerator getItemURLGenerator(int row, int column) { return getSeriesItemURLGenerator(row); } @@ -459,6 +473,7 @@ * * @see #setSeriesItemURLGenerator(int, CategoryURLGenerator) */ + @Override public CategoryURLGenerator getSeriesItemURLGenerator(int series) { // return the generator for ALL series, if there is one... @@ -485,6 +500,7 @@ * * @see #getSeriesItemURLGenerator(int) */ + @Override public void setSeriesItemURLGenerator(int series, CategoryURLGenerator generator) { this.itemURLGeneratorList.set(series, generator); @@ -498,6 +514,7 @@ * * @see #setBaseItemURLGenerator(CategoryURLGenerator) */ + @Override public CategoryURLGenerator getBaseItemURLGenerator() { return this.baseItemURLGenerator; } @@ -510,6 +527,7 @@ * * @see #getBaseItemURLGenerator() */ + @Override public void setBaseItemURLGenerator(CategoryURLGenerator generator) { this.baseItemURLGenerator = generator; fireChangeEvent(); @@ -566,6 +584,7 @@ * * @return The renderer state. */ + @Override public CategoryItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea, CategoryPlot plot, int rendererIndex, PlotRenderingInfo info) { @@ -605,6 +624,7 @@ * @return The range (or <code>null</code> if the dataset is * <code>null</code> or empty). */ + @Override public Range findRangeBounds(CategoryDataset dataset) { return findRangeBounds(dataset, false); } @@ -656,6 +676,7 @@ * * @since 1.0.11 */ + @Override public double getItemMiddle(Comparable rowKey, Comparable columnKey, CategoryDataset dataset, CategoryAxis axis, Rectangle2D area, RectangleEdge edge) { @@ -672,6 +693,7 @@ * @param plot the plot. * @param dataArea the data area. */ + @Override public void drawBackground(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea) { plot.drawBackground(g2, dataArea); @@ -686,6 +708,7 @@ * @param plot the plot. * @param dataArea the data area. */ + @Override public void drawOutline(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea) { plot.drawOutline(g2, dataArea); @@ -707,6 +730,7 @@ * @see #drawRangeGridline(Graphics2D, CategoryPlot, ValueAxis, * Rectangle2D, double) */ + @Override public void drawDomainGridline(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea, double value) { @@ -749,6 +773,7 @@ * * @see #drawDomainGridline(Graphics2D, CategoryPlot, Rectangle2D, double) */ + @Override public void drawRangeGridline(Graphics2D g2, CategoryPlot plot, ValueAxis axis, Rectangle2D dataArea, double value) { @@ -841,6 +866,7 @@ * @see #drawRangeMarker(Graphics2D, CategoryPlot, ValueAxis, Marker, * Rectangle2D) */ + @Override public void drawDomainMarker(Graphics2D g2, CategoryPlot plot, CategoryAxis axis, CategoryMarker marker, Rectangle2D dataArea) { @@ -924,6 +950,7 @@ * @see #drawDomainMarker(Graphics2D, CategoryPlot, CategoryAxis, * CategoryMarker, Rectangle2D) */ + @Override public void drawRangeMarker(Graphics2D g2, CategoryPlot plot, ValueAxis axis, Marker marker, Rectangle2D dataArea) { @@ -1152,6 +1179,7 @@ * * @see #getLegendItems() */ + @Override public LegendItem getLegendItem(int datasetIndex, int series) { CategoryPlot p = getPlot(); @@ -1204,6 +1232,7 @@ * * @return <code>true</code> or <code>false</code>. */ + @Override public boolean equals(Object obj) { if (obj == this) { @@ -1270,6 +1299,7 @@ * * @return The hash code. */ + @Override public int hashCode() { int result = super.hashCode(); return result; @@ -1280,6 +1310,7 @@ * * @return The drawing supplier (possibly <code>null</code>). */ + @Override public DrawingSupplier getDrawingSupplier() { DrawingSupplier result = null; CategoryPlot cp = getPlot(); @@ -1352,7 +1383,7 @@ g2.setFont(labelFont); g2.setPaint(paint); String label = generator.generateLabel(dataset, row, column); - ItemLabelPosition position = null; + ItemLabelPosition position; if (!negative) { position = getPositiveItemLabelPosition(row, column); } @@ -1379,6 +1410,7 @@ * belonging to the renderer does not support cloning (for example, * an item label generator). */ + @Override public Object clone() throws CloneNotSupportedException { AbstractCategoryItemRenderer clone @@ -1526,6 +1558,7 @@ * * @see #getLegendItem(int, int) */ + @Override public LegendItemCollection getLegendItems() { LegendItemCollection result = new LegendItemCollection(); if (this.plot == null) { @@ -1748,6 +1781,7 @@ * CategoryItemLabelGenerator)} and * {@link #setBaseItemLabelGenerator(CategoryItemLabelGenerator)}. */ + @Override public void setItemLabelGenerator(CategoryItemLabelGenerator generator) { this.itemLabelGenerator = generator; fireChangeEvent(); @@ -1765,6 +1799,7 @@ * It is sufficient to rely on {@link #getSeriesToolTipGenerator(int)} * and {@link #getBaseToolTipGenerator()}. */ + @Override public CategoryToolTipGenerator getToolTipGenerator() { return this.toolTipGenerator; } @@ -1783,6 +1818,7 @@ * CategoryToolTipGenerator)} and * {@link #setBaseToolTipGenerator(CategoryToolTipGenerator)}. */ + @Override public void setToolTipGenerator(CategoryToolTipGenerator generator) { this.toolTipGenerator = generator; fireChangeEvent(); @@ -1799,6 +1835,7 @@ * CategoryURLGenerator)} and * {@link #setBaseItemURLGenerator(CategoryURLGenerator)}. */ + @Override public void setItemURLGenerator(CategoryURLGenerator generator) { this.itemURLGenerator = generator; fireChangeEvent(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-07-01 15:39:05
|
Revision: 3231 http://sourceforge.net/p/jfreechart/code/3231 Author: mungady Date: 2014-07-01 15:38:57 +0000 (Tue, 01 Jul 2014) Log Message: ----------- 2014-07-01 David Gilbert <dav...@ob...> * org/jfree/chart/plot/Marker.java (labelBackgroundColor): New field, (Marker): Initialise new field, (getLabelBackgroundColor): New method, (setLabelBackgroundColor): Likewise, (equals): Check new field, * org/jfree/chart/renderer/AbstractCategoryItemRenderer.java (drawRangeMarker): Paint background color. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-07-01 15:35:39 UTC (rev 3230) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2014-07-01 15:38:57 UTC (rev 3231) @@ -111,6 +111,7 @@ package org.jfree.chart.renderer.category; import java.awt.AlphaComposite; +import java.awt.Color; import java.awt.Composite; import java.awt.Font; import java.awt.GradientPaint; @@ -153,6 +154,7 @@ import org.jfree.chart.urls.CategoryURLGenerator; import org.jfree.chart.util.CloneUtils; import org.jfree.chart.util.ParamChecks; +import org.jfree.chart.util.TextUtils; import org.jfree.data.Range; import org.jfree.data.category.CategoryDataset; import org.jfree.data.general.DatasetUtilities; @@ -993,12 +995,17 @@ if (label != null) { Font labelFont = marker.getLabelFont(); g2.setFont(labelFont); - g2.setPaint(marker.getLabelPaint()); Point2D coordinates = calculateRangeMarkerTextAnchorPoint( g2, orientation, dataArea, line.getBounds2D(), marker.getLabelOffset(), LengthAdjustmentType.EXPAND, anchor); - TextUtilities.drawAlignedString(label, g2, + Rectangle2D rect = TextUtils.calcAlignedStringBounds(label, g2, + (float) coordinates.getX(), (float) coordinates.getY(), + marker.getLabelTextAnchor()); + g2.setPaint(marker.getLabelBackgroundColor()); + g2.fill(rect); + g2.setPaint(marker.getLabelPaint()); + TextUtils.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2016-01-16 17:36:54
|
Revision: 3331 http://sourceforge.net/p/jfreechart/code/3331 Author: mungady Date: 2016-01-16 17:36:52 +0000 (Sat, 16 Jan 2016) Log Message: ----------- Fill background for marker labels. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2015-11-24 17:17:36 UTC (rev 3330) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2016-01-16 17:36:52 UTC (rev 3331) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2016, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------------------- * AbstractCategoryItemRenderer.java * --------------------------------- - * (C) Copyright 2002-2014, by Object Refinery Limited. + * (C) Copyright 2002-2016, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Richard Atkinson; @@ -253,10 +253,10 @@ /** * Returns the plot that the renderer has been assigned to (where - * <code>null</code> indicates that the renderer is not currently assigned + * {@code null} indicates that the renderer is not currently assigned * to a plot). * - * @return The plot (possibly <code>null</code>). + * @return The plot (possibly {@code null}). * * @see #setPlot(CategoryPlot) */ @@ -270,7 +270,7 @@ * usually called by the {@link CategoryPlot}, in normal usage you * shouldn't need to call this method directly. * - * @param plot the plot (<code>null</code> not permitted). + * @param plot the plot ({@code null} not permitted). * * @see #getPlot() */ @@ -291,7 +291,7 @@ * @param row the row index (zero based). * @param column the column index (zero based). * - * @return The generator (possibly <code>null</code>). + * @return The generator (possibly {@code null}). */ @Override public CategoryItemLabelGenerator getItemLabelGenerator(int row, @@ -304,7 +304,7 @@ * * @param series the series index (zero based). * - * @return The generator (possibly <code>null</code>). + * @return The generator (possibly {@code null}). * * @see #setSeriesItemLabelGenerator(int, CategoryItemLabelGenerator) */ @@ -330,7 +330,7 @@ * {@link RendererChangeEvent} to all registered listeners. * * @param series the series index (zero based). - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getSeriesItemLabelGenerator(int) */ @@ -344,7 +344,7 @@ /** * Returns the base item label generator. * - * @return The generator (possibly <code>null</code>). + * @return The generator (possibly {@code null}). * * @see #setBaseItemLabelGenerator(CategoryItemLabelGenerator) */ @@ -357,7 +357,7 @@ * Sets the base item label generator and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getBaseItemLabelGenerator() */ @@ -380,7 +380,7 @@ * @param row the row index (zero-based). * @param column the column index (zero-based). * - * @return The generator (possibly <code>null</code>). + * @return The generator (possibly {@code null}). */ @Override public CategoryToolTipGenerator getToolTipGenerator(int row, int column) { @@ -404,7 +404,7 @@ * * @param series the series index (zero-based). * - * @return The tool tip generator (possibly <code>null</code>). + * @return The tool tip generator (possibly {@code null}). * * @see #setSeriesToolTipGenerator(int, CategoryToolTipGenerator) */ @@ -418,7 +418,7 @@ * {@link RendererChangeEvent} to all registered listeners. * * @param series the series index (zero-based). - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getSeriesToolTipGenerator(int) */ @@ -432,7 +432,7 @@ /** * Returns the base tool tip generator (the "layer 2" generator). * - * @return The tool tip generator (possibly <code>null</code>). + * @return The tool tip generator (possibly {@code null}). * * @see #setBaseToolTipGenerator(CategoryToolTipGenerator) */ @@ -445,7 +445,7 @@ * Sets the base tool tip generator and sends a {@link RendererChangeEvent} * to all registered listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getBaseToolTipGenerator() */ @@ -527,7 +527,7 @@ * Sets the base item URL generator and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the item URL generator (<code>null</code> permitted). + * @param generator the item URL generator ({@code null} permitted). * * @see #getBaseItemURLGenerator() */ @@ -563,9 +563,9 @@ * PlotRenderingInfo)} method. Subclasses can override this method if * they need to use a subclass of {@link CategoryItemRendererState}. * - * @param info collects plot rendering info (<code>null</code> permitted). + * @param info collects plot rendering info ({@code null} permitted). * - * @return The new state instance (never <code>null</code>). + * @return The new state instance (never {@code null}). * * @since 1.0.5 */ @@ -584,7 +584,7 @@ * @param plot the plot. * @param rendererIndex the renderer index. * @param info an object for returning information about the structure of - * the plot (<code>null</code> permitted). + * the plot ({@code null} permitted). * * @return The renderer state. */ @@ -641,10 +641,10 @@ * 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). + * @param dataset the dataset ({@code null} permitted). * - * @return The range (or <code>null</code> if the dataset is - * <code>null</code> or empty). + * @return The range (or {@code null} if the dataset is + * {@code null} or empty). */ @Override public Range findRangeBounds(CategoryDataset dataset) { @@ -655,10 +655,10 @@ * 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). + * @param dataset the dataset ({@code null} permitted). * @param includeInterval include the y-interval if the dataset has one. * - * @return The range (<code>null</code> if the dataset is <code>null</code> + * @return The range ({@code null} if the dataset is {@code null} * or empty). * * @since 1.0.13 @@ -841,8 +841,8 @@ * @param dataArea the area for plotting data (not yet adjusted for any 3D * effect). * @param value the value at which the grid line should be drawn. - * @param paint the paint (<code>null</code> not permitted). - * @param stroke the stroke (<code>null</code> not permitted). + * @param paint the paint ({@code null} not permitted). + * @param stroke the stroke ({@code null} not permitted). * * @see #drawRangeGridline * @@ -881,11 +881,11 @@ /** * Draws a marker for the domain axis. * - * @param g2 the graphics device (not <code>null</code>). - * @param plot the plot (not <code>null</code>). - * @param axis the range axis (not <code>null</code>). - * @param marker the marker to be drawn (not <code>null</code>). - * @param dataArea the area inside the axes (not <code>null</code>). + * @param g2 the graphics device (not {@code null}). + * @param plot the plot (not {@code null}). + * @param axis the range axis (not {@code null}). + * @param marker the marker to be drawn (not {@code null}). + * @param dataArea the area inside the axes (not {@code null}). * * @see #drawRangeMarker(Graphics2D, CategoryPlot, ValueAxis, Marker, * Rectangle2D) @@ -967,11 +967,11 @@ /** * Draws a marker for the range axis. * - * @param g2 the graphics device (not <code>null</code>). - * @param plot the plot (not <code>null</code>). - * @param axis the range axis (not <code>null</code>). - * @param marker the marker to be drawn (not <code>null</code>). - * @param dataArea the area inside the axes (not <code>null</code>). + * @param g2 the graphics device (not {@code null}). + * @param plot the plot (not {@code null}). + * @param axis the range axis (not {@code null}). + * @param marker the marker to be drawn (not {@code null}). + * @param dataArea the area inside the axes (not {@code null}). * * @see #drawDomainMarker(Graphics2D, CategoryPlot, CategoryAxis, * CategoryMarker, Rectangle2D) @@ -1101,8 +1101,7 @@ line.setLine(x0, end2d, x1, end2d); g2.draw(line); } - } - else { // PlotOrientation.HORIZONTAL + } else { // PlotOrientation.HORIZONTAL Line2D line = new Line2D.Double(); double y0 = dataArea.getMinY(); double y1 = dataArea.getMaxY(); @@ -1124,13 +1123,18 @@ if (label != null) { Font labelFont = marker.getLabelFont(); g2.setFont(labelFont); - g2.setPaint(marker.getLabelPaint()); - Point2D coordinates = calculateRangeMarkerTextAnchorPoint( + Point2D coords = calculateRangeMarkerTextAnchorPoint( g2, orientation, dataArea, rect, marker.getLabelOffset(), marker.getLabelOffsetType(), anchor); + Rectangle2D r = TextUtils.calcAlignedStringBounds(label, + g2, (float) coords.getX(), (float) coords.getY(), + marker.getLabelTextAnchor()); + g2.setPaint(marker.getLabelBackgroundColor()); + g2.fill(r); + g2.setPaint(marker.getLabelPaint()); TextUtilities.drawAlignedString(label, g2, - (float) coordinates.getX(), (float) coordinates.getY(), + (float) coords.getX(), (float) coords.getY(), marker.getLabelTextAnchor()); } g2.setComposite(savedComposite); @@ -1138,8 +1142,8 @@ } /** - * Calculates the (x, y) coordinates for drawing the label for a marker on - * the range axis. + * Calculates the {@code (x, y)} coordinates for drawing the label for a + * marker on the range axis. * * @param g2 the graphics device. * @param orientation the plot orientation. @@ -1160,13 +1164,11 @@ if (orientation == PlotOrientation.HORIZONTAL) { anchorRect = markerOffset.createAdjustedRectangle(markerArea, LengthAdjustmentType.CONTRACT, labelOffsetType); - } - else if (orientation == PlotOrientation.VERTICAL) { + } else if (orientation == PlotOrientation.VERTICAL) { anchorRect = markerOffset.createAdjustedRectangle(markerArea, labelOffsetType, LengthAdjustmentType.CONTRACT); } return RectangleAnchor.coordinates(anchorRect, anchor); - } /** @@ -1191,8 +1193,7 @@ if (orientation == PlotOrientation.HORIZONTAL) { anchorRect = markerOffset.createAdjustedRectangle(markerArea, labelOffsetType, LengthAdjustmentType.CONTRACT); - } - else if (orientation == PlotOrientation.VERTICAL) { + } else if (orientation == PlotOrientation.VERTICAL) { anchorRect = markerOffset.createAdjustedRectangle(markerArea, LengthAdjustmentType.CONTRACT, labelOffsetType); } @@ -1202,13 +1203,13 @@ /** * Returns a legend item for a series. This default implementation will - * return <code>null</code> if {@link #isSeriesVisible(int)} or - * {@link #isSeriesVisibleInLegend(int)} returns <code>false</code>. + * return {@code null} if {@link #isSeriesVisible(int)} or + * {@link #isSeriesVisibleInLegend(int)} returns {@code false}. * * @param datasetIndex the dataset index (zero-based). * @param series the series index (zero-based). * - * @return The legend item (possibly <code>null</code>). + * @return The legend item (possibly {@code null}). * * @see #getLegendItems() */ @@ -1263,7 +1264,7 @@ * * @param obj the object. * - * @return <code>true</code> or <code>false</code>. + * @return {@code true} or {@code false}. */ @Override public boolean equals(Object obj) { @@ -1340,7 +1341,7 @@ /** * Returns the drawing supplier from the plot. * - * @return The drawing supplier (possibly <code>null</code>). + * @return The drawing supplier (possibly {@code null}). */ @Override public DrawingSupplier getDrawingSupplier() { @@ -1357,7 +1358,7 @@ * if it meets the criteria (usually means the (x, y) coordinate is the * closest to the anchor point so far). * - * @param crosshairState the crosshair state (<code>null</code> permitted, + * @param crosshairState the crosshair state ({@code null} permitted, * but the method does nothing in that case). * @param rowKey the row key. * @param columnKey the column key. @@ -1365,7 +1366,7 @@ * @param datasetIndex the dataset index. * @param transX the x-value translated to Java2D space. * @param transY the y-value translated to Java2D space. - * @param orientation the plot orientation (<code>null</code> not + * @param orientation the plot orientation ({@code null} not * permitted). * * @since 1.0.11 @@ -1433,7 +1434,7 @@ } /** - * Returns an independent copy of the renderer. The <code>plot</code> + * Returns an independent copy of the renderer. The {@code plot} * reference is shallow copied. * * @return A clone. @@ -1585,7 +1586,7 @@ * Returns a (possibly empty) collection of legend items for the series * that this renderer is responsible for drawing. * - * @return The legend item collection (never <code>null</code>). + * @return The legend item collection (never {@code null}). * * @see #getLegendItem(int, int) */ @@ -1627,7 +1628,7 @@ /** * Returns the legend item label generator. * - * @return The label generator (never <code>null</code>). + * @return The label generator (never {@code null}). * * @see #setLegendItemLabelGenerator(CategorySeriesLabelGenerator) */ @@ -1639,7 +1640,7 @@ * Sets the legend item label generator and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the generator (<code>null</code> not permitted). + * @param generator the generator ({@code null} not permitted). * * @see #getLegendItemLabelGenerator() */ @@ -1653,7 +1654,7 @@ /** * Returns the legend item tool tip generator. * - * @return The tool tip generator (possibly <code>null</code>). + * @return The tool tip generator (possibly {@code null}). * * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator) */ @@ -1665,7 +1666,7 @@ * Sets the legend item tool tip generator and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #setLegendItemToolTipGenerator(CategorySeriesLabelGenerator) */ @@ -1678,7 +1679,7 @@ /** * Returns the legend item URL generator. * - * @return The URL generator (possibly <code>null</code>). + * @return The URL generator (possibly {@code null}). * * @see #setLegendItemURLGenerator(CategorySeriesLabelGenerator) */ @@ -1690,7 +1691,7 @@ * Sets the legend item URL generator and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getLegendItemURLGenerator() */ @@ -1707,7 +1708,7 @@ * @param dataset the dataset. * @param row the row index. * @param column the column index. - * @param hotspot the hotspot (<code>null</code> not permitted). + * @param hotspot the hotspot ({@code null} not permitted). */ protected void addItemEntity(EntityCollection entities, CategoryDataset dataset, int row, int column, Shape hotspot) { @@ -1734,15 +1735,15 @@ * Adds an entity to the collection. * * @param entities the entity collection being populated. - * @param hotspot the entity area (if <code>null</code> a default will be + * @param hotspot the entity area (if {@code null} a default will be * used). * @param dataset the dataset. * @param row the series. * @param column the item. * @param entityX the entity's center x-coordinate in user space (only - * used if <code>area</code> is <code>null</code>). + * used if {@code area} is {@code null}). * @param entityY the entity's center y-coordinate in user space (only - * used if <code>area</code> is <code>null</code>). + * used if {@code area} is {@code null}). * * @since 1.0.13 */ @@ -1805,7 +1806,7 @@ * Sets the item label generator for ALL series and sends a * {@link RendererChangeEvent} to all registered listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @deprecated This method should no longer be used (as of version 1.0.6). * It is sufficient to rely on {@link #setSeriesItemLabelGenerator(int, @@ -1822,7 +1823,7 @@ * Returns the tool tip generator that will be used for ALL items in the * dataset (the "layer 0" generator). * - * @return A tool tip generator (possibly <code>null</code>). + * @return A tool tip generator (possibly {@code null}). * * @see #setToolTipGenerator(CategoryToolTipGenerator) * @@ -1840,7 +1841,7 @@ * {@link org.jfree.chart.event.RendererChangeEvent} to all registered * listeners. * - * @param generator the generator (<code>null</code> permitted). + * @param generator the generator ({@code null} permitted). * * @see #getToolTipGenerator() * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |