Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [98] trunk
|
From: <mu...@us...> - 2007-07-02 15:44:26
|
Revision: 98
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=98&view=rev
Author: mungady
Date: 2007-07-02 08:44:24 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
2007-07-02 David Gilbert <dav...@ob...>
* source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
(shapesFilled): Removed,
(StandardXYItemRenderer): Updated for removed field,
(getItemShapeFilled): Likewise,
(getShapesFilled): Removed,
(setShapesFilled): Likewise,
(equals): Updated for removed field.
Modified Paths:
--------------
trunk/ChangeLog
trunk/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-02 15:39:06 UTC (rev 97)
+++ trunk/ChangeLog 2007-07-02 15:44:24 UTC (rev 98)
@@ -1,5 +1,15 @@
2007-07-02 David Gilbert <dav...@ob...>
+ * source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
+ (shapesFilled): Removed,
+ (StandardXYItemRenderer): Updated for removed field,
+ (getItemShapeFilled): Likewise,
+ (getShapesFilled): Removed,
+ (setShapesFilled): Likewise,
+ (equals): Updated for removed field.
+
+2007-07-02 David Gilbert <dav...@ob...>
+
* source/org/jfree/chart/editor/DefaultPlotEditor.java
(updatePlotProperties): Updated for changes to LineAndShapeRenderer,
* source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java
Modified: trunk/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
===================================================================
--- trunk/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java 2007-07-02 15:39:06 UTC (rev 97)
+++ trunk/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java 2007-07-02 15:44:24 UTC (rev 98)
@@ -105,6 +105,7 @@
* 08-Jun-2007 : Fixed bug in entity creation (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
* 27-Jun-2007 : Updated constructor for method changes in XYItemRenderer (DG);
+ * 02-Jul-2007 : Removed override field (DG);
*
*/
@@ -136,7 +137,6 @@
import org.jfree.chart.plot.XYPlot;
import org.jfree.chart.urls.XYURLGenerator;
import org.jfree.chart.util.BooleanList;
-import org.jfree.chart.util.ObjectUtilities;
import org.jfree.chart.util.PublicCloneable;
import org.jfree.chart.util.RectangleEdge;
import org.jfree.chart.util.SerialUtilities;
@@ -194,9 +194,6 @@
/** Threshold for deciding when to discontinue a line. */
private double gapThreshold = 1.0;
- /** A flag that controls whether or not shapes are filled for ALL series. */
- private Boolean shapesFilled;
-
/**
* A table of flags that control (per series) whether or not shapes are
* filled.
@@ -280,7 +277,6 @@
this.plotDiscontinuous = true;
}
- this.shapesFilled = null;
this.seriesShapesFilled = new BooleanList();
this.baseShapesFilled = true;
this.legendLine = new Line2D.Double(-7.0, 0.0, 7.0, 0.0);
@@ -331,12 +327,6 @@
* @see #getSeriesShapesFilled(int)
*/
public boolean getItemShapeFilled(int series, int item) {
- // return the overall setting, if there is one...
- if (this.shapesFilled != null) {
- return this.shapesFilled.booleanValue();
- }
-
- // otherwise look up the paint table
Boolean flag = this.seriesShapesFilled.getBoolean(series);
if (flag != null) {
return flag.booleanValue();
@@ -347,43 +337,6 @@
}
/**
- * Returns the override flag that controls whether or not shapes are filled
- * for ALL series.
- *
- * @return The flag (possibly <code>null</code>).
- *
- * @since 1.0.5
- */
- public Boolean getShapesFilled() {
- return this.shapesFilled;
- }
-
- /**
- * Sets the 'shapes filled' for ALL series.
- *
- * @param filled the flag.
- *
- * @see #setShapesFilled(Boolean)
- */
- public void setShapesFilled(boolean filled) {
- setShapesFilled(Boolean.valueOf(filled));
- }
-
- /**
- * Sets the override flag that controls whether or not shapes are filled
- * for ALL series and sends a {@link RendererChangeEvent} to all registered
- * listeners.
- *
- * @param filled the flag (<code>null</code> permitted).
- *
- * @see #setShapesFilled(boolean)
- */
- public void setShapesFilled(Boolean filled) {
- this.shapesFilled = filled;
- fireChangeEvent();
- }
-
- /**
* Returns the flag used to control whether or not the shapes for a series
* are filled.
*
@@ -1004,9 +957,6 @@
if (this.gapThreshold != that.gapThreshold) {
return false;
}
- if (!ObjectUtilities.equal(this.shapesFilled, that.shapesFilled)) {
- return false;
- }
if (!this.seriesShapesFilled.equals(that.seriesShapesFilled)) {
return false;
}
Modified: trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java
===================================================================
--- trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java 2007-07-02 15:39:06 UTC (rev 97)
+++ trunk/tests/org/jfree/chart/renderer/xy/junit/StandardXYItemRendererTests.java 2007-07-02 15:44:24 UTC (rev 98)
@@ -143,11 +143,6 @@
assertFalse(r1.equals(r2));
r2.setLegendLine(new Line2D.Double(1.0, 2.0, 3.0, 4.0));
assertTrue(r1.equals(r2));
-
- r1.setShapesFilled(false);
- assertFalse(r1.equals(r2));
- r2.setShapesFilled(false);
- assertTrue(r1.equals(r2));
r1.setSeriesShapesFilled(1, Boolean.TRUE);
assertFalse(r1.equals(r2));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|