Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [17] trunk
|
From: <mu...@us...> - 2007-06-19 15:17:56
|
Revision: 17
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=17&view=rev
Author: mungady
Date: 2007-06-19 08:17:54 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
2007-06-19 David Gilbert <dav...@ob...>
* source/org/jfree/chart/plot/JThermometer.java
(setShowValueLines): Removed,
* source/org/jfree/chart/plot/ThermometerPlot.java
(showValueLines): Removed,
(setUnits(String)): Removed,
(getShowValueLines): Likewise,
(setShowValueLines): Likewise,
(draw): Updated for removed code,
(getMinimumVerticalDataValue): Removed,
(getMaximumVerticalDataValue): Likewise,
(equals): Updated for removed fields,
* tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java
(testEquals): Updated for removed fields,
(testSetUnits): Removed.
Modified Paths:
--------------
trunk/ChangeLog
trunk/source/org/jfree/chart/plot/JThermometer.java
trunk/source/org/jfree/chart/plot/ThermometerPlot.java
trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-19 15:09:06 UTC (rev 16)
+++ trunk/ChangeLog 2007-06-19 15:17:54 UTC (rev 17)
@@ -1,5 +1,22 @@
2007-06-19 David Gilbert <dav...@ob...>
+ * source/org/jfree/chart/plot/JThermometer.java
+ (setShowValueLines): Removed,
+ * source/org/jfree/chart/plot/ThermometerPlot.java
+ (showValueLines): Removed,
+ (setUnits(String)): Removed,
+ (getShowValueLines): Likewise,
+ (setShowValueLines): Likewise,
+ (draw): Updated for removed code,
+ (getMinimumVerticalDataValue): Removed,
+ (getMaximumVerticalDataValue): Likewise,
+ (equals): Updated for removed fields,
+ * tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java
+ (testEquals): Updated for removed fields,
+ (testSetUnits): Removed.
+
+2007-06-19 David Gilbert <dav...@ob...>
+
* source/org/jfree/chart/plot/ContourPlotUtilities.java: Removed,
* source/org/jfree/chart/plot/ContourValuePlot.java: Likewise.
Modified: trunk/source/org/jfree/chart/plot/JThermometer.java
===================================================================
--- trunk/source/org/jfree/chart/plot/JThermometer.java 2007-06-19 15:09:06 UTC (rev 16)
+++ trunk/source/org/jfree/chart/plot/JThermometer.java 2007-06-19 15:17:54 UTC (rev 17)
@@ -347,15 +347,6 @@
}
/**
- * Sets the flag that controls whether or not value lines are displayed.
- *
- * @param b the new flag value.
- */
- public void setShowValueLines(boolean b) {
- this.plot.setShowValueLines(b);
- }
-
- /**
* Sets the location for the axis.
*
* @param location the location.
Modified: trunk/source/org/jfree/chart/plot/ThermometerPlot.java
===================================================================
--- trunk/source/org/jfree/chart/plot/ThermometerPlot.java 2007-06-19 15:09:06 UTC (rev 16)
+++ trunk/source/org/jfree/chart/plot/ThermometerPlot.java 2007-06-19 15:17:54 UTC (rev 17)
@@ -81,6 +81,7 @@
* deprecated get/setShowValueLines(), deprecated
* getMinimum/MaximumVerticalDataValue(), and fixed serialization
* bug (DG);
+ * 19-Jun-2007 : Removed deprecated code (DG);
*
*/
@@ -267,9 +268,6 @@
/** The default paint for the mercury in the thermometer. */
private transient Paint mercuryPaint = Color.lightGray;
- /** A flag that controls whether value lines are drawn. */
- private boolean showValueLines = false;
-
/** The display sub-range. */
private int subrange = -1;
@@ -594,28 +592,6 @@
}
/**
- * Sets the unit type.
- *
- * @param u the unit type (<code>null</code> ignored).
- *
- * @deprecated Use setUnits(int) instead. Deprecated as of version 1.0.6,
- * because this method is a little obscure and redundant anyway.
- */
- public void setUnits(String u) {
- if (u == null) {
- return;
- }
-
- u = u.toUpperCase().trim();
- for (int i = 0; i < UNITS.length; ++i) {
- if (u.equals(UNITS[i].toUpperCase().trim())) {
- setUnits(i);
- i = UNITS.length;
- }
- }
- }
-
- /**
* Returns a code indicating the location at which the value label is
* displayed.
*
@@ -781,35 +757,6 @@
}
/**
- * Returns the flag that controls whether not value lines are displayed.
- *
- * @return The flag.
- *
- * @see #setShowValueLines(boolean)
- *
- * @deprecated This flag doesn't do anything useful/visible. Deprecated
- * as of version 1.0.6.
- */
- public boolean getShowValueLines() {
- return this.showValueLines;
- }
-
- /**
- * Sets the display as to whether to show value lines in the output.
- *
- * @param b Whether to show value lines in the thermometer
- *
- * @see #getShowValueLines()
- *
- * @deprecated This flag doesn't do anything useful/visible. Deprecated
- * as of version 1.0.6.
- */
- public void setShowValueLines(boolean b) {
- this.showValueLines = b;
- notifyListeners(new PlotChangeEvent(this));
- }
-
- /**
* Sets information for a particular range.
*
* @param range the range to specify information about.
@@ -1093,9 +1040,6 @@
// draw the axis...
if ((this.rangeAxis != null) && (this.axisLocation != NONE)) {
int drawWidth = AXIS_GAP;
- if (this.showValueLines) {
- drawWidth += COLUMN_DIAMETER;
- }
Rectangle2D drawArea;
double cursor = 0;
@@ -1216,34 +1160,6 @@
}
/**
- * Returns the minimum value in either the domain or the range, whichever
- * is displayed against the vertical axis for the particular type of plot
- * implementing this interface.
- *
- * @return The minimum value in either the domain or the range.
- *
- * @deprecated This method is not used. Officially deprecated in version
- * 1.0.6.
- */
- public Number getMinimumVerticalDataValue() {
- return new Double(this.lowerBound);
- }
-
- /**
- * Returns the maximum value in either the domain or the range, whichever
- * is displayed against the vertical axis for the particular type of plot
- * implementing this interface.
- *
- * @return The maximum value in either the domain or the range
- *
- * @deprecated This method is not used. Officially deprecated in version
- * 1.0.6.
- */
- public Number getMaximumVerticalDataValue() {
- return new Double(this.upperBound);
- }
-
- /**
* Returns the data range.
*
* @param axis the axis.
@@ -1395,9 +1311,6 @@
if (!PaintUtilities.equal(this.mercuryPaint, that.mercuryPaint)) {
return false;
}
- if (this.showValueLines != that.showValueLines) {
- return false;
- }
if (this.subrange != that.subrange) {
return false;
}
Modified: trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java
===================================================================
--- trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2007-06-19 15:09:06 UTC (rev 16)
+++ trunk/tests/org/jfree/chart/plot/junit/ThermometerPlotTests.java 2007-06-19 15:17:54 UTC (rev 17)
@@ -39,6 +39,7 @@
* 26-Mar-2003 : Version 1 (DG);
* 30-Apr-2007 : Added new serialization test (DG);
* 03-May-2007 : Added cloning test (DG);
+ * 19-Jun-2007 : Updated for removal of deprecated methods (DG);
*
*/
@@ -162,12 +163,6 @@
7.0f, 6.0f, Color.blue));
assertTrue(p2.equals(p1));
- // showValueLines
- p1.setShowValueLines(true);
- assertFalse(p1.equals(p2));
- p2.setShowValueLines(true);
- assertTrue(p2.equals(p1));
-
p1.setSubrange(1, 1.0, 2.0);
assertFalse(p1.equals(p2));
p2.setSubrange(1, 1.0, 2.0);
@@ -250,16 +245,5 @@
}
assertTrue(p1.equals(p2));
}
-
- /**
- * Some checks for the setUnits() method.
- */
- public void testSetUnits() {
- ThermometerPlot p1 = new ThermometerPlot();
- assertEquals(ThermometerPlot.UNITS_CELCIUS, p1.getUnits());
- p1.setUnits("FAHRENHEIT"); // this doesn't work
- assertEquals(ThermometerPlot.UNITS_CELCIUS, p1.getUnits());
- p1.setUnits("\u00B0F"); // ...but this does!
- assertEquals(ThermometerPlot.UNITS_FAHRENHEIT, p1.getUnits());
- }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|