Menu
▾
▴
jfreechart-commit — Receives automatic notification of all CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(165) |
Nov
(296) |
Dec
(92) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(84) |
Feb
(20) |
Mar
(20) |
Apr
(42) |
May
(26) |
Jun
(30) |
Jul
(77) |
Aug
(151) |
Sep
(61) |
Oct
(259) |
Nov
(160) |
Dec
(76) |
| 2007 |
Jan
(159) |
Feb
(155) |
Mar
(183) |
Apr
(113) |
May
(110) |
Jun
(178) |
Jul
(56) |
Aug
(21) |
Sep
(50) |
Oct
(251) |
Nov
(218) |
Dec
(42) |
| 2008 |
Jan
(14) |
Feb
(37) |
Mar
(60) |
Apr
(77) |
May
(146) |
Jun
(256) |
Jul
(72) |
Aug
(51) |
Sep
(283) |
Oct
(22) |
Nov
(55) |
Dec
(53) |
| 2009 |
Jan
(56) |
Feb
(45) |
Mar
(56) |
Apr
(98) |
May
(84) |
Jun
(87) |
Jul
(32) |
Aug
(6) |
Sep
(19) |
Oct
|
Nov
(10) |
Dec
(6) |
| 2010 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(158) |
Nov
(17) |
Dec
(15) |
| 2012 |
Jan
(9) |
Feb
(3) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(1) |
Jul
(22) |
Aug
(1) |
Sep
(29) |
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(259) |
Aug
(125) |
Sep
(24) |
Oct
(8) |
Nov
(132) |
Dec
(3) |
| 2014 |
Jan
(3) |
Feb
(26) |
Mar
(17) |
Apr
(8) |
May
|
Jun
(31) |
Jul
(126) |
Aug
(22) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(21) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
(19) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mu...@us...> - 2013-11-23 05:23:49
|
Revision: 3047
http://sourceforge.net/p/jfreechart/code/3047
Author: mungady
Date: 2013-11-23 05:23:46 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
2013-11-23 David Gilbert <dav...@ob...>
Bug #977:
* org/jfree/chart/axis/DateAxis.java
(DEFAULT_DATE_TICK_UNIT): Deprecated,
(DateAxis): Replace DEFAULT_DATE_TICK_UNIT with new instance.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/ChangeLog
Modified: branches/jfreechart-1.0.x-branch/ChangeLog
===================================================================
--- branches/jfreechart-1.0.x-branch/ChangeLog 2013-11-22 20:17:23 UTC (rev 3046)
+++ branches/jfreechart-1.0.x-branch/ChangeLog 2013-11-23 05:23:46 UTC (rev 3047)
@@ -1,3 +1,10 @@
+2013-11-23 David Gilbert <dav...@ob...>
+
+ Bug #977:
+ * org/jfree/chart/axis/DateAxis.java
+ (DEFAULT_DATE_TICK_UNIT): Deprecated,
+ (DateAxis): Replace DEFAULT_DATE_TICK_UNIT with new instance.
+
2013-11-22 David Gilbert <dav...@ob...>
* org/jfree/chart/util/PaintAlpha.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:17:26
|
Revision: 3046
http://sourceforge.net/p/jfreechart/code/3046
Author: mungady
Date: 2013-11-22 20:17:23 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -60,6 +60,7 @@
*
* @return The value.
*/
+ @Override
public double getStartXValue(int series, int item) {
double result = Double.NaN;
Number x = getStartX(series, item);
@@ -78,6 +79,7 @@
*
* @return The value.
*/
+ @Override
public double getEndXValue(int series, int item) {
double result = Double.NaN;
Number x = getEndX(series, item);
@@ -96,6 +98,7 @@
*
* @return The value.
*/
+ @Override
public double getStartYValue(int series, int item) {
double result = Double.NaN;
Number y = getStartY(series, item);
@@ -114,6 +117,7 @@
*
* @return The value.
*/
+ @Override
public double getEndYValue(int series, int item) {
double result = Double.NaN;
Number y = getEndY(series, item);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -58,6 +58,7 @@
*
* @return The domain order.
*/
+ @Override
public DomainOrder getDomainOrder() {
return DomainOrder.NONE;
}
@@ -70,6 +71,7 @@
*
* @return The value.
*/
+ @Override
public double getXValue(int series, int item) {
double result = Double.NaN;
Number x = getX(series, item);
@@ -87,6 +89,7 @@
*
* @return The value.
*/
+ @Override
public double getYValue(int series, int item) {
double result = Double.NaN;
Number y = getY(series, item);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -56,6 +56,7 @@
*
* @return The z-value.
*/
+ @Override
public double getZValue(int series, int item) {
double result = Double.NaN;
Number z = getZ(series, item);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -158,6 +158,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.values.getColumnCount();
}
@@ -169,6 +170,7 @@
*
* @return The key for a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.values.getColumnKey(series);
}
@@ -178,6 +180,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.values.getRowCount();
}
@@ -190,6 +193,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return getItemCount(); // all series have the same number of items in
// this dataset
@@ -203,6 +207,7 @@
*
* @return The value.
*/
+ @Override
public Number getX(int series, int item) {
return (Number) this.values.getRowKey(item);
}
@@ -215,6 +220,7 @@
*
* @return The starting X value.
*/
+ @Override
public Number getStartX(int series, int item) {
return this.intervalDelegate.getStartX(series, item);
}
@@ -227,6 +233,7 @@
*
* @return The ending X value.
*/
+ @Override
public Number getEndX(int series, int item) {
return this.intervalDelegate.getEndX(series, item);
}
@@ -239,6 +246,7 @@
*
* @return The y value (possibly <code>null</code>).
*/
+ @Override
public Number getY(int series, int item) {
return this.values.getValue(item, series);
}
@@ -251,6 +259,7 @@
*
* @return The starting Y value.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -263,6 +272,7 @@
*
* @return The ending Y value.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -275,6 +285,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
return this.intervalDelegate.getDomainLowerBound(includeInterval);
}
@@ -287,6 +298,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
return this.intervalDelegate.getDomainUpperBound(includeInterval);
}
@@ -299,6 +311,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
if (includeInterval) {
return this.intervalDelegate.getDomainBounds(includeInterval);
@@ -377,6 +390,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof CategoryTableXYDataset)) {
return false;
@@ -399,6 +413,7 @@
* @throws CloneNotSupportedException if there is some reason that cloning
* cannot be performed.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CategoryTableXYDataset clone = (CategoryTableXYDataset) super.clone();
clone.values = (DefaultKeyedValues2D) this.values.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -123,6 +123,7 @@
*
* @return The series key (never <code>null</code>).
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.seriesKey;
}
@@ -141,6 +142,7 @@
* @see #getXValue(int, int)
* @see #getXDate(int, int)
*/
+ @Override
public Number getX(int series, int item) {
return new Long(this.date[item].getTime());
}
@@ -174,6 +176,7 @@
*
* @see #getYValue(int, int)
*/
+ @Override
public Number getY(int series, int item) {
return getClose(series, item);
}
@@ -188,6 +191,7 @@
*
* @see #getHighValue(int, int)
*/
+ @Override
public Number getHigh(int series, int item) {
return this.high[item];
}
@@ -203,11 +207,12 @@
*
* @see #getHigh(int, int)
*/
+ @Override
public double getHighValue(int series, int item) {
double result = Double.NaN;
- Number high = getHigh(series, item);
- if (high != null) {
- result = high.doubleValue();
+ Number h = getHigh(series, item);
+ if (h != null) {
+ result = h.doubleValue();
}
return result;
}
@@ -222,6 +227,7 @@
*
* @see #getLowValue(int, int)
*/
+ @Override
public Number getLow(int series, int item) {
return this.low[item];
}
@@ -237,11 +243,12 @@
*
* @see #getLow(int, int)
*/
+ @Override
public double getLowValue(int series, int item) {
double result = Double.NaN;
- Number low = getLow(series, item);
- if (low != null) {
- result = low.doubleValue();
+ Number l = getLow(series, item);
+ if (l != null) {
+ result = l.doubleValue();
}
return result;
}
@@ -256,6 +263,7 @@
*
* @see #getOpenValue(int, int)
*/
+ @Override
public Number getOpen(int series, int item) {
return this.open[item];
}
@@ -271,6 +279,7 @@
*
* @see #getOpen(int, int)
*/
+ @Override
public double getOpenValue(int series, int item) {
double result = Double.NaN;
Number open = getOpen(series, item);
@@ -290,6 +299,7 @@
*
* @see #getCloseValue(int, int)
*/
+ @Override
public Number getClose(int series, int item) {
return this.close[item];
}
@@ -305,11 +315,12 @@
*
* @see #getClose(int, int)
*/
+ @Override
public double getCloseValue(int series, int item) {
double result = Double.NaN;
- Number close = getClose(series, item);
- if (close != null) {
- result = close.doubleValue();
+ Number c = getClose(series, item);
+ if (c != null) {
+ result = c.doubleValue();
}
return result;
}
@@ -324,6 +335,7 @@
*
* @see #getVolumeValue(int, int)
*/
+ @Override
public Number getVolume(int series, int item) {
return this.volume[item];
}
@@ -339,11 +351,12 @@
*
* @see #getVolume(int, int)
*/
+ @Override
public double getVolumeValue(int series, int item) {
double result = Double.NaN;
- Number volume = getVolume(series, item);
- if (volume != null) {
- result = volume.doubleValue();
+ Number v = getVolume(series, item);
+ if (v != null) {
+ result = v.doubleValue();
}
return result;
}
@@ -355,6 +368,7 @@
*
* @return The number of series.
*/
+ @Override
public int getSeriesCount() {
return 1;
}
@@ -366,6 +380,7 @@
*
* @return The number of items in the specified series.
*/
+ @Override
public int getItemCount(int series) {
return this.date.length;
}
@@ -377,6 +392,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -92,6 +92,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.seriesList.size();
}
@@ -107,6 +108,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -125,6 +127,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public int getItemCount(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -150,6 +153,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public double getXValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[0][item];
@@ -172,6 +176,7 @@
*
* @see #getY(int, int)
*/
+ @Override
public double getYValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[3][item];
@@ -194,6 +199,7 @@
*
* @see #getStartX(int, int)
*/
+ @Override
public double getStartXValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[1][item];
@@ -216,6 +222,7 @@
*
* @see #getEndX(int, int)
*/
+ @Override
public double getEndXValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[2][item];
@@ -238,6 +245,7 @@
*
* @see #getStartY(int, int)
*/
+ @Override
public double getStartYValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[4][item];
@@ -260,6 +268,7 @@
*
* @see #getEndY(int, int)
*/
+ @Override
public double getEndYValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[5][item];
@@ -282,6 +291,7 @@
*
* @see #getEndXValue(int, int)
*/
+ @Override
public Number getEndX(int series, int item) {
return new Double(getEndXValue(series, item));
}
@@ -303,6 +313,7 @@
*
* @see #getEndYValue(int, int)
*/
+ @Override
public Number getEndY(int series, int item) {
return new Double(getEndYValue(series, item));
}
@@ -324,6 +335,7 @@
*
* @see #getStartXValue(int, int)
*/
+ @Override
public Number getStartX(int series, int item) {
return new Double(getStartXValue(series, item));
}
@@ -345,6 +357,7 @@
*
* @see #getStartYValue(int, int)
*/
+ @Override
public Number getStartY(int series, int item) {
return new Double(getStartYValue(series, item));
}
@@ -366,6 +379,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -387,6 +401,7 @@
*
* @see #getYValue(int, int)
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -449,6 +464,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -502,6 +518,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.seriesKeys.hashCode();
@@ -517,6 +534,7 @@
* @throws CloneNotSupportedException if the dataset contains a series with
* a key that cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultIntervalXYDataset clone
= (DefaultIntervalXYDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -81,6 +81,7 @@
*
* @return The series key.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.key;
}
@@ -93,6 +94,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return new Long(this.data[item].getDate().getTime());
}
@@ -117,6 +119,7 @@
*
* @return The y value.
*/
+ @Override
public Number getY(int series, int item) {
return getClose(series, item);
}
@@ -129,6 +132,7 @@
*
* @return The high value.
*/
+ @Override
public Number getHigh(int series, int item) {
return this.data[item].getHigh();
}
@@ -142,6 +146,7 @@
*
* @return The high-value.
*/
+ @Override
public double getHighValue(int series, int item) {
double result = Double.NaN;
Number high = getHigh(series, item);
@@ -159,6 +164,7 @@
*
* @return The low value.
*/
+ @Override
public Number getLow(int series, int item) {
return this.data[item].getLow();
}
@@ -172,6 +178,7 @@
*
* @return The low-value.
*/
+ @Override
public double getLowValue(int series, int item) {
double result = Double.NaN;
Number low = getLow(series, item);
@@ -189,6 +196,7 @@
*
* @return The open value.
*/
+ @Override
public Number getOpen(int series, int item) {
return this.data[item].getOpen();
}
@@ -202,6 +210,7 @@
*
* @return The open-value.
*/
+ @Override
public double getOpenValue(int series, int item) {
double result = Double.NaN;
Number open = getOpen(series, item);
@@ -219,6 +228,7 @@
*
* @return The close value.
*/
+ @Override
public Number getClose(int series, int item) {
return this.data[item].getClose();
}
@@ -232,6 +242,7 @@
*
* @return The close-value.
*/
+ @Override
public double getCloseValue(int series, int item) {
double result = Double.NaN;
Number close = getClose(series, item);
@@ -249,6 +260,7 @@
*
* @return The trading volume.
*/
+ @Override
public Number getVolume(int series, int item) {
return this.data[item].getVolume();
}
@@ -262,6 +274,7 @@
*
* @return The volume-value.
*/
+ @Override
public double getVolumeValue(int series, int item) {
double result = Double.NaN;
Number volume = getVolume(series, item);
@@ -276,6 +289,7 @@
*
* @return 1.
*/
+ @Override
public int getSeriesCount() {
return 1;
}
@@ -287,6 +301,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return this.data.length;
}
@@ -305,6 +320,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -329,6 +345,7 @@
*
* @throws CloneNotSupportedException
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultOHLCDataset clone = (DefaultOHLCDataset) super.clone();
clone.data = new OHLCDataItem[this.data.length];
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -210,6 +210,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.data.size();
}
@@ -219,6 +220,7 @@
*
* @return The number of x values in the dataset.
*/
+ @Override
public int getItemCount() {
if (this.xPoints == null) {
return 0;
@@ -249,6 +251,7 @@
*
* @return The key for a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
// check arguments...delegated
return getSeries(series).getKey();
@@ -261,6 +264,7 @@
*
* @return The number of items in the specified series.
*/
+ @Override
public int getItemCount(int series) {
// check arguments...delegated
return getSeries(series).getItemCount();
@@ -274,6 +278,7 @@
*
* @return The x-value for the specified series and item.
*/
+ @Override
public Number getX(int series, int item) {
XYSeries s = (XYSeries) this.data.get(series);
return s.getX(item);
@@ -288,6 +293,7 @@
*
* @return The starting X value.
*/
+ @Override
public Number getStartX(int series, int item) {
return this.intervalDelegate.getStartX(series, item);
}
@@ -300,6 +306,7 @@
*
* @return The ending X value.
*/
+ @Override
public Number getEndX(int series, int item) {
return this.intervalDelegate.getEndX(series, item);
}
@@ -313,6 +320,7 @@
* @return The y-value for the specified series and item (possibly
* <code>null</code>).
*/
+ @Override
public Number getY(int series, int index) {
XYSeries s = (XYSeries) this.data.get(series);
return s.getY(index);
@@ -326,6 +334,7 @@
*
* @return The starting Y value.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -338,6 +347,7 @@
*
* @return The ending Y value.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -463,6 +473,7 @@
*
* @param event information about the change.
*/
+ @Override
public void seriesChanged(SeriesChangeEvent event) {
if (this.propagateEvents) {
updateXPoints();
@@ -477,6 +488,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -505,6 +517,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = (this.data != null ? this.data.hashCode() : 0);
@@ -523,6 +536,7 @@
* @throws CloneNotSupportedException if there is some reason that cloning
* cannot be performed.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultTableXYDataset clone = (DefaultTableXYDataset) super.clone();
int seriesCount = this.data.size();
@@ -550,6 +564,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
return this.intervalDelegate.getDomainLowerBound(includeInterval);
}
@@ -562,6 +577,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
return this.intervalDelegate.getDomainUpperBound(includeInterval);
}
@@ -574,6 +590,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
if (includeInterval) {
return this.intervalDelegate.getDomainBounds(includeInterval);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -173,6 +173,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.allSeriesData.size();
}
@@ -184,6 +185,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
if (series < 0 || series >= getSeriesCount()) {
throw new IllegalArgumentException("Invalid series index: "
@@ -200,6 +202,7 @@
*
* @return The series key.
*/
+ @Override
public Comparable getSeriesKey(int series) {
if (series < 0 || series >= getSeriesCount()) {
throw new IllegalArgumentException("Invalid series index: "
@@ -218,6 +221,7 @@
*
* @return The x-value for the item within the series.
*/
+ @Override
public Number getX(int series, int item) {
List oneSeriesData = (List) this.allSeriesData.get(series);
WindDataItem windItem = (WindDataItem) oneSeriesData.get(item);
@@ -234,6 +238,7 @@
*
* @return The y-value for the item within the series.
*/
+ @Override
public Number getY(int series, int item) {
return getWindForce(series, item);
}
@@ -247,6 +252,7 @@
*
* @return The wind direction for the item within the series.
*/
+ @Override
public Number getWindDirection(int series, int item) {
List oneSeriesData = (List) this.allSeriesData.get(series);
WindDataItem windItem = (WindDataItem) oneSeriesData.get(item);
@@ -262,6 +268,7 @@
*
* @return The wind force for the item within the series.
*/
+ @Override
public Number getWindForce(int series, int item) {
List oneSeriesData = (List) this.allSeriesData.get(series);
WindDataItem windItem = (WindDataItem) oneSeriesData.get(item);
@@ -278,14 +285,12 @@
* @throws NullPointerException if <code>data</code> is <code>null</code>.
*/
public static List seriesNameListFromDataArray(Object[][] data) {
-
int seriesCount = data.length;
List seriesNameList = new java.util.ArrayList(seriesCount);
for (int i = 0; i < seriesCount; i++) {
seriesNameList.add("Series " + (i + 1));
}
return seriesNameList;
-
}
/**
@@ -303,6 +308,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -383,6 +389,7 @@
*
* @return An int that indicates the relative comparison.
*/
+ @Override
public int compareTo(Object object) {
if (object instanceof WindDataItem) {
WindDataItem item = (WindDataItem) object;
@@ -409,6 +416,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return false;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -87,6 +87,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.seriesList.size();
}
@@ -102,6 +103,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -117,6 +119,7 @@
*
* @return The index, or -1.
*/
+ @Override
public int indexOf(Comparable seriesKey) {
return this.seriesKeys.indexOf(seriesKey);
}
@@ -128,6 +131,7 @@
*
* @return <code>DomainOrder.NONE</code>.
*/
+ @Override
public DomainOrder getDomainOrder() {
return DomainOrder.NONE;
}
@@ -143,6 +147,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public int getItemCount(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -168,6 +173,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public double getXValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[0][item];
@@ -190,6 +196,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -211,6 +218,7 @@
*
* @see #getY(int, int)
*/
+ @Override
public double getYValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[1][item];
@@ -233,6 +241,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -306,6 +315,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -339,6 +349,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.seriesKeys.hashCode();
@@ -355,6 +366,7 @@
* dataset (for instance, if a non-cloneable object is used for a
* series key).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultXYDataset clone = (DefaultXYDataset) super.clone();
clone.seriesKeys = new java.util.ArrayList(this.seriesKeys);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -88,6 +88,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.seriesList.size();
}
@@ -103,6 +104,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -118,6 +120,7 @@
*
* @return The index, or -1.
*/
+ @Override
public int indexOf(Comparable seriesKey) {
return this.seriesKeys.indexOf(seriesKey);
}
@@ -129,6 +132,7 @@
*
* @return <code>DomainOrder.NONE</code>.
*/
+ @Override
public DomainOrder getDomainOrder() {
return DomainOrder.NONE;
}
@@ -144,6 +148,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public int getItemCount(int series) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException("Series index out of bounds");
@@ -169,6 +174,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public double getXValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[0][item];
@@ -191,6 +197,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -212,6 +219,7 @@
*
* @see #getY(int, int)
*/
+ @Override
public double getYValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[1][item];
@@ -234,6 +242,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -255,6 +264,7 @@
*
* @see #getZ(int, int)
*/
+ @Override
public double getZValue(int series, int item) {
double[][] seriesData = (double[][]) this.seriesList.get(series);
return seriesData[2][item];
@@ -277,6 +287,7 @@
*
* @see #getZ(int, int)
*/
+ @Override
public Number getZ(int series, int item) {
return new Double(getZValue(series, item));
}
@@ -352,6 +363,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -390,6 +402,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.seriesKeys.hashCode();
@@ -406,6 +419,7 @@
* dataset (for instance, if a non-cloneable object is used for a
* series key).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultXYZDataset clone = (DefaultXYZDataset) super.clone();
clone.seriesKeys = new java.util.ArrayList(this.seriesKeys);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -325,6 +325,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -342,6 +343,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -360,6 +362,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
// first get the range without the interval, then expand it for the
// interval width
@@ -379,6 +382,7 @@
*
* @param e the event.
*/
+ @Override
public void datasetChanged(DatasetChangeEvent e) {
// TODO: by coding the event with some information about what changed
// in the dataset, we could make the recalculation of the interval
@@ -436,6 +440,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -461,6 +466,7 @@
*
* @throws CloneNotSupportedException if the object cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -470,6 +476,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 5;
hash = HashUtilities.hashCode(hash, this.autoWidth);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -127,6 +127,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return getRowCount() * getColumnsCount();
}
@@ -210,6 +211,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -96,6 +96,7 @@
*
* @return The number of items in the specified series.
*/
+ @Override
public int getItemCount(int seriesIndex) {
return getSeries(seriesIndex).getItemCount();
}
@@ -124,6 +125,7 @@
*
* @return The number of series in the collection.
*/
+ @Override
public int getSeriesCount() {
return this.seriesList.size();
}
@@ -136,6 +138,7 @@
*
* @return The key for a series.
*/
+ @Override
public Comparable getSeriesKey(int seriesIndex) {
return getSeries(seriesIndex).getKey();
}
@@ -152,6 +155,7 @@
*
* @see org.jfree.data.xy.XYDataset#getXValue(int, int)
*/
+ @Override
public Number getX(int seriesIndex, int itemIndex) {
MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex);
int x = series.getItemColumn(itemIndex);
@@ -171,6 +175,7 @@
*
* @see org.jfree.data.xy.XYDataset#getYValue(int, int)
*/
+ @Override
public Number getY(int seriesIndex, int itemIndex) {
MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex);
int y = series.getItemRow(itemIndex);
@@ -190,6 +195,7 @@
*
* @see org.jfree.data.xy.XYZDataset#getZValue(int, int)
*/
+ @Override
public Number getZ(int seriesIndex, int itemIndex) {
MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex);
Number z = series.getItem(itemIndex);
@@ -223,6 +229,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -246,6 +253,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (this.seriesList != null ? this.seriesList.hashCode() : 0);
}
@@ -257,6 +265,7 @@
*
* @throws CloneNotSupportedException if there is a problem.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
MatrixSeriesCollection clone = (MatrixSeriesCollection) super.clone();
clone.seriesList = (List) ObjectUtilities.deepClone(this.seriesList);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -89,6 +89,7 @@
*
* @see org.jfree.data.xy.MatrixSeries#getItem(int)
*/
+ @Override
public Number getItem(int itemIndex) {
int i = getItemRow(itemIndex);
int j = getItemColumn(itemIndex);
@@ -133,6 +134,7 @@
*
* @see #get(int, int)
*/
+ @Override
public void update(int i, int j, double mij) {
this.m_totalSum -= get(i, j);
this.m_totalSum += mij;
@@ -143,6 +145,7 @@
/**
* @see org.jfree.data.xy.MatrixSeries#zeroAll()
*/
+ @Override
public void zeroAll() {
this.m_totalSum = 0;
super.zeroAll();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -157,6 +157,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -193,6 +194,7 @@
* @return A negative integer, zero, or a positive integer as this object
* is less than, equal to, or greater than the specified object.
*/
+ @Override
public int compareTo(Object object) {
if (object instanceof OHLCDataItem) {
OHLCDataItem item = (OHLCDataItem) object;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -112,6 +112,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -134,6 +135,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.x);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -102,6 +102,7 @@
*
* @return The item removed.
*/
+ @Override
public ComparableObjectItem remove(int index) {
VectorDataItem result = (VectorDataItem) this.data.remove(index);
fireSeriesChanged();
@@ -163,6 +164,7 @@
*
* @return The data item.
*/
+ @Override
public ComparableObjectItem getDataItem(int index) {
// overridden to make public
return super.getDataItem(index);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -127,6 +127,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.data.size();
}
@@ -159,6 +160,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
// defer argument checking
return getSeries(series).getKey();
@@ -187,6 +189,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* range <code>0</code> to <code>getSeriesCount() - 1</code>.
*/
+ @Override
public int getItemCount(int series) {
// defer argument checking
return getSeries(series).getItemCount();
@@ -200,6 +203,7 @@
*
* @return The x-value.
*/
+ @Override
public double getXValue(int series, int item) {
VectorSeries s = (VectorSeries) this.data.get(series);
VectorDataItem di = (VectorDataItem) s.getDataItem(item);
@@ -216,6 +220,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -228,6 +233,7 @@
*
* @return The y-value.
*/
+ @Override
public double getYValue(int series, int item) {
VectorSeries s = (VectorSeries) this.data.get(series);
VectorDataItem di = (VectorDataItem) s.getDataItem(item);
@@ -244,6 +250,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -256,6 +263,7 @@
*
* @return The vector (possibly <code>null</code>).
*/
+ @Override
public Vector getVector(int series, int item) {
VectorSeries s = (VectorSeries) this.data.get(series);
VectorDataItem di = (VectorDataItem) s.getDataItem(item);
@@ -270,6 +278,7 @@
*
* @return The x-component of the vector.
*/
+ @Override
public double getVectorXValue(int series, int item) {
VectorSeries s = (VectorSeries) this.data.get(series);
VectorDataItem di = (VectorDataItem) s.getDataItem(item);
@@ -284,6 +293,7 @@
*
* @return The y-component of the vector.
*/
+ @Override
public double getVectorYValue(int series, int item) {
VectorSeries s = (VectorSeries) this.data.get(series);
VectorDataItem di = (VectorDataItem) s.getDataItem(item);
@@ -297,6 +307,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -315,6 +326,7 @@
*
* @throws CloneNotSupportedException if there is a problem.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
VectorSeriesCollection clone
= (VectorSeriesCollection) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -150,6 +150,7 @@
*
* @return The data item.
*/
+ @Override
public ComparableObjectItem getDataItem(int index) {
return super.getDataItem(index);
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -90,6 +90,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.data.size();
}
@@ -122,6 +123,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
// defer argument checking
return getSeries(series).getKey();
@@ -137,6 +139,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* range <code>0</code> to <code>getSeriesCount() - 1</code>.
*/
+ @Override
public int getItemCount(int series) {
// defer argument checking
return getSeries(series).getItemCount();
@@ -150,6 +153,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item);
@@ -165,6 +169,7 @@
*
* @return The value.
*/
+ @Override
public double getStartXValue(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
return s.getXLowValue(item);
@@ -179,6 +184,7 @@
*
* @return The value.
*/
+ @Override
public double getEndXValue(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
return s.getXHighValue(item);
@@ -193,6 +199,7 @@
*
* @return The value.
*/
+ @Override
public double getYValue(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
return s.getYValue(item);
@@ -206,6 +213,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item);
@@ -220,6 +228,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getStartX(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item);
@@ -234,6 +243,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getEndX(int series, int item) {
XIntervalSeries s = (XIntervalSeries) this.data.get(series);
XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item);
@@ -249,6 +259,7 @@
*
* @return The start y-value.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -262,6 +273,7 @@
*
* @return The end y-value.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -325,6 +337,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -343,6 +356,7 @@
*
* @throws CloneNotSupportedException if there is a problem.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XIntervalSeriesCollection clone
= (XIntervalSeriesCollection) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -121,6 +121,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.underlying.getSeriesCount();
}
@@ -133,6 +134,7 @@
*
* @return The series key.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.underlying.getSeriesKey(series);
}
@@ -144,6 +146,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return this.underlying.getItemCount(series);
}
@@ -158,6 +161,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public Number getX(int series, int item) {
return this.underlying.getX(series, item);
}
@@ -172,6 +176,7 @@
*
* @see #getX(int, int)
*/
+ @Override
public double getXValue(int series, int item) {
return this.underlying.getXValue(series, item);
}
@@ -186,6 +191,7 @@
*
* @see #getYValue(int, int)
*/
+ @Override
public Number getY(int series, int item) {
return this.underlying.getY(series, item);
}
@@ -200,6 +206,7 @@
*
* @see #getY(int, int)
*/
+ @Override
public double getYValue(int series, int item) {
return this.underlying.getYValue(series, item);
}
@@ -212,6 +219,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartX(int series, int item) {
Number result = null;
Number xnum = this.underlying.getX(series, item);
@@ -232,6 +240,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public double getStartXValue(int series, int item) {
return getXValue(series, item) - this.barWidth / 2.0;
}
@@ -244,6 +253,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndX(int series, int item) {
Number result = null;
Number xnum = this.underlying.getX(series, item);
@@ -264,6 +274,7 @@
*
* @see #getXValue(int, int)
*/
+ @Override
public double getEndXValue(int series, int item) {
return getXValue(series, item) + this.barWidth / 2.0;
}
@@ -276,6 +287,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartY(int series, int item) {
return this.underlying.getY(series, item);
}
@@ -291,6 +303,7 @@
*
* @see #getYValue(int, int)
*/
+ @Override
public double getStartYValue(int series, int item) {
return getYValue(series, item);
}
@@ -303,6 +316,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndY(int series, int item) {
return this.underlying.getY(series, item);
}
@@ -318,6 +332,7 @@
*
* @see #getYValue(int, int)
*/
+ @Override
public double getEndYValue(int series, int item) {
return getYValue(series, item);
}
@@ -327,6 +342,7 @@
*
* @param event information about the event.
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
notifyListeners(event);
}
@@ -338,6 +354,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -369,6 +386,7 @@
* @throws CloneNotSupportedException if the dataset cannot be cloned for
* any reason.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYBarDataset clone = (XYBarDataset) super.clone();
if (this.underlying instanceof PublicCloneable) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -99,6 +99,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -121,6 +122,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.x);
@@ -136,6 +138,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "(" + this.x + ", " + this.y + ")";
}
@@ -147,6 +150,7 @@
*
* @return An integer indicating the relative order of the items.
*/
+ @Override
public int compareTo(Object obj) {
if (!(obj instanceof XYCoordinate)) {
throw new IllegalArgumentException("Incomparable object.");
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -172,6 +172,7 @@
* @return An integer indicating the order of this data pair object
* relative to another object.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -211,6 +212,7 @@
*
* @return A clone.
*/
+ @Override
public Object clone() {
Object clone = null;
try {
@@ -230,6 +232,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -252,6 +255,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.x.hashCode();
@@ -265,6 +269,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "[" + getXValue() + ", " + getYValue() + "]";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2013-11-22 20:06:28 UTC (rev 3045)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2013-11-22 20:17:23 UTC (rev 3046)
@@ -102,6 +102,7 @@
*
* @return The row count.
*/
+ @Override
public int getRowCount() {
if (this.model == null) {
return 0;
@@ -114,6 +115,7 @@
...
[truncated message content] |
|
From: <mu...@us...> - 2013-11-22 20:06:31
|
Revision: 3045
http://sourceforge.net/p/jfreechart/code/3045
Author: mungady
Date: 2013-11-22 20:06:28 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategoryDatasetHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategorySeriesHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ItemHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/KeyHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/PieDatasetHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/RootHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ValueHandler.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategoryDatasetHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategoryDatasetHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategoryDatasetHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -91,6 +91,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -123,6 +124,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) throws SAXException {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategorySeriesHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategorySeriesHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/CategorySeriesHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -101,6 +101,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -131,6 +132,7 @@
* @param localName the element name.
* @param qName the element name.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ItemHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ItemHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ItemHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -120,6 +120,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -148,6 +149,7 @@
* @param localName the element name.
* @param qName the element name.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/KeyHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/KeyHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/KeyHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -84,6 +84,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -107,6 +108,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) throws SAXException {
@@ -131,6 +133,7 @@
* @param start the start index.
* @param length the length of the valid character data.
*/
+ @Override
public void characters(char[] ch, int start, int length) {
if (this.currentText != null) {
this.currentText.append(String.copyValueOf(ch, start, length));
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/PieDatasetHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/PieDatasetHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/PieDatasetHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -90,6 +90,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -119,6 +120,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) throws SAXException {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/RootHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/RootHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/RootHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -78,6 +78,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void characters(char[] ch, int start, int length)
throws SAXException {
DefaultHandler handler = getCurrentHandler();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ValueHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ValueHandler.java 2013-11-22 20:06:16 UTC (rev 3044)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xml/ValueHandler.java 2013-11-22 20:06:28 UTC (rev 3045)
@@ -81,6 +81,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void startElement(String namespaceURI,
String localName,
String qName,
@@ -105,6 +106,7 @@
*
* @throws SAXException for errors.
*/
+ @Override
public void endElement(String namespaceURI,
String localName,
String qName) throws SAXException {
@@ -136,6 +138,7 @@
* @param start the start index.
* @param length the length of the valid character data.
*/
+ @Override
public void characters(char[] ch, int start, int length) {
if (this.currentText != null) {
this.currentText.append(String.copyValueOf(ch, start, length));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:06:19
|
Revision: 3044
http://sourceforge.net/p/jfreechart/code/3044
Author: mungady
Date: 2013-11-22 20:06:16 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/ohlc/OHLCSeriesCollection.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/ohlc/OHLCSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/ohlc/OHLCSeriesCollection.java 2013-11-22 20:06:03 UTC (rev 3043)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/ohlc/OHLCSeriesCollection.java 2013-11-22 20:06:16 UTC (rev 3044)
@@ -124,6 +124,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.data.size();
}
@@ -156,6 +157,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
// defer argument checking
return getSeries(series).getKey();
@@ -171,6 +173,7 @@
* @throws IllegalArgumentException if <code>series</code> is not in the
* range <code>0</code> to <code>getSeriesCount() - 1</code>.
*/
+ @Override
public int getItemCount(int series) {
// defer argument checking
return getSeries(series).getItemCount();
@@ -205,6 +208,7 @@
*
* @return The x-value.
*/
+ @Override
public double getXValue(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -220,6 +224,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -232,6 +237,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -246,6 +252,7 @@
*
* @return The open-value.
*/
+ @Override
public double getOpenValue(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -260,6 +267,7 @@
*
* @return The open-value.
*/
+ @Override
public Number getOpen(int series, int item) {
return new Double(getOpenValue(series, item));
}
@@ -272,6 +280,7 @@
*
* @return The close-value.
*/
+ @Override
public double getCloseValue(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -286,6 +295,7 @@
*
* @return The close-value.
*/
+ @Override
public Number getClose(int series, int item) {
return new Double(getCloseValue(series, item));
}
@@ -298,6 +308,7 @@
*
* @return The high-value.
*/
+ @Override
public double getHighValue(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -312,6 +323,7 @@
*
* @return The high-value.
*/
+ @Override
public Number getHigh(int series, int item) {
return new Double(getHighValue(series, item));
}
@@ -324,6 +336,7 @@
*
* @return The low-value.
*/
+ @Override
public double getLowValue(int series, int item) {
OHLCSeries s = (OHLCSeries) this.data.get(series);
OHLCItem di = (OHLCItem) s.getDataItem(item);
@@ -338,6 +351,7 @@
*
* @return The low-value.
*/
+ @Override
public Number getLow(int series, int item) {
return new Double(getLowValue(series, item));
}
@@ -351,6 +365,7 @@
*
* @return <code>null</code>.
*/
+ @Override
public Number getVolume(int series, int item) {
return null;
}
@@ -364,6 +379,7 @@
*
* @return <code>Double.NaN</code>.
*/
+ @Override
public double getVolumeValue(int series, int item) {
return Double.NaN;
}
@@ -436,6 +452,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -455,6 +472,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 137;
result = HashUtilities.hashCode(result, this.xPosition);
@@ -471,6 +489,7 @@
*
* @throws CloneNotSupportedException if there is a problem.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
OHLCSeriesCollection clone
= (OHLCSeriesCollection) super.clone();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:06:06
|
Revision: 3043
http://sourceforge.net/p/jfreechart/code/3043
Author: mungady
Date: 2013-11-22 20:06:03 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DateRange.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Day.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DynamicTimeSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/FixedMillisecond.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Hour.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Millisecond.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Minute.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Month.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Quarter.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/RegularTimePeriod.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Second.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/SimpleTimePeriod.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodAnchor.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValue.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValues.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValuesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesDataItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesTableModel.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeTableXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Week.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Year.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DateRange.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DateRange.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DateRange.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -162,6 +162,7 @@
*
* @return A string representing the date range.
*/
+ @Override
public String toString() {
DateFormat df = DateFormat.getDateTimeInstance();
return "[" + df.format(getLowerDate()) + " --> "
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Day.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Day.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Day.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -239,6 +239,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -253,6 +254,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -265,6 +267,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -275,6 +278,7 @@
*
* @return The day preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
Day result;
int serial = this.serialDate.toSerial();
@@ -295,6 +299,7 @@
* @return The day following this one, or <code>null</code> if some limit
* has been reached.
*/
+ @Override
public RegularTimePeriod next() {
Day result;
int serial = this.serialDate.toSerial();
@@ -313,6 +318,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.serialDate.toSerial();
}
@@ -328,6 +334,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int year = this.serialDate.getYYYY();
int month = this.serialDate.getMonth();
@@ -349,6 +356,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
int year = this.serialDate.getYYYY();
int month = this.serialDate.getMonth();
@@ -369,6 +377,7 @@
*
* @return A flag indicating whether or not an object is equal to this day.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -392,6 +401,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.serialDate.hashCode();
}
@@ -406,6 +416,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -438,6 +449,7 @@
*
* @return A string representing the day.
*/
+ @Override
public String toString() {
return this.serialDate.toString();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DynamicTimeSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DynamicTimeSeriesCollection.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/DynamicTimeSeriesCollection.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -473,6 +473,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.seriesCount;
}
@@ -486,6 +487,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) { // all arrays equal length,
// so ignore argument:
return this.historyCount;
@@ -737,6 +739,7 @@
*/
// getXxx() ftns can ignore the "series" argument:
// Don't synchronize this!! Instead, synchronize the loop that calls it.
+ @Override
public Number getX(int series, int item) {
RegularTimePeriod tp = this.pointsInTime[translateGet(item)];
return new Long(getX(tp));
@@ -750,6 +753,7 @@
*
* @return The value.
*/
+ @Override
public double getYValue(int series, int item) {
// Don't synchronize this!!
// Instead, synchronize the loop that calls it.
@@ -765,6 +769,7 @@
*
* @return The value.
*/
+ @Override
public Number getY(int series, int item) {
return new Float(getYValue(series, item));
}
@@ -777,6 +782,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartX(int series, int item) {
RegularTimePeriod tp = this.pointsInTime[translateGet(item)];
return new Long(tp.getFirstMillisecond(this.workingCalendar));
@@ -790,6 +796,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndX(int series, int item) {
RegularTimePeriod tp = this.pointsInTime[translateGet(item)];
return new Long(tp.getLastMillisecond(this.workingCalendar));
@@ -803,6 +810,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -815,6 +823,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -837,6 +846,7 @@
*
* @return The key.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.seriesKeys[series];
}
@@ -861,6 +871,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
return this.domainStart.doubleValue();
// a Long kept updated by advanceTime()
@@ -874,6 +885,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
return this.domainEnd.doubleValue();
// a Long kept updated by advanceTime()
@@ -887,6 +899,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
if (this.domainRange == null) {
findDomainLimits();
@@ -928,6 +941,7 @@
*
* @return The minimum range value.
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
double result = Double.NaN;
if (this.minValue != null) {
@@ -944,6 +958,7 @@
*
* @return The maximum range value.
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
double result = Double.NaN;
if (this.maxValue != null) {
@@ -960,6 +975,7 @@
*
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
if (this.valueRange == null) {
double max = getRangeUpperBound(includeInterval);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/FixedMillisecond.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/FixedMillisecond.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/FixedMillisecond.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -108,6 +108,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
// nothing to do
}
@@ -117,6 +118,7 @@
*
* @return The millisecond preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
RegularTimePeriod result = null;
long t = this.time;
@@ -131,6 +133,7 @@
*
* @return The millisecond following this one.
*/
+ @Override
public RegularTimePeriod next() {
RegularTimePeriod result = null;
long t = this.time;
@@ -147,6 +150,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object object) {
if (object instanceof FixedMillisecond) {
FixedMillisecond m = (FixedMillisecond) object;
@@ -163,6 +167,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (int) this.time;
}
@@ -176,6 +181,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -222,6 +228,7 @@
*
* @return The first millisecond of the time period.
*/
+ @Override
public long getFirstMillisecond() {
return this.time;
}
@@ -234,6 +241,7 @@
*
* @return The first millisecond of the time period.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
return this.time;
}
@@ -243,6 +251,7 @@
*
* @return The last millisecond of the time period.
*/
+ @Override
public long getLastMillisecond() {
return this.time;
}
@@ -254,6 +263,7 @@
*
* @return The last millisecond of the time period.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
return this.time;
}
@@ -263,6 +273,7 @@
*
* @return The millisecond closest to the middle of the time period.
*/
+ @Override
public long getMiddleMillisecond() {
return this.time;
}
@@ -274,6 +285,7 @@
*
* @return The millisecond closest to the middle of the time period.
*/
+ @Override
public long getMiddleMillisecond(Calendar calendar) {
return this.time;
}
@@ -283,6 +295,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.time;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Hour.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Hour.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Hour.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -235,6 +235,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -249,6 +250,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -261,6 +263,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -271,6 +274,7 @@
*
* @return The hour preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
Hour result;
if (this.hour != FIRST_HOUR_IN_DAY) {
@@ -293,6 +297,7 @@
*
* @return The hour following this one.
*/
+ @Override
public RegularTimePeriod next() {
Hour result;
if (this.hour != LAST_HOUR_IN_DAY) {
@@ -315,6 +320,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.day.getSerialIndex() * 24L + this.hour;
}
@@ -329,6 +335,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
@@ -348,6 +355,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
@@ -368,6 +376,7 @@
* @return <code>true</code> if the hour and day value of the object
* is the same as this.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -391,6 +400,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "[" + this.hour + "," + getDayOfMonth() + "/" + getMonth() + "/"
+ getYear() + "]";
@@ -405,6 +415,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.hour;
@@ -422,6 +433,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Millisecond.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Millisecond.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Millisecond.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -215,6 +215,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -229,6 +230,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.firstMillisecond;
}
@@ -241,6 +243,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
}
@@ -250,6 +253,7 @@
*
* @return The millisecond preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
RegularTimePeriod result = null;
if (this.millisecond != FIRST_MILLISECOND_IN_SECOND) {
@@ -269,6 +273,7 @@
*
* @return The millisecond following this one.
*/
+ @Override
public RegularTimePeriod next() {
RegularTimePeriod result = null;
if (this.millisecond != LAST_MILLISECOND_IN_SECOND) {
@@ -288,6 +293,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
long hourIndex = this.day.getSerialIndex() * 24L + this.hour;
long minuteIndex = hourIndex * 60L + this.minute;
@@ -306,6 +312,7 @@
* @return <code>true</code> if milliseconds and seconds of this and object
* are the same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -341,6 +348,7 @@
*
* @return A hashcode.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.millisecond;
@@ -358,6 +366,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object obj) {
int result;
long difference;
@@ -410,12 +419,13 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
- int day = this.day.getDayOfMonth();
+ int d = this.day.getDayOfMonth();
calendar.clear();
- calendar.set(year, month, day, this.hour, this.minute, this.second);
+ calendar.set(year, month, d, this.hour, this.minute, this.second);
calendar.set(Calendar.MILLISECOND, this.millisecond);
return calendar.getTimeInMillis();
}
@@ -430,6 +440,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
return getFirstMillisecond(calendar);
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Minute.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Minute.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Minute.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -236,6 +236,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -250,6 +251,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -262,6 +264,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -272,6 +275,7 @@
*
* @return The minute preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
Minute result;
if (this.minute != FIRST_MINUTE_IN_HOUR) {
@@ -294,6 +298,7 @@
*
* @return The minute following this one.
*/
+ @Override
public RegularTimePeriod next() {
Minute result;
if (this.minute != LAST_MINUTE_IN_HOUR) {
@@ -316,6 +321,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
long hourIndex = this.day.getSerialIndex() * 24L + this.hour;
return hourIndex * 60L + this.minute;
@@ -332,13 +338,14 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
- int day = this.day.getDayOfMonth();
+ int d = this.day.getDayOfMonth();
calendar.clear();
- calendar.set(year, month, day, this.hour, this.minute, 0);
+ calendar.set(year, month, d, this.hour, this.minute, 0);
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTimeInMillis();
@@ -355,13 +362,14 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
- int day = this.day.getDayOfMonth();
+ int d = this.day.getDayOfMonth();
calendar.clear();
- calendar.set(year, month, day, this.hour, this.minute, 59);
+ calendar.set(year, month, d, this.hour, this.minute, 59);
calendar.set(Calendar.MILLISECOND, 999);
return calendar.getTimeInMillis();
@@ -378,6 +386,7 @@
* @return <code>true</code> if the minute and hour value of this and the
* object are the same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -404,6 +413,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.minute;
@@ -422,6 +432,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Month.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Month.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Month.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -215,6 +215,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -229,6 +230,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -241,6 +243,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -254,6 +257,7 @@
*
* @return The month preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
Month result;
if (this.month != MonthConstants.JANUARY) {
@@ -278,6 +282,7 @@
*
* @return The month following this one.
*/
+ @Override
public RegularTimePeriod next() {
Month result;
if (this.month != MonthConstants.DECEMBER) {
@@ -299,6 +304,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.year * 12L + this.month;
}
@@ -310,6 +316,7 @@
*
* @return A string representing the month.
*/
+ @Override
public String toString() {
return SerialDate.monthCodeToString(this.month) + " " + this.year;
}
@@ -324,6 +331,7 @@
* @return <code>true</code> if month and year of this and object are the
* same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -350,6 +358,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.month;
@@ -366,6 +375,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -409,6 +419,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
calendar.set(this.year, this.month - 1, 1, 0, 0, 0);
calendar.set(Calendar.MILLISECOND, 0);
@@ -426,6 +437,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
int eom = SerialDate.lastDayOfMonth(this.month, this.year);
calendar.set(this.year, this.month - 1, eom, 23, 59, 59);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Quarter.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Quarter.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Quarter.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -230,6 +230,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -244,6 +245,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -256,6 +258,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -267,6 +270,7 @@
* @return The quarter preceding this one (or <code>null</code> if this is
* Q1 1900).
*/
+ @Override
public RegularTimePeriod previous() {
Quarter result;
if (this.quarter > FIRST_QUARTER) {
@@ -288,6 +292,7 @@
*
* @return The quarter following this one (or null if this is Q4 9999).
*/
+ @Override
public RegularTimePeriod next() {
Quarter result;
if (this.quarter < LAST_QUARTER) {
@@ -309,6 +314,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.year * 4L + this.quarter;
}
@@ -324,6 +330,7 @@
* @return <code>true</code> if quarter and year of this and the object are
* the same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj != null) {
@@ -351,6 +358,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.quarter;
@@ -368,6 +376,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -405,6 +414,7 @@
*
* @return A string representing the quarter.
*/
+ @Override
public String toString() {
return "Q" + this.quarter + "/" + this.year;
}
@@ -420,6 +430,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int month = Quarter.FIRST_MONTH_IN_QUARTER[this.quarter];
calendar.set(this.year, month - 1, 1, 0, 0, 0);
@@ -438,6 +449,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
int month = Quarter.LAST_MONTH_IN_QUARTER[this.quarter];
int eom = SerialDate.lastDayOfMonth(month, this.year);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/RegularTimePeriod.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/RegularTimePeriod.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/RegularTimePeriod.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -190,6 +190,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public Date getStart() {
return new Date(getFirstMillisecond());
}
@@ -202,6 +203,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public Date getEnd() {
return new Date(getLastMillisecond());
}
@@ -344,6 +346,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return String.valueOf(getStart());
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Second.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Second.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Second.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -211,6 +211,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -225,6 +226,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.firstMillisecond + 999L;
}
@@ -237,6 +239,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
}
@@ -246,6 +249,7 @@
*
* @return The second preceding this one.
*/
+ @Override
public RegularTimePeriod previous() {
Second result = null;
if (this.second != FIRST_SECOND_IN_MINUTE) {
@@ -265,6 +269,7 @@
*
* @return The second following this one.
*/
+ @Override
public RegularTimePeriod next() {
Second result = null;
if (this.second != LAST_SECOND_IN_MINUTE) {
@@ -284,6 +289,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
long hourIndex = this.day.getSerialIndex() * 24L + this.hour;
long minuteIndex = hourIndex * 60L + this.minute;
@@ -300,12 +306,13 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
int year = this.day.getYear();
int month = this.day.getMonth() - 1;
- int day = this.day.getDayOfMonth();
+ int d = this.day.getDayOfMonth();
calendar.clear();
- calendar.set(year, month, day, this.hour, this.minute, this.second);
+ calendar.set(year, month, d, this.hour, this.minute, this.second);
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTimeInMillis();
}
@@ -320,6 +327,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
return getFirstMillisecond(calendar) + 999L;
}
@@ -335,6 +343,7 @@
* @return <code>true</code> if second and minute of this and the object
* are the same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -367,6 +376,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.second;
@@ -385,6 +395,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/SimpleTimePeriod.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/SimpleTimePeriod.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/SimpleTimePeriod.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -96,6 +96,7 @@
*
* @return The start date/time (never <code>null</code>).
*/
+ @Override
public Date getStart() {
return new Date(this.start);
}
@@ -116,6 +117,7 @@
*
* @return The end date/time (never <code>null</code>).
*/
+ @Override
public Date getEnd() {
return new Date(this.end);
}
@@ -140,6 +142,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -168,6 +171,7 @@
* @throws ClassCastException if <code>obj</code> is not an instance of
* {@link TimePeriod}.
*/
+ @Override
public int compareTo(Object obj) {
TimePeriod that = (TimePeriod) obj;
long t0 = getStart().getTime();
@@ -212,6 +216,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + (int) this.start;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodAnchor.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodAnchor.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodAnchor.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -82,6 +82,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -94,6 +95,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -116,6 +118,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValue.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValue.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValue.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -126,6 +126,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -153,6 +154,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
int result;
result = (this.period != null ? this.period.hashCode() : 0);
@@ -168,6 +170,7 @@
*
* @return A clone.
*/
+ @Override
public Object clone() {
Object clone = null;
try {
@@ -185,6 +188,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "TimePeriodValue[" + getPeriod() + "," + getValue() + "]";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValues.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValues.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValues.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -188,6 +188,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.data.size();
}
@@ -408,6 +409,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -444,6 +446,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
int result;
result = (this.domain != null ? this.domain.hashCode() : 0);
@@ -473,6 +476,7 @@
*
* @throws CloneNotSupportedException if there is a cloning problem.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Object clone = createCopy(0, getItemCount() - 1);
return clone;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValuesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValuesCollection.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimePeriodValuesCollection.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -142,6 +142,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.data.size();
}
@@ -167,6 +168,7 @@
*
* @return The key for a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
// defer argument checking
return getSeries(series).getKey();
@@ -220,6 +222,7 @@
*
* @return The number of items in the specified series.
*/
+ @Override
public int getItemCount(int series) {
return getSeries(series).getItemCount();
}
@@ -232,6 +235,7 @@
*
* @return The x-value for the specified series and item.
*/
+ @Override
public Number getX(int series, int item) {
TimePeriodValues ts = (TimePeriodValues) this.data.get(series);
TimePeriodValue dp = ts.getDataItem(item);
@@ -272,6 +276,7 @@
*
* @return The starting X value for the specified series and item.
*/
+ @Override
public Number getStartX(int series, int item) {
TimePeriodValues ts = (TimePeriodValues) this.data.get(series);
TimePeriodValue dp = ts.getDataItem(item);
@@ -286,6 +291,7 @@
*
* @return The ending X value for the specified series and item.
*/
+ @Override
public Number getEndX(int series, int item) {
TimePeriodValues ts = (TimePeriodValues) this.data.get(series);
TimePeriodValue dp = ts.getDataItem(item);
@@ -300,6 +306,7 @@
*
* @return The y-value for the specified series and item.
*/
+ @Override
public Number getY(int series, int item) {
TimePeriodValues ts = (TimePeriodValues) this.data.get(series);
TimePeriodValue dp = ts.getDataItem(item);
@@ -314,6 +321,7 @@
*
* @return The starting Y value for the specified series and item.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -326,6 +334,7 @@
*
* @return The ending Y value for the specified series and item.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -338,6 +347,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -355,6 +365,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -372,6 +383,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
boolean interval = includeInterval || this.domainIsPointsInTime;
Range result = null;
@@ -427,6 +439,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesDataItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesDataItem.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesDataItem.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -149,6 +149,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -171,6 +172,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = (this.period != null ? this.period.hashCode() : 0);
@@ -190,6 +192,7 @@
* @return An integer indicating the order of the data item object
* relative to another object.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -218,6 +221,7 @@
*
* @return A clone of the data item.
*/
+ @Override
public Object clone() {
Object clone = null;
try {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesTableModel.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesTableModel.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeSeriesTableModel.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -101,6 +101,7 @@
*
* @return The column count.
*/
+ @Override
public int getColumnCount() {
return 2;
}
@@ -112,6 +113,7 @@
*
* @return The column class in the table model.
*/
+ @Override
public Class getColumnClass(int column) {
if (column == 0) {
return String.class;
@@ -133,6 +135,7 @@
*
* @return The name of a column.
*/
+ @Override
public String getColumnName(int column) {
if (column == 0) {
@@ -154,6 +157,7 @@
*
* @return The row count.
*/
+ @Override
public int getRowCount() {
return this.series.getItemCount();
}
@@ -166,6 +170,7 @@
*
* @return The data value for a cell in the table model.
*/
+ @Override
public Object getValueAt(int row, int column) {
if (row < this.series.getItemCount()) {
@@ -205,6 +210,7 @@
*
* @return <code>true</code> if the specified cell is editable.
*/
+ @Override
public boolean isCellEditable(int row, int column) {
if (this.editable) {
if ((column == 0) || (column == 1)) {
@@ -226,6 +232,7 @@
* @param row the row.
* @param column the column.
*/
+ @Override
public void setValueAt(Object value, int row, int column) {
if (row < this.series.getItemCount()) {
@@ -259,6 +266,7 @@
*
* @param event the event.
*/
+ @Override
public void seriesChanged(SeriesChangeEvent event) {
fireTableDataChanged();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeTableXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeTableXYDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/TimeTableXYDataset.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -307,6 +307,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.values.getRowCount();
}
@@ -320,6 +321,7 @@
*
* @return The number of items within the series.
*/
+ @Override
public int getItemCount(int series) {
return getItemCount();
}
@@ -329,6 +331,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.values.getColumnCount();
}
@@ -340,6 +343,7 @@
*
* @return The key for the series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.values.getColumnKey(series);
}
@@ -354,6 +358,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -366,6 +371,7 @@
*
* @return The value.
*/
+ @Override
public double getXValue(int series, int item) {
TimePeriod period = (TimePeriod) this.values.getRowKey(item);
return getXValue(period);
@@ -381,6 +387,7 @@
*
* @see #getStartXValue(int, int)
*/
+ @Override
public Number getStartX(int series, int item) {
return new Double(getStartXValue(series, item));
}
@@ -394,6 +401,7 @@
*
* @return The value.
*/
+ @Override
public double getStartXValue(int series, int item) {
TimePeriod period = (TimePeriod) this.values.getRowKey(item);
return period.getStart().getTime();
@@ -409,6 +417,7 @@
*
* @see #getEndXValue(int, int)
*/
+ @Override
public Number getEndX(int series, int item) {
return new Double(getEndXValue(series, item));
}
@@ -422,6 +431,7 @@
*
* @return The value.
*/
+ @Override
public double getEndXValue(int series, int item) {
TimePeriod period = (TimePeriod) this.values.getRowKey(item);
return period.getEnd().getTime();
@@ -435,6 +445,7 @@
*
* @return The y-value (possibly <code>null</code>).
*/
+ @Override
public Number getY(int series, int item) {
return this.values.getValue(item, series);
}
@@ -447,6 +458,7 @@
*
* @return The starting Y value for the specified series and item.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -459,6 +471,7 @@
*
* @return The ending Y value for the specified series and item.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -494,6 +507,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getDomainLowerBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -511,6 +525,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getDomainUpperBound(boolean includeInterval) {
double result = Double.NaN;
Range r = getDomainBounds(includeInterval);
@@ -528,6 +543,7 @@
*
* @return The range.
*/
+ @Override
public Range getDomainBounds(boolean includeInterval) {
List keys = this.values.getRowKeys();
if (keys.isEmpty()) {
@@ -553,6 +569,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -585,6 +602,7 @@
*
* @throws CloneNotSupportedException if the dataset cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
TimeTableXYDataset clone = (TimeTableXYDataset) super.clone();
clone.values = (DefaultKeyedValues2D) this.values.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Week.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Week.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Week.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -260,6 +260,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -274,6 +275,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -286,6 +288,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -299,6 +302,7 @@
*
* @return The preceding week (possibly <code>null</code>).
*/
+ @Override
public RegularTimePeriod previous() {
Week result;
@@ -331,6 +335,7 @@
*
* @return The following week (possibly <code>null</code>).
*/
+ @Override
public RegularTimePeriod next() {
Week result;
@@ -363,6 +368,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.year * 53L + this.week;
}
@@ -378,6 +384,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
Calendar c = (Calendar) calendar.clone();
c.clear();
@@ -402,6 +409,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
Calendar c = (Calendar) calendar.clone();
c.clear();
@@ -422,6 +430,7 @@
*
* @return A string representing the week.
*/
+ @Override
public String toString() {
return "Week " + this.week + ", " + this.year;
}
@@ -436,6 +445,7 @@
* @return <code>true</code> if week and year of this and object are the
* same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -464,6 +474,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
result = 37 * result + this.week;
@@ -481,6 +492,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Year.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Year.java 2013-11-22 20:05:51 UTC (rev 3042)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/time/Year.java 2013-11-22 20:06:03 UTC (rev 3043)
@@ -182,6 +182,7 @@
*
* @see #getLastMillisecond()
*/
+ @Override
public long getFirstMillisecond() {
return this.firstMillisecond;
}
@@ -196,6 +197,7 @@
*
* @see #getFirstMillisecond()
*/
+ @Override
public long getLastMillisecond() {
return this.lastMillisecond;
}
@@ -208,6 +210,7 @@
*
* @since 1.0.3
*/
+ @Override
public void peg(Calendar calendar) {
this.firstMillisecond = getFirstMillisecond(calendar);
this.lastMillisecond = getLastMillisecond(calendar);
@@ -219,6 +222,7 @@
* @return The year preceding this one (or <code>null</code> if the
* current year is -9999).
*/
+ @Override
public RegularTimePeriod previous() {
if (this.year > Year.MINIMUM_YEAR) {
return new Year(this.year - 1);
@@ -234,6 +238,7 @@
* @return The year following this one (or <code>null</code> if the current
* year is 9999).
*/
+ @Override
public RegularTimePeriod next() {
if (this.year < Year.MAXIMUM_YEAR) {
return new Year(this.year + 1);
@@ -250,6 +255,7 @@
*
* @return The serial index number.
*/
+ @Override
public long getSerialIndex() {
return this.year;
}
@@ -265,6 +271,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getFirstMillisecond(Calendar calendar) {
calendar.set(this.year, Calendar.JANUARY, 1, 0, 0, 0);
calendar.set(Calendar.MILLISECOND, 0);
@@ -282,6 +289,7 @@
* @throws NullPointerException if <code>calendar</code> is
* <code>null</code>.
*/
+ @Override
public long getLastMillisecond(Calendar calendar) {
calendar.set(this.year, Calendar.DECEMBER, 31, 23, 59, 59);
calendar.set(Calendar.MILLISECOND, 999);
@@ -299,6 +307,7 @@
* @return <code>true</code> if the year of this and the object are the
* same.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -319,6 +328,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 17;
int c = this.year;
@@ -336,6 +346,7 @@
*
* @return negative == before, zero == same, positive == after.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -370,6 +381,7 @@
*
* @return A string representing the year.
*/
+ @Override
public String toString() {
return Integer.toString(this.year);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:05:54
|
Revision: 3042
http://sourceforge.net/p/jfreechart/code/3042
Author: mungady
Date: 2013-11-22 20:05:51 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/BoxAndWhiskerItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerXYDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramBin.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/MeanAndStandardDeviation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramBin.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/BoxAndWhiskerItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/BoxAndWhiskerItem.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/BoxAndWhiskerItem.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -240,6 +240,7 @@
*
* @return A string representation of this instance.
*/
+ @Override
public String toString() {
return super.toString() + "[mean=" + this.mean + ",median="
+ this.median + ",q1=" + this.q1 + ",q3=" + this.q3 + "]";
@@ -252,6 +253,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerCategoryDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -316,6 +316,7 @@
* @see #getMedianValue(int, int)
* @see #getValue(Comparable, Comparable)
*/
+ @Override
public Number getValue(int row, int column) {
return getMedianValue(row, column);
}
@@ -331,6 +332,7 @@
* @see #getMedianValue(Comparable, Comparable)
* @see #getValue(int, int)
*/
+ @Override
public Number getValue(Comparable rowKey, Comparable columnKey) {
return getMedianValue(rowKey, columnKey);
}
@@ -345,6 +347,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMeanValue(int row, int column) {
Number result = null;
@@ -367,6 +370,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMeanValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -387,6 +391,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMedianValue(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(row,
@@ -407,6 +412,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMedianValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -427,6 +433,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getQ1Value(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -447,6 +454,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getQ1Value(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -467,6 +475,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getQ3Value(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -487,6 +496,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getQ3Value(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -506,6 +516,7 @@
*
* @see #getColumnKey(int)
*/
+ @Override
public int getColumnIndex(Comparable key) {
return this.data.getColumnIndex(key);
}
@@ -519,6 +530,7 @@
*
* @see #getColumnIndex(Comparable)
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.data.getColumnKey(column);
}
@@ -530,6 +542,7 @@
*
* @see #getRowKeys()
*/
+ @Override
public List getColumnKeys() {
return this.data.getColumnKeys();
}
@@ -543,6 +556,7 @@
*
* @see #getRowKey(int)
*/
+ @Override
public int getRowIndex(Comparable key) {
// defer null argument check
return this.data.getRowIndex(key);
@@ -557,6 +571,7 @@
*
* @see #getRowIndex(Comparable)
*/
+ @Override
public Comparable getRowKey(int row) {
return this.data.getRowKey(row);
}
@@ -568,6 +583,7 @@
*
* @see #getColumnKeys()
*/
+ @Override
public List getRowKeys() {
return this.data.getRowKeys();
}
@@ -579,6 +595,7 @@
*
* @see #getColumnCount()
*/
+ @Override
public int getRowCount() {
return this.data.getRowCount();
}
@@ -590,6 +607,7 @@
*
* @see #getRowCount()
*/
+ @Override
public int getColumnCount() {
return this.data.getColumnCount();
}
@@ -604,6 +622,7 @@
*
* @see #getRangeUpperBound(boolean)
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
return this.minimumRangeValue;
}
@@ -618,6 +637,7 @@
*
* @see #getRangeLowerBound(boolean)
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
return this.maximumRangeValue;
}
@@ -630,6 +650,7 @@
*
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
return new Range(this.minimumRangeValue, this.maximumRangeValue);
}
@@ -644,6 +665,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMinRegularValue(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -664,6 +686,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMinRegularValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -684,6 +707,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMaxRegularValue(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -704,6 +728,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMaxRegularValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -724,6 +749,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMinOutlier(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -744,6 +770,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMinOutlier(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -764,6 +791,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMaxOutlier(int row, int column) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -784,6 +812,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public Number getMaxOutlier(Comparable rowKey, Comparable columnKey) {
Number result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -804,6 +833,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public List getOutliers(int row, int column) {
List result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -824,6 +854,7 @@
*
* @see #getItem(int, int)
*/
+ @Override
public List getOutliers(Comparable rowKey, Comparable columnKey) {
List result = null;
BoxAndWhiskerItem item = (BoxAndWhiskerItem) this.data.getObject(
@@ -887,6 +918,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -906,6 +938,7 @@
*
* @throws CloneNotSupportedException if cloning is not possible.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultBoxAndWhiskerCategoryDataset clone
= (DefaultBoxAndWhiskerCategoryDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerXYDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultBoxAndWhiskerXYDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -140,6 +140,7 @@
*
* @see #setOutlierCoefficient(double)
*/
+ @Override
public double getOutlierCoefficient() {
return this.outlierCoefficient;
}
@@ -165,6 +166,7 @@
*
* @see #setFaroutCoefficient(double)
*/
+ @Override
public double getFaroutCoefficient() {
return this.faroutCoefficient;
}
@@ -197,6 +199,7 @@
*
* @return The number of series.
*/
+ @Override
public int getSeriesCount() {
return 1;
}
@@ -208,6 +211,7 @@
*
* @return The number of items in the specified series.
*/
+ @Override
public int getItemCount(int series) {
return this.dates.size();
}
@@ -252,6 +256,7 @@
*
* @return The name of this series.
*/
+ @Override
public Comparable getSeriesKey(int i) {
return this.seriesKey;
}
@@ -280,6 +285,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return new Long(((Date) this.dates.get(item)).getTime());
}
@@ -309,6 +315,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
return getMeanValue(series, item);
}
@@ -321,6 +328,7 @@
*
* @return The mean for the specified series and item.
*/
+ @Override
public Number getMeanValue(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -338,6 +346,7 @@
*
* @return The median-value for the specified series and item.
*/
+ @Override
public Number getMedianValue(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -355,6 +364,7 @@
*
* @return The Q1 median-value for the specified series and item.
*/
+ @Override
public Number getQ1Value(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -372,6 +382,7 @@
*
* @return The Q3 median-value for the specified series and item.
*/
+ @Override
public Number getQ3Value(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -389,6 +400,7 @@
*
* @return The min-value for the specified series and item.
*/
+ @Override
public Number getMinRegularValue(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -406,6 +418,7 @@
*
* @return The max-value for the specified series and item.
*/
+ @Override
public Number getMaxRegularValue(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -422,6 +435,7 @@
*
* @return A <code>Number</code> representing the maximum non-farout value.
*/
+ @Override
public Number getMinOutlier(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -440,6 +454,7 @@
*
* @return A <code>Number</code> representing the maximum non-farout value.
*/
+ @Override
public Number getMaxOutlier(int series, int item) {
Number result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -458,6 +473,7 @@
* @return The list of outliers for the specified series and item
* (possibly <code>null</code>).
*/
+ @Override
public List getOutliers(int series, int item) {
List result = null;
BoxAndWhiskerItem stats = (BoxAndWhiskerItem) this.items.get(item);
@@ -475,6 +491,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
double result = Double.NaN;
if (this.minimumRangeValue != null) {
@@ -491,6 +508,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
double result = Double.NaN;
if (this.maximumRangeValue != null) {
@@ -507,6 +525,7 @@
*
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
return this.rangeBounds;
}
@@ -518,6 +537,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -546,6 +566,7 @@
*
* @throws CloneNotSupportedException if the cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultBoxAndWhiskerXYDataset clone
= (DefaultBoxAndWhiskerXYDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultMultiValueCategoryDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -162,6 +162,7 @@
*
* @return The list of values.
*/
+ @Override
public List getValues(int row, int column) {
List values = (List) this.data.getObject(row, column);
if (values != null) {
@@ -181,6 +182,7 @@
*
* @return The list of values.
*/
+ @Override
public List getValues(Comparable rowKey, Comparable columnKey) {
return Collections.unmodifiableList((List) this.data.getObject(rowKey,
columnKey));
@@ -194,6 +196,7 @@
*
* @return The average value.
*/
+ @Override
public Number getValue(Comparable row, Comparable column) {
List l = (List) this.data.getObject(row, column);
double average = 0.0d;
@@ -222,6 +225,7 @@
*
* @return The average value.
*/
+ @Override
public Number getValue(int row, int column) {
List l = (List) this.data.getObject(row, column);
double average = 0.0d;
@@ -249,6 +253,7 @@
*
* @return The column index.
*/
+ @Override
public int getColumnIndex(Comparable key) {
return this.data.getColumnIndex(key);
}
@@ -260,6 +265,7 @@
*
* @return The column key.
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.data.getColumnKey(column);
}
@@ -269,6 +275,7 @@
*
* @return The keys.
*/
+ @Override
public List getColumnKeys() {
return this.data.getColumnKeys();
}
@@ -280,6 +287,7 @@
*
* @return The row index.
*/
+ @Override
public int getRowIndex(Comparable key) {
return this.data.getRowIndex(key);
}
@@ -291,6 +299,7 @@
*
* @return The row key.
*/
+ @Override
public Comparable getRowKey(int row) {
return this.data.getRowKey(row);
}
@@ -300,6 +309,7 @@
*
* @return The keys.
*/
+ @Override
public List getRowKeys() {
return this.data.getRowKeys();
}
@@ -309,6 +319,7 @@
*
* @return The row count.
*/
+ @Override
public int getRowCount() {
return this.data.getRowCount();
}
@@ -318,6 +329,7 @@
*
* @return The column count.
*/
+ @Override
public int getColumnCount() {
return this.data.getColumnCount();
}
@@ -330,6 +342,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
double result = Double.NaN;
if (this.minimumRangeValue != null) {
@@ -346,6 +359,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
double result = Double.NaN;
if (this.maximumRangeValue != null) {
@@ -361,6 +375,7 @@
* y-interval is taken into account.
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
return this.rangeBounds;
}
@@ -372,6 +387,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -391,6 +407,7 @@
*
* @throws CloneNotSupportedException if the dataset cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultMultiValueCategoryDataset clone
= (DefaultMultiValueCategoryDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/DefaultStatisticalCategoryDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -151,6 +151,7 @@
*
* @return The mean value (possibly <code>null</code>).
*/
+ @Override
public Number getMeanValue(int row, int column) {
Number result = null;
MeanAndStandardDeviation masd = (MeanAndStandardDeviation)
@@ -170,6 +171,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(int row, int column) {
return getMeanValue(row, column);
}
@@ -183,6 +185,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(Comparable rowKey, Comparable columnKey) {
return getMeanValue(rowKey, columnKey);
}
@@ -195,6 +198,7 @@
*
* @return The mean value (possibly <code>null</code>).
*/
+ @Override
public Number getMeanValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
MeanAndStandardDeviation masd = (MeanAndStandardDeviation)
@@ -213,6 +217,7 @@
*
* @return The standard deviation (possibly <code>null</code>).
*/
+ @Override
public Number getStdDevValue(int row, int column) {
Number result = null;
MeanAndStandardDeviation masd = (MeanAndStandardDeviation)
@@ -231,6 +236,7 @@
*
* @return The standard deviation (possibly <code>null</code>).
*/
+ @Override
public Number getStdDevValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
MeanAndStandardDeviation masd = (MeanAndStandardDeviation)
@@ -248,6 +254,7 @@
*
* @return The column index.
*/
+ @Override
public int getColumnIndex(Comparable key) {
// defer null argument check
return this.data.getColumnIndex(key);
@@ -260,6 +267,7 @@
*
* @return The column key.
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.data.getColumnKey(column);
}
@@ -269,6 +277,7 @@
*
* @return The keys.
*/
+ @Override
public List getColumnKeys() {
return this.data.getColumnKeys();
}
@@ -280,6 +289,7 @@
*
* @return The row index.
*/
+ @Override
public int getRowIndex(Comparable key) {
// defer null argument check
return this.data.getRowIndex(key);
@@ -292,6 +302,7 @@
*
* @return The row key.
*/
+ @Override
public Comparable getRowKey(int row) {
return this.data.getRowKey(row);
}
@@ -301,6 +312,7 @@
*
* @return The keys.
*/
+ @Override
public List getRowKeys() {
return this.data.getRowKeys();
}
@@ -312,6 +324,7 @@
*
* @see #getColumnCount()
*/
+ @Override
public int getRowCount() {
return this.data.getRowCount();
}
@@ -323,6 +336,7 @@
*
* @see #getRowCount()
*/
+ @Override
public int getColumnCount() {
return this.data.getColumnCount();
}
@@ -633,6 +647,7 @@
*
* @see #getRangeUpperBound(boolean)
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
if (includeInterval && !Double.isNaN(this.minimumRangeValueIncStdDev)) {
return this.minimumRangeValueIncStdDev;
@@ -652,6 +667,7 @@
*
* @see #getRangeLowerBound(boolean)
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
if (includeInterval && !Double.isNaN(this.maximumRangeValueIncStdDev)) {
return this.maximumRangeValueIncStdDev;
@@ -669,6 +685,7 @@
*
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
double lower = getRangeLowerBound(includeInterval);
double upper = getRangeUpperBound(includeInterval);
@@ -685,6 +702,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -707,6 +725,7 @@
*
* @throws CloneNotSupportedException if cloning cannot be completed.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultStatisticalCategoryDataset clone
= (DefaultStatisticalCategoryDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramBin.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramBin.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramBin.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -129,6 +129,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -153,6 +154,7 @@
*
* @throws CloneNotSupportedException not thrown by this class.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -297,6 +297,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.list.size();
}
@@ -312,6 +313,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Comparable getSeriesKey(int series) {
Map map = (Map) this.list.get(series);
return (Comparable) map.get("key");
@@ -328,6 +330,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public int getItemCount(int series) {
return getBins(series).size();
}
@@ -347,6 +350,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getX(int series, int item) {
List bins = getBins(series);
HistogramBin bin = (HistogramBin) bins.get(item);
@@ -367,6 +371,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getY(int series, int item) {
List bins = getBins(series);
HistogramBin bin = (HistogramBin) bins.get(item);
@@ -399,6 +404,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getStartX(int series, int item) {
List bins = getBins(series);
HistogramBin bin = (HistogramBin) bins.get(item);
@@ -417,6 +423,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getEndX(int series, int item) {
List bins = getBins(series);
HistogramBin bin = (HistogramBin) bins.get(item);
@@ -437,6 +444,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -455,6 +463,7 @@
* @throws IndexOutOfBoundsException if <code>series</code> is outside the
* specified range.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -466,6 +475,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -490,6 +500,7 @@
*
* @throws CloneNotSupportedException if the object cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
HistogramDataset clone = (HistogramDataset) super.clone();
int seriesCount = getSeriesCount();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramType.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/HistogramType.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -81,6 +81,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -92,6 +93,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
@@ -120,6 +122,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/MeanAndStandardDeviation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/MeanAndStandardDeviation.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/MeanAndStandardDeviation.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -145,6 +145,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -171,6 +172,7 @@
*
* @since 1.0.7
*/
+ @Override
public String toString() {
return "[" + this.mean + ", " + this.standardDeviation + "]";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramBin.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramBin.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramBin.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -201,6 +201,7 @@
* @return An integer indicating the relative ordering of the this bin and
* the given object.
*/
+ @Override
public int compareTo(Object obj) {
if (!(obj instanceof SimpleHistogramBin)) {
return 0;
@@ -229,6 +230,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof SimpleHistogramBin)) {
return false;
@@ -259,6 +261,7 @@
*
* @throws CloneNotSupportedException not thrown by this class.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramDataset.java 2013-11-22 20:05:40 UTC (rev 3041)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/statistics/SimpleHistogramDataset.java 2013-11-22 20:05:51 UTC (rev 3042)
@@ -125,6 +125,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return 1;
}
@@ -137,6 +138,7 @@
*
* @return The key for the series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.key;
}
@@ -146,6 +148,7 @@
*
* @return The order (never <code>null</code>).
*/
+ @Override
public DomainOrder getDomainOrder() {
return DomainOrder.ASCENDING;
}
@@ -158,6 +161,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return this.bins.size();
}
@@ -277,6 +281,7 @@
*
* @return The x-value (never <code>null</code>).
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -289,6 +294,7 @@
*
* @return The x-value.
*/
+ @Override
public double getXValue(int series, int item) {
SimpleHistogramBin bin = (SimpleHistogramBin) this.bins.get(item);
return (bin.getLowerBound() + bin.getUpperBound()) / 2.0;
@@ -302,6 +308,7 @@
*
* @return The y-value (possibly <code>null</code>).
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -316,6 +323,7 @@
*
* @see #getAdjustForBinSize()
*/
+ @Override
public double getYValue(int series, int item) {
SimpleHistogramBin bin = (SimpleHistogramBin) this.bins.get(item);
if (this.adjustForBinSize) {
@@ -335,6 +343,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartX(int series, int item) {
return new Double(getStartXValue(series, item));
}
@@ -348,6 +357,7 @@
*
* @return The start x-value.
*/
+ @Override
public double getStartXValue(int series, int item) {
SimpleHistogramBin bin = (SimpleHistogramBin) this.bins.get(item);
return bin.getLowerBound();
@@ -361,6 +371,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndX(int series, int item) {
return new Double(getEndXValue(series, item));
}
@@ -374,6 +385,7 @@
*
* @return The end x-value.
*/
+ @Override
public double getEndXValue(int series, int item) {
SimpleHistogramBin bin = (SimpleHistogramBin) this.bins.get(item);
return bin.getUpperBound();
@@ -387,6 +399,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartY(int series, int item) {
return getY(series, item);
}
@@ -400,6 +413,7 @@
*
* @return The start y-value.
*/
+ @Override
public double getStartYValue(int series, int item) {
return getYValue(series, item);
}
@@ -412,6 +426,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndY(int series, int item) {
return getY(series, item);
}
@@ -425,6 +440,7 @@
*
* @return The end y-value.
*/
+ @Override
public double getEndYValue(int series, int item) {
return getYValue(series, item);
}
@@ -436,6 +452,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -464,6 +481,7 @@
* @throws CloneNotSupportedException not thrown by this class, but maybe
* by subclasses (if any).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SimpleHistogramDataset clone = (SimpleHistogramDataset) super.clone();
clone.bins = (List) ObjectUtilities.deepClone(this.bins);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:05:43
|
Revision: 3041
http://sourceforge.net/p/jfreechart/code/3041
Author: mungady
Date: 2013-11-22 20:05:40 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_de.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_es.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_fr.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_pl.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_ru.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -54,6 +54,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_de.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_de.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_de.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -54,6 +54,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_es.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_es.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_es.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -54,6 +54,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_fr.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_fr.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_fr.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -53,6 +53,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_pl.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_pl.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_pl.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -55,6 +55,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_ru.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_ru.java 2013-11-22 20:05:31 UTC (rev 3040)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/resources/DataPackageResources_ru.java 2013-11-22 20:05:40 UTC (rev 3041)
@@ -51,6 +51,7 @@
*
* @return The localised resources.
*/
+ @Override
public Object[][] getContents() {
return CONTENTS;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 20:05:34
|
Revision: 3040
http://sourceforge.net/p/jfreechart/code/3040
Author: mungady
Date: 2013-11-22 20:05:31 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/jdbc/JDBCXYDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/jdbc/JDBCXYDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/jdbc/JDBCXYDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/jdbc/JDBCXYDataset.java 2013-11-22 20:05:31 UTC (rev 3040)
@@ -429,6 +429,7 @@
*
* @see XYDataset
*/
+ @Override
public Number getX(int seriesIndex, int itemIndex) {
ArrayList row = (ArrayList) this.rows.get(itemIndex);
return (Number) row.get(0);
@@ -444,6 +445,7 @@
*
* @see XYDataset
*/
+ @Override
public Number getY(int seriesIndex, int itemIndex) {
ArrayList row = (ArrayList) this.rows.get(itemIndex);
return (Number) row.get(seriesIndex + 1);
@@ -458,6 +460,7 @@
*
* @see XYDataset
*/
+ @Override
public int getItemCount(int seriesIndex) {
return this.rows.size();
}
@@ -468,6 +471,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return getItemCount(0);
}
@@ -480,6 +484,7 @@
* @see XYDataset
* @see Dataset
*/
+ @Override
public int getSeriesCount() {
return this.columnNames.length;
}
@@ -494,6 +499,7 @@
* @see XYDataset
* @see Dataset
*/
+ @Override
public Comparable getSeriesKey(int seriesIndex) {
if ((seriesIndex < this.columnNames.length)
@@ -554,6 +560,7 @@
*
* @return The minimum value.
*/
+ @Override
public double getRangeLowerBound(boolean includeInterval) {
return this.minValue;
}
@@ -566,6 +573,7 @@
*
* @return The maximum value.
*/
+ @Override
public double getRangeUpperBound(boolean includeInterval) {
return this.maxValue;
}
@@ -578,6 +586,7 @@
*
* @return The range.
*/
+ @Override
public Range getRangeBounds(boolean includeInterval) {
return new Range(this.minValue, this.maxValue);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:24:52
|
Revision: 3039
http://sourceforge.net/p/jfreechart/code/3039
Author: mungady
Date: 2013-11-22 19:24:48 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/AbstractSeriesDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/CombinedDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultHeatMapDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/SubSeriesDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/AbstractSeriesDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/AbstractSeriesDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/AbstractSeriesDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -68,6 +68,7 @@
*
* @return The series count.
*/
+ @Override
public abstract int getSeriesCount();
/**
@@ -82,6 +83,7 @@
*
* @return The series key.
*/
+ @Override
public abstract Comparable getSeriesKey(int series);
/**
@@ -91,6 +93,7 @@
*
* @return The index.
*/
+ @Override
public int indexOf(Comparable seriesKey) {
int seriesCount = getSeriesCount();
for (int s = 0; s < seriesCount; s++) {
@@ -106,6 +109,7 @@
*
* @param event information about the change.
*/
+ @Override
public void seriesChanged(SeriesChangeEvent event) {
fireDatasetChanged();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/CombinedDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/CombinedDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/CombinedDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -155,6 +155,7 @@
*
* @return The number of series in the dataset.
*/
+ @Override
public int getSeriesCount() {
return this.datasetInfo.size();
}
@@ -166,6 +167,7 @@
*
* @return The key for a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
DatasetInfo di = getDatasetInfo(series);
return di.data.getSeriesKey(di.series);
@@ -186,6 +188,7 @@
*
* @return The X-value for the specified series and item.
*/
+ @Override
public Number getX(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((XYDataset) di.data).getX(di.series, item);
@@ -202,6 +205,7 @@
*
* @return The Y-value for the specified series and item.
*/
+ @Override
public Number getY(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((XYDataset) di.data).getY(di.series, item);
@@ -217,6 +221,7 @@
*
* @return The number of items in a series.
*/
+ @Override
public int getItemCount(int series) {
DatasetInfo di = getDatasetInfo(series);
return ((XYDataset) di.data).getItemCount(di.series);
@@ -237,6 +242,7 @@
*
* @return The high-value for the specified series and item.
*/
+ @Override
public Number getHigh(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((OHLCDataset) di.data).getHigh(di.series, item);
@@ -251,6 +257,7 @@
*
* @return The high-value.
*/
+ @Override
public double getHighValue(int series, int item) {
double result = Double.NaN;
Number high = getHigh(series, item);
@@ -271,6 +278,7 @@
*
* @return The low-value for the specified series and item.
*/
+ @Override
public Number getLow(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((OHLCDataset) di.data).getLow(di.series, item);
@@ -285,6 +293,7 @@
*
* @return The low-value.
*/
+ @Override
public double getLowValue(int series, int item) {
double result = Double.NaN;
Number low = getLow(series, item);
@@ -305,6 +314,7 @@
*
* @return The open-value for the specified series and item.
*/
+ @Override
public Number getOpen(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((OHLCDataset) di.data).getOpen(di.series, item);
@@ -319,6 +329,7 @@
*
* @return The open-value.
*/
+ @Override
public double getOpenValue(int series, int item) {
double result = Double.NaN;
Number open = getOpen(series, item);
@@ -339,6 +350,7 @@
*
* @return The close-value for the specified series and item.
*/
+ @Override
public Number getClose(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((OHLCDataset) di.data).getClose(di.series, item);
@@ -353,6 +365,7 @@
*
* @return The close-value.
*/
+ @Override
public double getCloseValue(int series, int item) {
double result = Double.NaN;
Number close = getClose(series, item);
@@ -373,6 +386,7 @@
*
* @return The volume value for the specified series and item.
*/
+ @Override
public Number getVolume(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
return ((OHLCDataset) di.data).getVolume(di.series, item);
@@ -387,6 +401,7 @@
*
* @return The volume-value.
*/
+ @Override
public double getVolumeValue(int series, int item) {
double result = Double.NaN;
Number volume = getVolume(series, item);
@@ -408,6 +423,7 @@
*
* @return The value.
*/
+ @Override
public Number getStartX(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
if (di.data instanceof IntervalXYDataset) {
@@ -426,6 +442,7 @@
*
* @return The value.
*/
+ @Override
public Number getEndX(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
if (di.data instanceof IntervalXYDataset) {
@@ -444,6 +461,7 @@
*
* @return The starting Y value for the specified series and item.
*/
+ @Override
public Number getStartY(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
if (di.data instanceof IntervalXYDataset) {
@@ -462,6 +480,7 @@
*
* @return The ending Y value for the specified series and item.
*/
+ @Override
public Number getEndY(int series, int item) {
DatasetInfo di = getDatasetInfo(series);
if (di.data instanceof IntervalXYDataset) {
@@ -483,6 +502,7 @@
*
* @return The parent Dataset of this combination or <code>null</code>.
*/
+ @Override
public SeriesDataset getParent() {
SeriesDataset parent = null;
@@ -516,6 +536,7 @@
*
* @see #getParent()
*/
+ @Override
public int[] getMap() {
int[] map = null;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -92,6 +92,7 @@
*
* @throws CloneNotSupportedException not by this class.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -103,6 +104,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultHeatMapDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultHeatMapDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultHeatMapDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -125,6 +125,7 @@
*
* @return The number of x-values (always > 0).
*/
+ @Override
public int getXSampleCount() {
return this.xSamples;
}
@@ -136,6 +137,7 @@
*
* @return The number of y-values (always > 0).
*/
+ @Override
public int getYSampleCount() {
return this.ySamples;
}
@@ -147,6 +149,7 @@
*
* @return The lowest x-value represented in this dataset.
*/
+ @Override
public double getMinimumXValue() {
return this.minX;
}
@@ -158,6 +161,7 @@
*
* @return The highest x-value represented in this dataset.
*/
+ @Override
public double getMaximumXValue() {
return this.maxX;
}
@@ -169,6 +173,7 @@
*
* @return The lowest y-value represented in this dataset.
*/
+ @Override
public double getMinimumYValue() {
return this.minY;
}
@@ -180,6 +185,7 @@
*
* @return The highest y-value represented in this dataset.
*/
+ @Override
public double getMaximumYValue() {
return this.maxY;
}
@@ -191,6 +197,7 @@
*
* @return The x-value.
*/
+ @Override
public double getXValue(int xIndex) {
double x = this.minX
+ (this.maxX - this.minX) * (xIndex / (double) this.xSamples);
@@ -204,6 +211,7 @@
*
* @return The y-value.
*/
+ @Override
public double getYValue(int yIndex) {
double y = this.minY
+ (this.maxY - this.minY) * (yIndex / (double) this.ySamples);
@@ -219,6 +227,7 @@
*
* @return The z-value.
*/
+ @Override
public double getZValue(int xIndex, int yIndex) {
return this.zValues[xIndex][yIndex];
}
@@ -234,6 +243,7 @@
*
* @return The z-value.
*/
+ @Override
public Number getZ(int xIndex, int yIndex) {
return new Double(getZValue(xIndex, yIndex));
}
@@ -273,6 +283,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -313,6 +324,7 @@
*
* @throws java.lang.CloneNotSupportedException
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultHeatMapDataset clone = (DefaultHeatMapDataset) super.clone();
clone.zValues = DataUtilities.clone(this.zValues);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -92,6 +92,7 @@
*
* @return The key.
*/
+ @Override
public Comparable getKey() {
Comparable result = null;
if (this.data != null) {
@@ -105,6 +106,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue() {
Number result = null;
if (this.data != null) {
@@ -144,6 +146,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -172,6 +175,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (this.data != null ? this.data.hashCode() : 0);
}
@@ -184,6 +188,7 @@
* @throws CloneNotSupportedException This class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultKeyedValueDataset clone
= (DefaultKeyedValueDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -106,6 +106,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.data.getItemCount();
}
@@ -116,6 +117,7 @@
*
* @return The categories in the dataset.
*/
+ @Override
public List getKeys() {
return Collections.unmodifiableList(this.data.getKeys());
}
@@ -131,6 +133,7 @@
* @throws IndexOutOfBoundsException if <code>item</code> is not in the
* specified range.
*/
+ @Override
public Comparable getKey(int item) {
return this.data.getKey(item);
}
@@ -145,6 +148,7 @@
* @throws IllegalArgumentException if <code>key</code> is
* <code>null</code>.
*/
+ @Override
public int getIndex(Comparable key) {
return this.data.getIndex(key);
}
@@ -156,14 +160,13 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(int item) {
-
Number result = null;
if (getItemCount() > item) {
result = this.data.getValue(item);
}
return result;
-
}
/**
@@ -175,6 +178,7 @@
*
* @throws UnknownKeyException if the key is not recognised.
*/
+ @Override
public Number getValue(Comparable key) {
ParamChecks.nullNotPermitted(key, "key");
return this.data.getValue(key);
@@ -304,6 +308,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -347,6 +352,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.data.hashCode();
}
@@ -359,6 +365,7 @@
* @throws CloneNotSupportedException This class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultPieDataset clone = (DefaultPieDataset) super.clone();
clone.data = (DefaultKeyedValues) this.data.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -94,6 +94,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue() {
return this.value;
}
@@ -116,6 +117,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -132,6 +134,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (this.value != null ? this.value.hashCode() : 0);
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -254,6 +254,7 @@
* @throws CloneNotSupportedException not thrown by this class, but
* subclasses may differ.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Series clone = (Series) super.clone();
clone.listeners = new EventListenerList();
@@ -269,6 +270,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -291,6 +293,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.key.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/SubSeriesDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/SubSeriesDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/SubSeriesDataset.java 2013-11-22 19:24:48 UTC (rev 3039)
@@ -114,6 +114,7 @@
*
* @return The high-value for the specified series and item.
*/
+ @Override
public Number getHigh(int series, int item) {
return ((OHLCDataset) this.parent).getHigh(this.map[series], item);
}
@@ -127,6 +128,7 @@
*
* @return The high-value.
*/
+ @Override
public double getHighValue(int series, int item) {
double result = Double.NaN;
Number high = getHigh(series, item);
@@ -147,6 +149,7 @@
*
* @return The low-value for the specified series and item.
*/
+ @Override
public Number getLow(int series, int item) {
return ((OHLCDataset) this.parent).getLow(this.map[series], item);
}
@@ -160,6 +163,7 @@
*
* @return The low-value.
*/
+ @Override
public double getLowValue(int series, int item) {
double result = Double.NaN;
Number low = getLow(series, item);
@@ -180,6 +184,7 @@
*
* @return The open-value for the specified series and item.
*/
+ @Override
public Number getOpen(int series, int item) {
return ((OHLCDataset) this.parent).getOpen(this.map[series], item);
}
@@ -193,6 +198,7 @@
*
* @return The open-value.
*/
+ @Override
public double getOpenValue(int series, int item) {
double result = Double.NaN;
Number open = getOpen(series, item);
@@ -213,6 +219,7 @@
*
* @return The close-value for the specified series and item.
*/
+ @Override
public Number getClose(int series, int item) {
return ((OHLCDataset) this.parent).getClose(this.map[series], item);
}
@@ -226,6 +233,7 @@
*
* @return The close-value.
*/
+ @Override
public double getCloseValue(int series, int item) {
double result = Double.NaN;
Number close = getClose(series, item);
@@ -246,6 +254,7 @@
*
* @return The volume.
*/
+ @Override
public Number getVolume(int series, int item) {
return ((OHLCDataset) this.parent).getVolume(this.map[series], item);
}
@@ -259,6 +268,7 @@
*
* @return The volume-value.
*/
+ @Override
public double getVolumeValue(int series, int item) {
double result = Double.NaN;
Number volume = getVolume(series, item);
@@ -283,6 +293,7 @@
*
* @return The X-value for the specified series and item.
*/
+ @Override
public Number getX(int series, int item) {
return ((XYDataset) this.parent).getX(this.map[series], item);
}
@@ -298,6 +309,7 @@
*
* @return The Y-value for the specified series and item.
*/
+ @Override
public Number getY(int series, int item) {
return ((XYDataset) this.parent).getY(this.map[series], item);
}
@@ -312,6 +324,7 @@
*
* @return The number of items in a series.
*/
+ @Override
public int getItemCount(int series) {
return ((XYDataset) this.parent).getItemCount(this.map[series]);
}
@@ -325,6 +338,7 @@
*
* @return The number of series in the dataset.
*/
+ @Override
public int getSeriesCount() {
return this.map.length;
}
@@ -336,6 +350,7 @@
*
* @return The name of a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.parent.getSeriesKey(this.map[series]);
}
@@ -352,6 +367,7 @@
*
* @return The starting X value for the specified series and item.
*/
+ @Override
public Number getStartX(int series, int item) {
if (this.parent instanceof IntervalXYDataset) {
return ((IntervalXYDataset) this.parent).getStartX(
@@ -371,6 +387,7 @@
*
* @return The ending X value for the specified series and item.
*/
+ @Override
public Number getEndX(int series, int item) {
if (this.parent instanceof IntervalXYDataset) {
return ((IntervalXYDataset) this.parent).getEndX(
@@ -390,6 +407,7 @@
*
* @return The starting Y value for the specified series and item.
*/
+ @Override
public Number getStartY(int series, int item) {
if (this.parent instanceof IntervalXYDataset) {
return ((IntervalXYDataset) this.parent).getStartY(
@@ -409,6 +427,7 @@
*
* @return The ending Y value for the specified series and item.
*/
+ @Override
public Number getEndY(int series, int item) {
if (this.parent instanceof IntervalXYDataset) {
return ((IntervalXYDataset) this.parent).getEndY(
@@ -429,6 +448,7 @@
*
* @return The parent Dataset of this combination.
*/
+ @Override
public SeriesDataset getParent() {
return this.parent;
}
@@ -438,6 +458,7 @@
*
* @return A map or indirect indexing form our series into parent's series.
*/
+ @Override
public int[] getMap() {
return (int[]) this.map.clone();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:24:22
|
Revision: 3038
http://sourceforge.net/p/jfreechart/code/3038
Author: mungady
Date: 2013-11-22 19:24:19 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/SlidingGanttCategoryDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/Task.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeriesCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/XYTaskDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/SlidingGanttCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/SlidingGanttCategoryDataset.java 2013-11-22 19:23:55 UTC (rev 3037)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/SlidingGanttCategoryDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
@@ -168,6 +168,7 @@
*
* @return The column index, or -1 if the key is not recognised.
*/
+ @Override
public int getColumnIndex(Comparable key) {
int index = this.underlying.getColumnIndex(key);
if (index >= this.firstCategoryIndex && index <= lastCategoryIndex()) {
@@ -185,6 +186,7 @@
*
* @throws IndexOutOfBoundsException if <code>row</code> is out of bounds.
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.underlying.getColumnKey(column + this.firstCategoryIndex);
}
@@ -196,6 +198,7 @@
*
* @see #getColumnKey(int)
*/
+ @Override
public List getColumnKeys() {
List result = new java.util.ArrayList();
int last = lastCategoryIndex();
@@ -212,6 +215,7 @@
*
* @return The row index, or <code>-1</code> if the key is unrecognised.
*/
+ @Override
public int getRowIndex(Comparable key) {
return this.underlying.getRowIndex(key);
}
@@ -225,6 +229,7 @@
*
* @throws IndexOutOfBoundsException if <code>row</code> is out of bounds.
*/
+ @Override
public Comparable getRowKey(int row) {
return this.underlying.getRowKey(row);
}
@@ -234,6 +239,7 @@
*
* @return The keys.
*/
+ @Override
public List getRowKeys() {
return this.underlying.getRowKeys();
}
@@ -248,6 +254,7 @@
*
* @throws UnknownKeyException if either key is not defined in the dataset.
*/
+ @Override
public Number getValue(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -264,6 +271,7 @@
*
* @return The column count.
*/
+ @Override
public int getColumnCount() {
int last = lastCategoryIndex();
if (last == -1) {
@@ -279,6 +287,7 @@
*
* @return The row count.
*/
+ @Override
public int getRowCount() {
return this.underlying.getRowCount();
}
@@ -291,6 +300,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(int row, int column) {
return this.underlying.getValue(row, column + this.firstCategoryIndex);
}
@@ -303,6 +313,7 @@
*
* @return The percent complete.
*/
+ @Override
public Number getPercentComplete(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -326,6 +337,7 @@
*
* @see #getPercentComplete(int, int, int)
*/
+ @Override
public Number getPercentComplete(Comparable rowKey, Comparable columnKey,
int subinterval) {
int r = getRowIndex(rowKey);
@@ -350,6 +362,7 @@
*
* @see #getStartValue(Comparable, Comparable, int)
*/
+ @Override
public Number getEndValue(Comparable rowKey, Comparable columnKey,
int subinterval) {
int r = getRowIndex(rowKey);
@@ -374,6 +387,7 @@
*
* @see #getStartValue(int, int, int)
*/
+ @Override
public Number getEndValue(int row, int column, int subinterval) {
return this.underlying.getEndValue(row,
column + this.firstCategoryIndex, subinterval);
@@ -387,6 +401,7 @@
*
* @return The percent complete.
*/
+ @Override
public Number getPercentComplete(int series, int category) {
return this.underlying.getPercentComplete(series,
category + this.firstCategoryIndex);
@@ -403,6 +418,7 @@
*
* @see #getPercentComplete(Comparable, Comparable, int)
*/
+ @Override
public Number getPercentComplete(int row, int column, int subinterval) {
return this.underlying.getPercentComplete(row,
column + this.firstCategoryIndex, subinterval);
@@ -419,6 +435,7 @@
*
* @see #getEndValue(Comparable, Comparable, int)
*/
+ @Override
public Number getStartValue(Comparable rowKey, Comparable columnKey,
int subinterval) {
int r = getRowIndex(rowKey);
@@ -443,6 +460,7 @@
*
* @see #getEndValue(int, int, int)
*/
+ @Override
public Number getStartValue(int row, int column, int subinterval) {
return this.underlying.getStartValue(row,
column + this.firstCategoryIndex, subinterval);
@@ -458,6 +476,7 @@
*
* @see #getSubIntervalCount(int, int)
*/
+ @Override
public int getSubIntervalCount(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -480,6 +499,7 @@
*
* @see #getSubIntervalCount(Comparable, Comparable)
*/
+ @Override
public int getSubIntervalCount(int row, int column) {
return this.underlying.getSubIntervalCount(row,
column + this.firstCategoryIndex);
@@ -495,6 +515,7 @@
*
* @see #getEndValue(Comparable, Comparable)
*/
+ @Override
public Number getStartValue(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -517,6 +538,7 @@
*
* @see #getEndValue(int, int)
*/
+ @Override
public Number getStartValue(int row, int column) {
return this.underlying.getStartValue(row,
column + this.firstCategoryIndex);
@@ -532,6 +554,7 @@
*
* @see #getStartValue(Comparable, Comparable)
*/
+ @Override
public Number getEndValue(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -551,6 +574,7 @@
*
* @return The end value (possibly <code>null</code>).
*/
+ @Override
public Number getEndValue(int series, int category) {
return this.underlying.getEndValue(series,
category + this.firstCategoryIndex);
@@ -564,6 +588,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -598,6 +623,7 @@
* @throws CloneNotSupportedException if the dataset cannot be cloned for
* any reason.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SlidingGanttCategoryDataset clone
= (SlidingGanttCategoryDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/Task.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/Task.java 2013-11-22 19:23:55 UTC (rev 3037)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/Task.java 2013-11-22 19:24:19 UTC (rev 3038)
@@ -212,6 +212,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object object) {
if (object == this) {
return true;
@@ -244,6 +245,7 @@
* @throws CloneNotSupportedException never thrown by this class, but
* subclasses may not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Task clone = (Task) super.clone();
return clone;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeries.java 2013-11-22 19:23:55 UTC (rev 3037)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeries.java 2013-11-22 19:24:19 UTC (rev 3038)
@@ -114,6 +114,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.tasks.size();
}
@@ -165,6 +166,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -190,6 +192,7 @@
* @throws CloneNotSupportedException if there is some problem cloning
* the dataset.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
TaskSeries clone = (TaskSeries) super.clone();
clone.tasks = (List) ObjectUtilities.deepClone(this.tasks);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeriesCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeriesCollection.java 2013-11-22 19:23:55 UTC (rev 3037)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/TaskSeriesCollection.java 2013-11-22 19:24:19 UTC (rev 3038)
@@ -132,6 +132,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return getRowCount();
}
@@ -143,6 +144,7 @@
*
* @return The name of a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
TaskSeries ts = (TaskSeries) this.data.get(series);
return ts.getKey();
@@ -153,6 +155,7 @@
*
* @return The series count.
*/
+ @Override
public int getRowCount() {
return this.data.size();
}
@@ -162,6 +165,7 @@
*
* @return The row keys.
*/
+ @Override
public List getRowKeys() {
return this.data;
}
@@ -171,6 +175,7 @@
*
* @return The column count.
*/
+ @Override
public int getColumnCount() {
return this.keys.size();
}
@@ -180,6 +185,7 @@
*
* @return The category list.
*/
+ @Override
public List getColumnKeys() {
return this.keys;
}
@@ -191,6 +197,7 @@
*
* @return The column key.
*/
+ @Override
public Comparable getColumnKey(int index) {
return (Comparable) this.keys.get(index);
}
@@ -202,6 +209,7 @@
*
* @return The column index.
*/
+ @Override
public int getColumnIndex(Comparable columnKey) {
ParamChecks.nullNotPermitted(columnKey, "columnKey");
return this.keys.indexOf(columnKey);
@@ -214,6 +222,7 @@
*
* @return The index.
*/
+ @Override
public int getRowIndex(Comparable rowKey) {
int result = -1;
int count = this.data.size();
@@ -234,6 +243,7 @@
*
* @return The key.
*/
+ @Override
public Comparable getRowKey(int index) {
TaskSeries series = (TaskSeries) this.data.get(index);
return series.getKey();
@@ -330,6 +340,7 @@
*
* @return The item value.
*/
+ @Override
public Number getValue(Comparable rowKey, Comparable columnKey) {
return getStartValue(rowKey, columnKey);
}
@@ -342,6 +353,7 @@
*
* @return The start value.
*/
+ @Override
public Number getValue(int row, int column) {
return getStartValue(row, column);
}
@@ -355,6 +367,7 @@
*
* @return The start value (possibly <code>null</code>).
*/
+ @Override
public Number getStartValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
int row = getRowIndex(rowKey);
@@ -377,6 +390,7 @@
*
* @return The start value.
*/
+ @Override
public Number getStartValue(int row, int column) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -392,6 +406,7 @@
*
* @return The end value (possibly <code>null</code>).
*/
+ @Override
public Number getEndValue(Comparable rowKey, Comparable columnKey) {
Number result = null;
int row = getRowIndex(rowKey);
@@ -414,6 +429,7 @@
*
* @return The end value.
*/
+ @Override
public Number getEndValue(int row, int column) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -428,6 +444,7 @@
*
* @return The percent complete (possibly <code>null</code>).
*/
+ @Override
public Number getPercentComplete(int row, int column) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -442,6 +459,7 @@
*
* @return The percent complete.
*/
+ @Override
public Number getPercentComplete(Comparable rowKey, Comparable columnKey) {
Number result = null;
int row = getRowIndex(rowKey);
@@ -461,6 +479,7 @@
*
* @return The sub-interval count.
*/
+ @Override
public int getSubIntervalCount(int row, int column) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -475,6 +494,7 @@
*
* @return The sub-interval count.
*/
+ @Override
public int getSubIntervalCount(Comparable rowKey, Comparable columnKey) {
int result = 0;
int row = getRowIndex(rowKey);
@@ -495,6 +515,7 @@
*
* @return The start value (possibly <code>null</code>).
*/
+ @Override
public Number getStartValue(int row, int column, int subinterval) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -510,6 +531,7 @@
*
* @return The start value (possibly <code>null</code>).
*/
+ @Override
public Number getStartValue(Comparable rowKey, Comparable columnKey,
int subinterval) {
Number result = null;
@@ -535,6 +557,7 @@
*
* @return The end value (possibly <code>null</code>).
*/
+ @Override
public Number getEndValue(int row, int column, int subinterval) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -550,6 +573,7 @@
*
* @return The end value (possibly <code>null</code>).
*/
+ @Override
public Number getEndValue(Comparable rowKey, Comparable columnKey,
int subinterval) {
Number result = null;
@@ -575,6 +599,7 @@
*
* @return The percent complete value (possibly <code>null</code>).
*/
+ @Override
public Number getPercentComplete(int row, int column, int subinterval) {
Comparable rowKey = getRowKey(row);
Comparable columnKey = getColumnKey(column);
@@ -590,6 +615,7 @@
*
* @return The percent complete value (possibly <code>null</code>).
*/
+ @Override
public Number getPercentComplete(Comparable rowKey, Comparable columnKey,
int subinterval) {
Number result = null;
@@ -610,6 +636,7 @@
*
* @param event information about the change.
*/
+ @Override
public void seriesChanged(SeriesChangeEvent event) {
refreshKeys();
fireDatasetChanged();
@@ -644,6 +671,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -666,6 +694,7 @@
* @throws CloneNotSupportedException if there is some problem cloning
* the dataset.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
TaskSeriesCollection clone = (TaskSeriesCollection) super.clone();
clone.data = (List) ObjectUtilities.deepClone(this.data);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/XYTaskDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/XYTaskDataset.java 2013-11-22 19:23:55 UTC (rev 3037)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/gantt/XYTaskDataset.java 2013-11-22 19:24:19 UTC (rev 3038)
@@ -156,6 +156,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.underlying.getSeriesCount();
}
@@ -167,6 +168,7 @@
*
* @return The name of a series.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.underlying.getSeriesKey(series);
}
@@ -178,6 +180,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return this.underlying.getSeries(series).getItemCount();
}
@@ -190,6 +193,7 @@
*
* @return The value.
*/
+ @Override
public double getXValue(int series, int item) {
if (!this.transposed) {
return getSeriesValue(series);
@@ -209,6 +213,7 @@
*
* @return The start date/time.
*/
+ @Override
public double getStartXValue(int series, int item) {
if (!this.transposed) {
return getSeriesStartValue(series);
@@ -228,6 +233,7 @@
*
* @return The end date/time.
*/
+ @Override
public double getEndXValue(int series, int item) {
if (!this.transposed) {
return getSeriesEndValue(series);
@@ -245,6 +251,7 @@
*
* @return The x-value (in milliseconds).
*/
+ @Override
public Number getX(int series, int item) {
return new Double(getXValue(series, item));
}
@@ -259,6 +266,7 @@
*
* @return The start date/time.
*/
+ @Override
public Number getStartX(int series, int item) {
return new Double(getStartXValue(series, item));
}
@@ -273,6 +281,7 @@
*
* @return The end date/time.
*/
+ @Override
public Number getEndX(int series, int item) {
return new Double(getEndXValue(series, item));
}
@@ -285,6 +294,7 @@
*
* @return The value.
*/
+ @Override
public double getYValue(int series, int item) {
if (!this.transposed) {
return getItemValue(series, item);
@@ -303,6 +313,7 @@
*
* @return The y-interval start.
*/
+ @Override
public double getStartYValue(int series, int item) {
if (!this.transposed) {
return getItemStartValue(series, item);
@@ -321,6 +332,7 @@
*
* @return The y-interval end.
*/
+ @Override
public double getEndYValue(int series, int item) {
if (!this.transposed) {
return getItemEndValue(series, item);
@@ -340,6 +352,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
return new Double(getYValue(series, item));
}
@@ -353,6 +366,7 @@
*
* @return The y-interval start.
*/
+ @Override
public Number getStartY(int series, int item) {
return new Double(getStartYValue(series, item));
}
@@ -366,6 +380,7 @@
*
* @return The y-interval end.
*/
+ @Override
public Number getEndY(int series, int item) {
return new Double(getEndYValue(series, item));
}
@@ -414,6 +429,7 @@
*
* @param event the event.
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
fireDatasetChanged();
}
@@ -425,6 +441,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -452,6 +469,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYTaskDataset clone = (XYTaskDataset) super.clone();
clone.underlying = (TaskSeriesCollection) this.underlying.clone();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:23:57
|
Revision: 3037
http://sourceforge.net/p/jfreechart/code/3037
Author: mungady
Date: 2013-11-22 19:23:55 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/contour/DefaultContourDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/contour/DefaultContourDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/contour/DefaultContourDataset.java 2013-11-22 19:23:41 UTC (rev 3036)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/contour/DefaultContourDataset.java 2013-11-22 19:23:55 UTC (rev 3037)
@@ -218,6 +218,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
if (series > 0) {
throw new IllegalArgumentException("Only one series for contour");
@@ -230,6 +231,7 @@
*
* @return The maximum z-value.
*/
+ @Override
public double getMaxZValue() {
double zMax = -1.e20;
for (int k = 0; k < this.zValues.length; k++) {
@@ -245,6 +247,7 @@
*
* @return The minimum z-value.
*/
+ @Override
public double getMinZValue() {
double zMin = 1.e20;
for (int k = 0; k < this.zValues.length; k++) {
@@ -263,6 +266,7 @@
*
* @return The z range.
*/
+ @Override
public Range getZValueRange(Range x, Range y) {
double minX = x.getLowerBound();
@@ -319,6 +323,7 @@
*
* @return 1.
*/
+ @Override
public int getSeriesCount() {
return 1;
}
@@ -332,6 +337,7 @@
*
* @return The series name.
*/
+ @Override
public Comparable getSeriesKey(int series) {
if (series > 0) {
throw new IllegalArgumentException("Only one series for contour");
@@ -344,6 +350,7 @@
*
* @return The x values.
*/
+ @Override
public int[] getXIndices() {
return this.xIndex;
}
@@ -353,6 +360,7 @@
*
* @return The x values.
*/
+ @Override
public Number[] getXValues() {
return this.xValues;
}
@@ -366,6 +374,7 @@
*
* @return The x value.
*/
+ @Override
public Number getX(int series, int item) {
if (series > 0) {
throw new IllegalArgumentException("Only one series for contour");
@@ -389,6 +398,7 @@
*
* @return The Y values.
*/
+ @Override
public Number[] getYValues() {
return this.yValues;
}
@@ -402,6 +412,7 @@
*
* @return The Y value.
*/
+ @Override
public Number getY(int series, int item) {
if (series > 0) {
throw new IllegalArgumentException("Only one series for contour");
@@ -414,6 +425,7 @@
*
* @return The Z values.
*/
+ @Override
public Number[] getZValues() {
return this.zValues;
}
@@ -427,6 +439,7 @@
*
* @return The Z value.
*/
+ @Override
public Number getZ(int series, int item) {
if (series > 0) {
throw new IllegalArgumentException("Only one series for contour");
@@ -439,6 +452,7 @@
*
* @return The X values.
*/
+ @Override
public int[] indexX() {
int[] index = new int[this.xValues.length];
for (int k = 0; k < index.length; k++) {
@@ -495,6 +509,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isDateAxis(int axisNumber) {
if (axisNumber < 0 || axisNumber > 2) {
return false; // bad axisNumber
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:23:44
|
Revision: 3036
http://sourceforge.net/p/jfreechart/code/3036
Author: mungady
Date: 2013-11-22 19:23:41 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/CategoryToPieDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/DefaultIntervalCategoryDataset.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/SlidingCategoryDataset.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/CategoryToPieDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/CategoryToPieDataset.java 2013-11-22 19:23:28 UTC (rev 3035)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/CategoryToPieDataset.java 2013-11-22 19:23:41 UTC (rev 3036)
@@ -141,6 +141,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
int result = 0;
if (this.source != null) {
@@ -164,6 +165,7 @@
* @throws IndexOutOfBoundsException if <code>item</code> is not in the
* range <code>0</code> to <code>getItemCount() - 1</code>.
*/
+ @Override
public Number getValue(int item) {
Number result = null;
if (item < 0 || item >= getItemCount()) {
@@ -191,6 +193,7 @@
* @throws IndexOutOfBoundsException if <code>index</code> is not in the
* specified range.
*/
+ @Override
public Comparable getKey(int index) {
Comparable result = null;
if (index < 0 || index >= getItemCount()) {
@@ -214,6 +217,7 @@
*
* @return The index for the key, or <code>-1</code>.
*/
+ @Override
public int getIndex(Comparable key) {
int result = -1;
if (this.source != null) {
@@ -235,6 +239,7 @@
*
* @return The keys.
*/
+ @Override
public List getKeys() {
List result = Collections.EMPTY_LIST;
if (this.source != null) {
@@ -257,6 +262,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(Comparable key) {
Number result = null;
int keyIndex = getIndex(key);
@@ -278,6 +284,7 @@
* @param event the event (ignored, a new event with this dataset as the
* source is sent to the listeners).
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
fireDatasetChanged();
}
@@ -291,6 +298,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/DefaultIntervalCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/DefaultIntervalCategoryDataset.java 2013-11-22 19:23:28 UTC (rev 3035)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/DefaultIntervalCategoryDataset.java 2013-11-22 19:23:41 UTC (rev 3036)
@@ -224,6 +224,7 @@
* @see #getRowCount()
* @see #getCategoryCount()
*/
+ @Override
public int getSeriesCount() {
int result = 0;
if (this.startData != null) {
@@ -262,6 +263,7 @@
*
* @see #getSeriesIndex(Comparable)
*/
+ @Override
public Comparable getSeriesKey(int series) {
if ((series >= getSeriesCount()) || (series < 0)) {
throw new IllegalArgumentException("No such series : " + series);
@@ -313,6 +315,7 @@
*
* @see #getRowKeys()
*/
+ @Override
public List getColumnKeys() {
// the CategoryDataset interface expects a list of categories, but
// we've stored them in an array...
@@ -364,6 +367,7 @@
*
* @see #getEndValue(Comparable, Comparable)
*/
+ @Override
public Number getValue(Comparable series, Comparable category) {
int seriesIndex = getSeriesIndex(series);
if (seriesIndex < 0) {
@@ -389,6 +393,7 @@
*
* @see #getEndValue(int, int)
*/
+ @Override
public Number getValue(int series, int category) {
return getEndValue(series, category);
}
@@ -404,6 +409,7 @@
*
* @see #getStartValue(int, int)
*/
+ @Override
public Number getStartValue(Comparable series, Comparable category) {
int seriesIndex = getSeriesIndex(series);
if (seriesIndex < 0) {
@@ -427,6 +433,7 @@
*
* @see #getStartValue(Comparable, Comparable)
*/
+ @Override
public Number getStartValue(int series, int category) {
// check arguments...
@@ -457,6 +464,7 @@
*
* @see #getEndValue(int, int)
*/
+ @Override
public Number getEndValue(Comparable series, Comparable category) {
int seriesIndex = getSeriesIndex(series);
if (seriesIndex < 0) {
@@ -479,6 +487,7 @@
*
* @see #getEndValue(Comparable, Comparable)
*/
+ @Override
public Number getEndValue(int series, int category) {
if ((series < 0) || (series >= getSeriesCount())) {
throw new IllegalArgumentException(
@@ -609,6 +618,7 @@
*
* @see #getRowKey(int)
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.categoryKeys[column];
}
@@ -622,6 +632,7 @@
*
* @see #getCategoryIndex(Comparable)
*/
+ @Override
public int getColumnIndex(Comparable columnKey) {
ParamChecks.nullNotPermitted(columnKey, "columnKey");
return getCategoryIndex(columnKey);
@@ -636,6 +647,7 @@
*
* @see #getSeriesIndex(Comparable)
*/
+ @Override
public int getRowIndex(Comparable rowKey) {
return getSeriesIndex(rowKey);
}
@@ -648,6 +660,7 @@
*
* @see #getColumnKeys()
*/
+ @Override
public List getRowKeys() {
// the CategoryDataset interface expects a list of series, but
// we've stored them in an array...
@@ -668,6 +681,7 @@
*
* @see #getColumnKey(int)
*/
+ @Override
public Comparable getRowKey(int row) {
if ((row >= getRowCount()) || (row < 0)) {
throw new IllegalArgumentException(
@@ -685,6 +699,7 @@
* @see #getCategoryCount()
* @see #getRowCount()
*/
+ @Override
public int getColumnCount() {
return this.categoryKeys.length;
}
@@ -697,6 +712,7 @@
* @see #getSeriesCount()
* @see #getColumnCount()
*/
+ @Override
public int getRowCount() {
return this.seriesKeys.length;
}
@@ -708,6 +724,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -741,6 +758,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* dataset.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultIntervalCategoryDataset clone
= (DefaultIntervalCategoryDataset) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/SlidingCategoryDataset.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/SlidingCategoryDataset.java 2013-11-22 19:23:28 UTC (rev 3035)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/category/SlidingCategoryDataset.java 2013-11-22 19:23:41 UTC (rev 3036)
@@ -169,6 +169,7 @@
*
* @return The column index, or -1 if the key is not recognised.
*/
+ @Override
public int getColumnIndex(Comparable key) {
int index = this.underlying.getColumnIndex(key);
if (index >= this.firstCategoryIndex && index <= lastCategoryIndex()) {
@@ -186,6 +187,7 @@
*
* @throws IndexOutOfBoundsException if <code>row</code> is out of bounds.
*/
+ @Override
public Comparable getColumnKey(int column) {
return this.underlying.getColumnKey(column + this.firstCategoryIndex);
}
@@ -197,6 +199,7 @@
*
* @see #getColumnKey(int)
*/
+ @Override
public List getColumnKeys() {
List result = new java.util.ArrayList();
int last = lastCategoryIndex();
@@ -213,6 +216,7 @@
*
* @return The row index, or <code>-1</code> if the key is unrecognised.
*/
+ @Override
public int getRowIndex(Comparable key) {
return this.underlying.getRowIndex(key);
}
@@ -226,6 +230,7 @@
*
* @throws IndexOutOfBoundsException if <code>row</code> is out of bounds.
*/
+ @Override
public Comparable getRowKey(int row) {
return this.underlying.getRowKey(row);
}
@@ -235,6 +240,7 @@
*
* @return The keys.
*/
+ @Override
public List getRowKeys() {
return this.underlying.getRowKeys();
}
@@ -249,6 +255,7 @@
*
* @throws UnknownKeyException if either key is not defined in the dataset.
*/
+ @Override
public Number getValue(Comparable rowKey, Comparable columnKey) {
int r = getRowIndex(rowKey);
int c = getColumnIndex(columnKey);
@@ -265,6 +272,7 @@
*
* @return The column count.
*/
+ @Override
public int getColumnCount() {
int last = lastCategoryIndex();
if (last == -1) {
@@ -280,6 +288,7 @@
*
* @return The row count.
*/
+ @Override
public int getRowCount() {
return this.underlying.getRowCount();
}
@@ -292,6 +301,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue(int row, int column) {
return this.underlying.getValue(row, column + this.firstCategoryIndex);
}
@@ -304,6 +314,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -338,6 +349,7 @@
* @throws CloneNotSupportedException if the dataset cannot be cloned for
* any reason.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SlidingCategoryDataset clone = (SlidingCategoryDataset) super.clone();
if (this.underlying instanceof PublicCloneable) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:23:31
|
Revision: 3035
http://sourceforge.net/p/jfreechart/code/3035
Author: mungady
Date: 2013-11-22 19:23:28 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectSeries.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValue.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues2D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/DomainOrder.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyToGroupMap.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObject.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects2D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparatorType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/Range.java
branches/jfreechart-1.0.x-branch/source/org/jfree/data/RangeType.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectItem.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectItem.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -116,6 +116,7 @@
* @return An integer indicating the order of this data pair object
* relative to another object.
*/
+ @Override
public int compareTo(Object o1) {
int result;
@@ -146,6 +147,7 @@
* @throws CloneNotSupportedException not thrown by this class, but
* subclasses may differ.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -158,6 +160,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -180,6 +183,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.x.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectSeries.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectSeries.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/ComparableObjectSeries.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -127,6 +127,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.data.size();
}
@@ -391,6 +392,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -422,6 +424,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
// it is too slow to look at every data item, so let's just look at
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValue.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValue.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValue.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -88,6 +88,7 @@
*
* @return The key (never <code>null</code>).
*/
+ @Override
public Comparable getKey() {
return this.key;
}
@@ -97,6 +98,7 @@
*
* @return The value (possibly <code>null</code>).
*/
+ @Override
public Number getValue() {
return this.value;
}
@@ -117,6 +119,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -141,6 +144,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = (this.key != null ? this.key.hashCode() : 0);
@@ -158,6 +162,7 @@
* @throws CloneNotSupportedException Not thrown by this class, but
* subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return (DefaultKeyedValue) super.clone();
}
@@ -168,6 +173,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "(" + this.key.toString() + ", " + this.value.toString() + ")";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -107,6 +107,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount() {
return this.indexMap.size();
}
@@ -120,6 +121,7 @@
*
* @throws IndexOutOfBoundsException if <code>item</code> is out of bounds.
*/
+ @Override
public Number getValue(int item) {
return (Number) this.values.get(item);
}
@@ -133,6 +135,7 @@
*
* @throws IndexOutOfBoundsException if <code>item</code> is out of bounds.
*/
+ @Override
public Comparable getKey(int index) {
return (Comparable) this.keys.get(index);
}
@@ -147,6 +150,7 @@
* @throws IllegalArgumentException if <code>key</code> is
* <code>null</code>.
*/
+ @Override
public int getIndex(Comparable key) {
ParamChecks.nullNotPermitted(key, "key");
final Integer i = (Integer) this.indexMap.get(key);
@@ -161,6 +165,7 @@
*
* @return The keys (never <code>null</code>).
*/
+ @Override
public List getKeys() {
return (List) this.keys.clone();
}
@@ -176,6 +181,7 @@
*
* @see #getValue(int)
*/
+ @Override
public Number getValue(Comparable key) {
int index = getIndex(key);
if (index < 0) {
@@ -400,6 +406,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -442,6 +449,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (this.keys != null ? this.keys.hashCode() : 0);
}
@@ -454,6 +462,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultKeyedValues clone = (DefaultKeyedValues) super.clone();
clone.keys = (ArrayList) this.keys.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues2D.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/DefaultKeyedValues2D.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -497,6 +497,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object o) {
if (o == null) {
@@ -550,6 +551,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = this.rowKeys.hashCode();
@@ -566,6 +568,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultKeyedValues2D clone = (DefaultKeyedValues2D) super.clone();
// for the keys, a shallow copy should be fine because keys
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/DomainOrder.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/DomainOrder.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/DomainOrder.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -79,6 +79,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -91,6 +92,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -110,6 +112,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyToGroupMap.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyToGroupMap.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyToGroupMap.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -223,6 +223,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -248,6 +249,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* map.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
KeyToGroupMap result = (KeyToGroupMap) super.clone();
result.defaultGroup
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObject.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObject.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObject.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -109,6 +109,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
KeyedObject clone = (KeyedObject) super.clone();
if (this.object instanceof PublicCloneable) {
@@ -125,6 +126,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -286,6 +286,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
KeyedObjects clone = (KeyedObjects) super.clone();
clone.data = new java.util.ArrayList();
@@ -304,6 +305,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -346,6 +348,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return (this.data != null ? this.data.hashCode() : 0);
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects2D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects2D.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedObjects2D.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -431,6 +431,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -478,6 +479,7 @@
*
* @return A hashcode.
*/
+ @Override
public int hashCode() {
int result;
result = this.rowKeys.hashCode();
@@ -494,6 +496,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
KeyedObjects2D clone = (KeyedObjects2D) super.clone();
clone.columnKeys = new java.util.ArrayList(this.columnKeys);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparator.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparator.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -103,6 +103,7 @@
*
* @return An int indicating the relative order of the objects.
*/
+ @Override
public int compare(Object o1, Object o2) {
if (o2 == null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparatorType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparatorType.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/KeyedValueComparatorType.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -74,6 +74,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -86,6 +87,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -107,6 +109,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/Range.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/Range.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/Range.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -400,6 +400,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof Range)) {
return false;
@@ -419,6 +420,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
long temp;
@@ -435,6 +437,7 @@
* @return A String "Range[lower,upper]" where lower=lower range and
* upper=upper range.
*/
+ @Override
public String toString() {
return ("Range[" + this.lower + "," + this.upper + "]");
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/RangeType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/data/RangeType.java 2013-11-22 19:23:16 UTC (rev 3034)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/RangeType.java 2013-11-22 19:23:28 UTC (rev 3035)
@@ -80,6 +80,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -92,6 +93,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -112,6 +114,7 @@
*
* @return The hashcode
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:23:19
|
Revision: 3034
http://sourceforge.net/p/jfreechart/code/3034
Author: mungady
Date: 2013-11-22 19:23:16 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/HexNumberFormat.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/HexNumberFormat.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/HexNumberFormat.java 2013-11-22 19:22:59 UTC (rev 3033)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/HexNumberFormat.java 2013-11-22 19:23:16 UTC (rev 3034)
@@ -112,6 +112,7 @@
*
* @return The string buffer.
*/
+ @Override
public StringBuffer format(double number, StringBuffer toAppendTo,
FieldPosition pos) {
return format((long) number, toAppendTo, pos);
@@ -127,6 +128,7 @@
*
* @return The string buffer.
*/
+ @Override
public StringBuffer format(long number, StringBuffer toAppendTo,
FieldPosition pos) {
String l_hex = Long.toHexString(number).toUpperCase();
@@ -152,6 +154,7 @@
*
* @return Always <code>null</code>.
*/
+ @Override
public Number parse (String source, ParsePosition parsePosition) {
return null; // don't bother with parsing
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:23:02
|
Revision: 3033
http://sourceforge.net/p/jfreechart/code/3033
Author: mungady
Date: 2013-11-22 19:22:59 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomCategoryURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -119,6 +119,7 @@
*
* @return A string containing the URL (possibly <code>null</code>).
*/
+ @Override
public String generateURL(CategoryDataset dataset, int series, int item) {
return getURL(series, item);
}
@@ -143,6 +144,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -187,6 +189,7 @@
*
* @throws CloneNotSupportedException if there is a problem with cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CustomCategoryURLGenerator clone
= (CustomCategoryURLGenerator) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomPieURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -85,6 +85,7 @@
*
* @see #getURL(Comparable, int)
*/
+ @Override
public String generateURL(PieDataset dataset, Comparable key,
int pieIndex) {
return getURL(key, pieIndex);
@@ -161,6 +162,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object o) {
if (o == this) {
@@ -199,6 +201,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CustomPieURLGenerator urlGen = new CustomPieURLGenerator();
Map map;
@@ -215,7 +218,6 @@
}
urlGen.addURLs(newMap);
- newMap = null;
}
return urlGen;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/CustomXYURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -128,6 +128,7 @@
*
* @return A string containing the URL (possibly <code>null</code>).
*/
+ @Override
public String generateURL(XYDataset dataset, int series, int item) {
return getURL(series, item);
}
@@ -153,6 +154,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -199,6 +201,7 @@
*
* @throws CloneNotSupportedException if there is a problem with cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CustomXYURLGenerator clone = (CustomXYURLGenerator) super.clone();
clone.urlSeries = new java.util.ArrayList(this.urlSeries);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardCategoryURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -127,6 +127,7 @@
*
* @return The generated URL.
*/
+ @Override
public String generateURL(CategoryDataset dataset, int series,
int category) {
String url = this.prefix;
@@ -149,6 +150,7 @@
* @throws CloneNotSupportedException not thrown by this class, but
* subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
// all attributes are immutable, so we can just return the super.clone()
// FIXME: in fact, the generator itself is immutable, so cloning is
@@ -163,6 +165,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -191,6 +194,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
result = (this.prefix != null ? this.prefix.hashCode() : 0);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardPieURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -129,6 +129,7 @@
*
* @return A string containing the generated URL.
*/
+ @Override
public String generateURL(PieDataset dataset, Comparable key,
int pieIndex) {
String url = this.prefix;
@@ -154,6 +155,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -129,6 +129,7 @@
*
* @return The generated URL.
*/
+ @Override
public String generateURL(XYDataset dataset, int series, int item) {
// TODO: URLEncode?
String url = this.prefix;
@@ -146,6 +147,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/StandardXYZURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -57,6 +57,7 @@
*
* @return A string containing the generated URL.
*/
+ @Override
public String generateURL(XYZDataset dataset, int series, int item) {
return super.generateURL(dataset, series, item);
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2013-11-22 19:22:46 UTC (rev 3032)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/urls/TimeSeriesURLGenerator.java 2013-11-22 19:22:59 UTC (rev 3033)
@@ -162,6 +162,7 @@
*
* @return The generated URL.
*/
+ @Override
public String generateURL(XYDataset dataset, int series, int item) {
String result = this.prefix;
boolean firstParameter = result.indexOf("?") == -1;
@@ -189,6 +190,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:22:49
|
Revision: 3032
http://sourceforge.net/p/jfreechart/code/3032
Author: mungady
Date: 2013-11-22 19:22:46 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/ChartDeleter.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/DisplayChart.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/ChartDeleter.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/ChartDeleter.java 2013-11-22 19:22:33 UTC (rev 3031)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/ChartDeleter.java 2013-11-22 19:22:46 UTC (rev 3032)
@@ -94,6 +94,7 @@
*
* @param event the session bind event.
*/
+ @Override
public void valueBound(HttpSessionBindingEvent event) {
// nothing to do
}
@@ -105,6 +106,7 @@
*
* @param event the session unbind event.
*/
+ @Override
public void valueUnbound(HttpSessionBindingEvent event) {
Iterator iter = this.chartNames.listIterator();
while (iter.hasNext()) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/DisplayChart.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/DisplayChart.java 2013-11-22 19:22:33 UTC (rev 3031)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/servlet/DisplayChart.java 2013-11-22 19:22:46 UTC (rev 3032)
@@ -83,6 +83,7 @@
*
* @throws ServletException never.
*/
+ @Override
public void init() throws ServletException {
// nothing to do
}
@@ -96,6 +97,7 @@
* @throws ServletException ??.
* @throws IOException ??.
*/
+ @Override
public void service(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 19:22:36
|
Revision: 3031
http://sourceforge.net/p/jfreechart/code/3031
Author: mungady
Date: 2013-11-22 19:22:33 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-11-22 19:22:33 UTC (rev 3031)
@@ -216,6 +216,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset data, int row, int column,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 17:38:09
|
Revision: 3030
http://sourceforge.net/p/jfreechart/code/3030
Author: mungady
Date: 2013-11-22 17:38:06 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/CyclicXYItemRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/GradientXYBarPainter.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/HighLowRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/SamplingXYLineRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer2.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYBarPainter.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/VectorRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/WindItemRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBlockRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDotRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLine3DRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYShapeRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/CyclicXYItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/CyclicXYItemRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/CyclicXYItemRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -140,18 +140,11 @@
* (<code>null</code> permitted).
* @param pass the current pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
if ((!getPlotLines()) || ((!(domainAxis instanceof CyclicNumberAxis))
&& (!(rangeAxis instanceof CyclicNumberAxis))) || (item <= 0)) {
@@ -357,6 +350,7 @@
*
* @return The domain order.
*/
+ @Override
public DomainOrder getDomainOrder() {
return DomainOrder.NONE;
}
@@ -368,6 +362,7 @@
*
* @return The item count.
*/
+ @Override
public int getItemCount(int series) {
return this.x.length;
}
@@ -380,6 +375,7 @@
*
* @return The x-value.
*/
+ @Override
public Number getX(int series, int item) {
return this.x[item];
}
@@ -393,11 +389,12 @@
*
* @return The x-value.
*/
+ @Override
public double getXValue(int series, int item) {
double result = Double.NaN;
- Number x = getX(series, item);
- if (x != null) {
- result = x.doubleValue();
+ Number xx = getX(series, item);
+ if (xx != null) {
+ result = xx.doubleValue();
}
return result;
}
@@ -410,6 +407,7 @@
*
* @return The y-value.
*/
+ @Override
public Number getY(int series, int item) {
return this.y[item];
}
@@ -423,11 +421,12 @@
*
* @return The y-value.
*/
+ @Override
public double getYValue(int series, int item) {
double result = Double.NaN;
- Number y = getY(series, item);
- if (y != null) {
- result = y.doubleValue();
+ Number yy = getY(series, item);
+ if (yy != null) {
+ result = yy.doubleValue();
}
return result;
}
@@ -437,6 +436,7 @@
*
* @return The series count.
*/
+ @Override
public int getSeriesCount() {
return this.delegateSet.getSeriesCount();
}
@@ -448,6 +448,7 @@
*
* @return The series name.
*/
+ @Override
public Comparable getSeriesKey(int series) {
return this.delegateSet.getSeriesKey(series);
}
@@ -459,6 +460,7 @@
*
* @return The index.
*/
+ @Override
public int indexOf(Comparable seriesName) {
return this.delegateSet.indexOf(seriesName);
}
@@ -468,6 +470,7 @@
*
* @param listener ignored.
*/
+ @Override
public void addChangeListener(DatasetChangeListener listener) {
// unused in parent
}
@@ -477,6 +480,7 @@
*
* @param listener ignored.
*/
+ @Override
public void removeChangeListener(DatasetChangeListener listener) {
// unused in parent
}
@@ -486,6 +490,7 @@
*
* @return The dataset group.
*/
+ @Override
public DatasetGroup getGroup() {
// unused but must return something, so while we are at it...
return this.delegateSet.getGroup();
@@ -496,6 +501,7 @@
*
* @param group ignored.
*/
+ @Override
public void setGroup(DatasetGroup group) {
// unused in parent
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/GradientXYBarPainter.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/GradientXYBarPainter.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/GradientXYBarPainter.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -101,6 +101,7 @@
* @param base indicates which side of the rectangle is the base of the
* bar.
*/
+ @Override
public void paintBar(Graphics2D g2, XYBarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base) {
@@ -201,6 +202,7 @@
* bar.
* @param pegShadow peg the shadow to the base of the bar?
*/
+ @Override
public void paintBarShadow(Graphics2D g2, XYBarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base,
boolean pegShadow) {
@@ -339,6 +341,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -364,6 +367,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 37;
hash = HashUtilities.hashCode(hash, this.g1);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/HighLowRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/HighLowRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/HighLowRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -289,6 +289,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
if (dataset != null) {
return DatasetUtilities.findRangeBounds(dataset, true);
@@ -316,18 +317,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
double x = dataset.getXValue(series, item);
if (!domainAxis.getRange().contains(x)) {
@@ -459,6 +453,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -470,6 +465,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/SamplingXYLineRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/SamplingXYLineRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/SamplingXYLineRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -130,6 +130,7 @@
*
* @return The pass count.
*/
+ @Override
public int getPassCount() {
return 1;
}
@@ -197,6 +198,7 @@
* @param pass the current pass index.
* @param passCount the number of passes.
*/
+ @Override
public void startSeriesPass(XYDataset dataset, int series,
int firstItem, int lastItem, int pass, int passCount) {
this.seriesPath.reset();
@@ -224,6 +226,7 @@
*
* @return The renderer state.
*/
+ @Override
public XYItemRendererState initialise(Graphics2D g2,
Rectangle2D dataArea, XYPlot plot, XYDataset data,
PlotRenderingInfo info) {
@@ -258,18 +261,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
// do nothing if item is not visible
if (!getItemVisible(series, item)) {
@@ -349,6 +345,7 @@
*
* @throws CloneNotSupportedException if the clone cannot be created.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SamplingXYLineRenderer clone = (SamplingXYLineRenderer) super.clone();
if (this.legendLine != null) {
@@ -364,6 +361,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -325,6 +325,7 @@
* @return A state object that should be passed to subsequent calls to the
* drawItem() method.
*/
+ @Override
public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
XYPlot plot, XYDataset data, PlotRenderingInfo info) {
@@ -340,6 +341,7 @@
*
* @return 2.
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -356,6 +358,7 @@
* @throws ClassCastException if <code>dataset</code> is not an instance
* of {@link TableXYDataset}.
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
if (dataset != null) {
return DatasetUtilities.findStackedRangeBounds(
@@ -387,6 +390,7 @@
* <code>StackedXYAreaRendererState</code> or <code>dataset</code>
* is not an instance of {@link TableXYDataset}.
*/
+ @Override
public void drawItem(Graphics2D g2, XYItemRendererState state,
Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
@@ -631,6 +635,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -655,6 +660,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer2.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer2.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYAreaRenderer2.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -163,6 +163,7 @@
* @return The range (or <code>null</code> if the dataset is
* <code>null</code> or empty).
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
if (dataset == null) {
return null;
@@ -188,6 +189,7 @@
*
* @return 1.
*/
+ @Override
public int getPassCount() {
return 1;
}
@@ -209,21 +211,14 @@
* @param crosshairState information about crosshairs on a plot.
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
// setup for collecting optional entity info...
- Shape entityArea = null;
+ Shape entityArea;
EntityCollection entities = null;
if (info != null) {
entities = info.getOwner().getEntityCollection();
@@ -539,6 +534,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -560,6 +556,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYBarPainter.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYBarPainter.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYBarPainter.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -80,6 +80,7 @@
* @param base indicates which side of the rectangle is the base of the
* bar.
*/
+ @Override
public void paintBar(Graphics2D g2, XYBarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base) {
@@ -117,6 +118,7 @@
* bar.
* @param pegShadow peg the shadow to the base of the bar?
*/
+ @Override
public void paintBarShadow(Graphics2D g2, XYBarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base,
boolean pegShadow) {
@@ -197,6 +199,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -212,6 +215,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 37;
// no fields to compute...
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StandardXYItemRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -641,6 +641,7 @@
*
* @return A legend item for the series.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
XYPlot plot = getPlot();
if (plot == null) {
@@ -769,11 +770,9 @@
*
* @return The renderer state.
*/
- public XYItemRendererState initialise(Graphics2D g2,
- Rectangle2D dataArea,
- XYPlot plot,
- XYDataset data,
- PlotRenderingInfo info) {
+ @Override
+ public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
+ XYPlot plot, XYDataset data, PlotRenderingInfo info) {
State state = new State(info);
state.seriesPath = new GeneralPath();
@@ -800,18 +799,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
boolean itemVisible = getItemVisible(series, item);
@@ -1006,6 +998,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -1059,6 +1052,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
StandardXYItemRenderer clone = (StandardXYItemRenderer) super.clone();
clone.seriesShapesFilled
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/VectorRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/VectorRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/VectorRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -101,6 +101,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findDomainBounds(XYDataset dataset) {
ParamChecks.nullNotPermitted(dataset, "dataset");
double minimum = Double.POSITIVE_INFINITY;
@@ -155,6 +156,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
ParamChecks.nullNotPermitted(dataset, "dataset");
double minimum = Double.POSITIVE_INFINITY;
@@ -216,6 +218,7 @@
* @param crosshairState the crosshair state.
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, XYItemRendererState state,
Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
@@ -287,7 +290,7 @@
g2.draw(p);
// setup for collecting optional entity info...
- EntityCollection entities = null;
+ EntityCollection entities;
if (info != null) {
entities = info.getOwner().getEntityCollection();
if (entities != null) {
@@ -312,6 +315,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -337,6 +341,7 @@
* @throws CloneNotSupportedException if there is a problem creating the
* clone.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/WindItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/WindItemRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/WindItemRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -114,18 +114,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D plotArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D plotArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
WindDataset windData = (WindDataset) dataset;
@@ -207,6 +200,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -413,6 +413,7 @@
*
* @return A state object for use by the renderer.
*/
+ @Override
public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
XYPlot plot, XYDataset data, PlotRenderingInfo info) {
XYAreaRendererState state = new XYAreaRendererState(info);
@@ -432,6 +433,7 @@
*
* @return A legend item for the series.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
LegendItem result = null;
XYPlot xyplot = getPlot();
@@ -486,6 +488,7 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, XYItemRendererState state,
Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
@@ -582,7 +585,7 @@
g2.setPaint(paint);
g2.setStroke(stroke);
- Shape shape = null;
+ Shape shape;
if (getPlotShapes()) {
shape = getItemShape(series, item);
if (orientation == PlotOrientation.VERTICAL) {
@@ -686,6 +689,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYAreaRenderer clone = (XYAreaRenderer) super.clone();
clone.legendArea = ShapeUtilities.clone(this.legendArea);
@@ -699,6 +703,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -736,6 +741,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = HashUtilities.hashCode(result, this.plotArea);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYAreaRenderer2.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -237,6 +237,7 @@
*
* @return A legend item for the series.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
LegendItem result = null;
XYPlot xyplot = getPlot();
@@ -291,18 +292,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
if (!getItemVisible(series, item)) {
return;
@@ -417,6 +411,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -441,6 +436,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYAreaRenderer2 clone = (XYAreaRenderer2) super.clone();
clone.legendArea = ShapeUtilities.clone(this.legendArea);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBlockRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBlockRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBlockRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -287,6 +287,7 @@
*
* @see #findRangeBounds(XYDataset)
*/
+ @Override
public Range findDomainBounds(XYDataset dataset) {
if (dataset == null) {
return null;
@@ -310,6 +311,7 @@
*
* @see #findDomainBounds(XYDataset)
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
if (dataset != null) {
Range r = DatasetUtilities.findRangeBounds(dataset, false);
@@ -342,6 +344,7 @@
* @param crosshairState the crosshair state.
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, XYItemRendererState state,
Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
@@ -400,6 +403,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -431,6 +435,7 @@
* @throws CloneNotSupportedException if there is a problem creating the
* clone.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYBlockRenderer clone = (XYBlockRenderer) super.clone();
if (this.paintScale instanceof PublicCloneable) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -341,6 +341,7 @@
*
* @return The number of passes required by the renderer.
*/
+ @Override
public int getPassCount() {
return 2;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDotRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDotRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDotRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -223,18 +223,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
// do nothing if item is not visible
if (!getItemVisible(series, item)) {
@@ -281,6 +274,7 @@
*
* @return A legend item for the series (possibly <code>null</code>).
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
// if the renderer isn't assigned to a plot, then we don't have a
@@ -342,6 +336,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -369,6 +364,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLine3DRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLine3DRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLine3DRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -97,6 +97,7 @@
*
* @return The 3D effect.
*/
+ @Override
public double getXOffset() {
return this.xOffset;
}
@@ -106,6 +107,7 @@
*
* @return The 3D effect.
*/
+ @Override
public double getYOffset() {
return this.yOffset;
}
@@ -161,6 +163,7 @@
*
* @return The pass count.
*/
+ @Override
public int getPassCount() {
return 3;
}
@@ -172,6 +175,7 @@
*
* @return A boolean.
*/
+ @Override
protected boolean isLinePass(int pass) {
return pass == 0 || pass == 1;
}
@@ -183,6 +187,7 @@
*
* @return A boolean.
*/
+ @Override
protected boolean isItemPass(int pass) {
return pass == 2;
}
@@ -207,11 +212,9 @@
* @param item the item index (zero-based).
* @param shape the shape.
*/
- protected void drawFirstPassShape(Graphics2D g2,
- int pass,
- int series,
- int item,
- Shape shape) {
+ @Override
+ protected void drawFirstPassShape(Graphics2D g2, int pass, int series,
+ int item, Shape shape) {
if (isShadowPass(pass)) {
if (getWallPaint() != null) {
g2.setStroke(getItemStroke(series, item));
@@ -234,6 +237,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -261,6 +261,7 @@
*
* @return The pass count.
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -828,6 +829,7 @@
* @param pass the current pass index.
* @param passCount the number of passes.
*/
+ @Override
public void startSeriesPass(XYDataset dataset, int series,
int firstItem, int lastItem, int pass, int passCount) {
this.seriesPath.reset();
@@ -999,7 +1001,7 @@
}
PlotOrientation orientation = plot.getOrientation();
- boolean visible = false;
+ boolean visible;
if (orientation == PlotOrientation.HORIZONTAL) {
state.workingLine.setLine(transY0, transX0, transY1, transX1);
}
@@ -1196,6 +1198,7 @@
*
* @return A legend item for the series (possibly <code>null</code).
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
XYPlot plot = getPlot();
if (plot == null) {
@@ -1259,6 +1262,7 @@
*
* @throws CloneNotSupportedException if the clone cannot be created.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYLineAndShapeRenderer clone = (XYLineAndShapeRenderer) super.clone();
clone.seriesLinesVisible
@@ -1280,6 +1284,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYShapeRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYShapeRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYShapeRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -342,6 +342,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findDomainBounds(XYDataset dataset) {
if (dataset == null) {
return null;
@@ -364,6 +365,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
if (dataset == null) {
return null;
@@ -399,6 +401,7 @@
*
* @return <code>2</code>.
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -419,12 +422,13 @@
* @param crosshairState the crosshair state.
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, XYItemRendererState state,
Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
int series, int item, CrosshairState crosshairState, int pass) {
- Shape hotspot = null;
+ Shape hotspot;
EntityCollection entities = null;
if (info != null) {
entities = info.getOwner().getEntityCollection();
@@ -507,7 +511,7 @@
* @return The paint.
*/
protected Paint getPaint(XYDataset dataset, int series, int item) {
- Paint p = null;
+ Paint p;
if (dataset instanceof XYZDataset) {
double z = ((XYZDataset) dataset).getZValue(series, item);
p = this.paintScale.getPaint(z);
@@ -537,6 +541,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -577,6 +582,7 @@
* @throws CloneNotSupportedException if there is a problem creating the
* clone.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYShapeRenderer clone = (XYShapeRenderer) super.clone();
if (this.paintScale instanceof PublicCloneable) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepAreaRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -313,13 +313,10 @@
*
* @return The number of passes required by the renderer.
*/
- public XYItemRendererState initialise(Graphics2D g2,
- Rectangle2D dataArea,
- XYPlot plot,
- XYDataset data,
- PlotRenderingInfo info) {
+ @Override
+ public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
+ XYPlot plot, XYDataset data, PlotRenderingInfo info) {
-
XYItemRendererState state = super.initialise(g2, dataArea, plot, data,
info);
// disable visible items optimisation - it doesn't work for this
@@ -348,18 +345,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
PlotOrientation orientation = plot.getOrientation();
@@ -406,7 +396,7 @@
}
}
- double transX0 = 0;
+ double transX0;
double transY0;
double x0;
@@ -539,6 +529,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -572,6 +563,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYStepRenderer.java 2013-11-22 17:38:06 UTC (rev 3030)
@@ -192,18 +192,11 @@
* (<code>null</code> permitted).
* @param pass the pass index.
*/
- public void drawItem(Graphics2D g2,
- XYItemRendererState state,
- Rectangle2D dataArea,
- PlotRenderingInfo info,
- XYPlot plot,
- ValueAxis domainAxis,
- ValueAxis rangeAxis,
- XYDataset dataset,
- int series,
- int item,
- CrosshairState crosshairState,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, XYItemRendererState state,
+ Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+ ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+ int series, int item, CrosshairState crosshairState, int pass) {
// do nothing if item is not visible
if (!getItemVisible(series, item)) {
@@ -333,6 +326,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -352,6 +346,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return HashUtilities.hashCode(super.hashCode(), this.stepPoint);
}
@@ -363,6 +358,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 17:37:55
|
Revision: 3029
http://sourceforge.net/p/jfreechart/code/3029
Author: mungady
Date: 2013-11-22 17:37:52 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AreaRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GanttRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AreaRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AreaRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AreaRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -156,6 +156,7 @@
*
* @return The legend item.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
// if there is no plot, there is no dataset to access...
@@ -217,6 +218,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -338,6 +340,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -359,6 +362,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BoxAndWhiskerRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -448,6 +448,7 @@
*
* @return The legend item (possibly <code>null</code>).
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
CategoryPlot cp = getPlot();
@@ -501,6 +502,7 @@
*
* @return The range.
*/
+ @Override
public Range findRangeBounds(CategoryDataset dataset) {
return super.findRangeBounds(dataset, true);
}
@@ -517,11 +519,10 @@
*
* @return The renderer state.
*/
- public CategoryItemRendererState initialise(Graphics2D g2,
- Rectangle2D dataArea,
- CategoryPlot plot,
- int rendererIndex,
- PlotRenderingInfo info) {
+ @Override
+ public CategoryItemRendererState initialise(Graphics2D g2,
+ Rectangle2D dataArea, CategoryPlot plot, int rendererIndex,
+ PlotRenderingInfo info) {
CategoryItemRendererState state = super.initialise(g2, dataArea, plot,
rendererIndex, info);
@@ -578,6 +579,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -711,7 +713,7 @@
// draw mean - SPECIAL AIMS REQUIREMENT...
g2.setPaint(this.artifactPaint);
- double aRadius = 0; // average radius
+ double aRadius; // average radius
if (this.meanVisible) {
Number xMean = bawDataset.getMeanValue(row, column);
if (xMean != null) {
@@ -801,7 +803,7 @@
xx = xx + offset;
}
- double yyAverage = 0.0;
+ double yyAverage;
double yyOutlier;
Paint itemPaint = getItemPaint(row, column);
@@ -1048,6 +1050,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/CategoryStepRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -165,6 +165,7 @@
*
* @return The legend item.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
CategoryPlot p = getPlot();
@@ -218,6 +219,7 @@
*
* @return A new state instance.
*/
+ @Override
protected CategoryItemRendererState createState(PlotRenderingInfo info) {
return new State(info);
}
@@ -268,16 +270,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row,
+ int column, int pass) {
// do nothing if item is not visible
if (!getItemVisible(row, column)) {
@@ -358,6 +355,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GanttRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GanttRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GanttRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -239,16 +239,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row,
+ int column, int pass) {
if (dataset instanceof GanttCategoryDataset) {
GanttCategoryDataset gcd = (GanttCategoryDataset) dataset;
@@ -569,6 +564,7 @@
*
* @since 1.0.11
*/
+ @Override
public double getItemMiddle(Comparable rowKey, Comparable columnKey,
CategoryDataset dataset, CategoryAxis axis, Rectangle2D area,
RectangleEdge edge) {
@@ -583,6 +579,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -115,6 +115,7 @@
* @return The range (or <code>null</code> if the dataset is
* <code>null</code> or empty).
*/
+ @Override
public Range findRangeBounds(CategoryDataset dataset) {
if (dataset == null) {
return null;
@@ -134,10 +135,9 @@
* @param rendererIndex the renderer index.
* @param state the renderer state.
*/
- protected void calculateBarWidth(CategoryPlot plot,
- Rectangle2D dataArea,
- int rendererIndex,
- CategoryItemRendererState state) {
+ @Override
+ protected void calculateBarWidth(CategoryPlot plot, Rectangle2D dataArea,
+ int rendererIndex, CategoryItemRendererState state) {
// calculate the bar width
CategoryAxis xAxis = plot.getDomainAxisForDataset(rendererIndex);
@@ -192,15 +192,13 @@
*
* @return The coordinate.
*/
- protected double calculateBarW0(CategoryPlot plot,
- PlotOrientation orientation,
- Rectangle2D dataArea,
- CategoryAxis domainAxis,
- CategoryItemRendererState state,
- int row,
- int column) {
+ @Override
+ protected double calculateBarW0(CategoryPlot plot,
+ PlotOrientation orientation, Rectangle2D dataArea,
+ CategoryAxis domainAxis, CategoryItemRendererState state,
+ int row, int column) {
// calculate bar width...
- double space = 0.0;
+ double space;
if (orientation == PlotOrientation.HORIZONTAL) {
space = dataArea.getHeight();
}
@@ -244,16 +242,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row,
+ int column, int pass) {
// nothing is drawn for null values...
Number dataValue = dataset.getValue(row, column);
@@ -325,7 +318,7 @@
double barLength = Math.max(Math.abs(translatedValue - translatedBase),
getMinimumBarLength());
- Rectangle2D bar = null;
+ Rectangle2D bar;
if (orientation == PlotOrientation.HORIZONTAL) {
bar = new Rectangle2D.Double(barL0, barW0, barLength,
state.getBarWidth());
@@ -360,6 +353,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/IntervalBarRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -113,6 +113,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, true);
}
@@ -131,16 +132,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
+ int pass) {
if (dataset instanceof IntervalCategoryDataset) {
IntervalCategoryDataset d = (IntervalCategoryDataset) dataset;
@@ -263,6 +259,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LayeredBarRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -132,10 +132,9 @@
* @param rendererIndex the renderer index.
* @param state the renderer state.
*/
- protected void calculateBarWidth(CategoryPlot plot,
- Rectangle2D dataArea,
- int rendererIndex,
- CategoryItemRendererState state) {
+ @Override
+ protected void calculateBarWidth(CategoryPlot plot, Rectangle2D dataArea,
+ int rendererIndex, CategoryItemRendererState state) {
// calculate the bar width - this calculation differs from the
// BarRenderer calculation because the bars are layered on top of one
@@ -185,16 +184,11 @@
* @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 data,
- int row,
- int column,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset data, int row, int column,
+ int pass) {
PlotOrientation orientation = plot.getOrientation();
if (orientation == PlotOrientation.HORIZONTAL) {
@@ -285,7 +279,7 @@
// draw the bar...
double shift = 0.0;
- double rectHeight = 0.0;
+ double rectHeight;
double widthFactor = 1.0;
double seriesBarWidth = getSeriesBarWidth(row);
if (!Double.isNaN(seriesBarWidth)) {
@@ -410,7 +404,7 @@
double transY2 = rangeAxis.valueToJava2D(value, dataArea, edge);
double rectY = Math.min(transY2, transY1);
- double rectWidth = 0.0;
+ double rectWidth;
double rectHeight = Math.abs(transY2 - transY1);
// draw the bar...
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LevelRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -176,6 +176,7 @@
*
* @return The renderer state.
*/
+ @Override
public CategoryItemRendererState initialise(Graphics2D g2,
Rectangle2D dataArea, CategoryPlot plot, int rendererIndex,
PlotRenderingInfo info) {
@@ -249,15 +250,12 @@
*
* @return The coordinate.
*/
- protected double calculateBarW0(CategoryPlot plot,
- PlotOrientation orientation,
- Rectangle2D dataArea,
- CategoryAxis domainAxis,
- CategoryItemRendererState state,
- int row,
- int column) {
+ protected double calculateBarW0(CategoryPlot plot,
+ PlotOrientation orientation, Rectangle2D dataArea,
+ CategoryAxis domainAxis, CategoryItemRendererState state, int row,
+ int column) {
// calculate bar width...
- double space = 0.0;
+ double space;
if (orientation == PlotOrientation.HORIZONTAL) {
space = dataArea.getHeight();
}
@@ -301,6 +299,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -328,9 +327,8 @@
double barL = rangeAxis.valueToJava2D(value, dataArea, edge);
// draw the bar...
- Line2D line = null;
- double x = 0.0;
- double y = 0.0;
+ Line2D line;
+ double x, y;
if (orientation == PlotOrientation.HORIZONTAL) {
x = barL;
y = barW0 + state.getBarWidth() / 2.0;
@@ -404,6 +402,7 @@
*
* @since 1.0.11
*/
+ @Override
public double getItemMiddle(Comparable rowKey, Comparable columnKey,
CategoryDataset dataset, CategoryAxis axis, Rectangle2D area,
RectangleEdge edge) {
@@ -418,6 +417,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -440,6 +440,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = super.hashCode();
hash = HashUtilities.hashCode(hash, this.itemMargin);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineAndShapeRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -821,6 +821,7 @@
*
* @return The legend item.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
CategoryPlot cp = getPlot();
@@ -878,6 +879,7 @@
*
* @return The pass count (<code>2</code> for this renderer).
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -896,6 +898,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -1042,6 +1045,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -1101,6 +1105,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
LineAndShapeRenderer clone = (LineAndShapeRenderer) super.clone();
clone.seriesLinesVisible
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/LineRenderer3D.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -138,6 +138,7 @@
* @see #setXOffset(double)
* @see #getYOffset()
*/
+ @Override
public double getXOffset() {
return this.xOffset;
}
@@ -150,6 +151,7 @@
* @see #setYOffset(double)
* @see #getXOffset()
*/
+ @Override
public double getYOffset() {
return this.yOffset;
}
@@ -214,6 +216,7 @@
* @param plot the plot.
* @param dataArea the area inside the axes.
*/
+ @Override
public void drawBackground(Graphics2D g2, CategoryPlot plot,
Rectangle2D dataArea) {
@@ -295,6 +298,7 @@
* @param plot the plot.
* @param dataArea the area inside the axes.
*/
+ @Override
public void drawOutline(Graphics2D g2, CategoryPlot plot,
Rectangle2D dataArea) {
@@ -338,10 +342,9 @@
* @param value the Java2D value at which the grid line should be drawn.
*
*/
- public void drawDomainGridline(Graphics2D g2,
- CategoryPlot plot,
- Rectangle2D dataArea,
- double value) {
+ @Override
+ public void drawDomainGridline(Graphics2D g2, CategoryPlot plot,
+ Rectangle2D dataArea, double value) {
Line2D line1 = null;
Line2D line2 = null;
@@ -382,11 +385,9 @@
* @param value the value at which the grid line should be drawn.
*
*/
- public void drawRangeGridline(Graphics2D g2,
- CategoryPlot plot,
- ValueAxis axis,
- Rectangle2D dataArea,
- double value) {
+ @Override
+ public void drawRangeGridline(Graphics2D g2, CategoryPlot plot,
+ ValueAxis axis, Rectangle2D dataArea, double value) {
Range range = axis.getRange();
@@ -438,11 +439,9 @@
* @param marker the marker.
* @param dataArea the area for plotting data (not including 3D effect).
*/
- public void drawRangeMarker(Graphics2D g2,
- CategoryPlot plot,
- ValueAxis axis,
- Marker marker,
- Rectangle2D dataArea) {
+ @Override
+ public void drawRangeMarker(Graphics2D g2, CategoryPlot plot,
+ ValueAxis axis, Marker marker, Rectangle2D dataArea) {
Rectangle2D adjusted = new Rectangle2D.Double(dataArea.getX(),
dataArea.getY() + getYOffset(),
@@ -509,16 +508,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row,
+ int column, int pass) {
if (!getItemVisible(row, column)) {
return;
@@ -626,6 +620,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/MinMaxCategoryRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -320,6 +320,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -426,6 +427,7 @@
*
* @since 1.0.7
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -458,33 +460,35 @@
private Icon getIcon(Shape shape, final Paint fillPaint,
final Paint outlinePaint) {
- final int width = shape.getBounds().width;
- final int height = shape.getBounds().height;
- final GeneralPath path = new GeneralPath(shape);
- return new Icon() {
- public void paintIcon(Component c, Graphics g, int x, int y) {
- Graphics2D g2 = (Graphics2D) g;
- path.transform(AffineTransform.getTranslateInstance(x, y));
- if (fillPaint != null) {
- g2.setPaint(fillPaint);
- g2.fill(path);
- }
- if (outlinePaint != null) {
- g2.setPaint(outlinePaint);
- g2.draw(path);
- }
- path.transform(AffineTransform.getTranslateInstance(-x, -y));
- }
+ final int width = shape.getBounds().width;
+ final int height = shape.getBounds().height;
+ final GeneralPath path = new GeneralPath(shape);
+ return new Icon() {
+ @Override
+ public void paintIcon(Component c, Graphics g, int x, int y) {
+ Graphics2D g2 = (Graphics2D) g;
+ path.transform(AffineTransform.getTranslateInstance(x, y));
+ if (fillPaint != null) {
+ g2.setPaint(fillPaint);
+ g2.fill(path);
+ }
+ if (outlinePaint != null) {
+ g2.setPaint(outlinePaint);
+ g2.draw(path);
+ }
+ path.transform(AffineTransform.getTranslateInstance(-x, -y));
+ }
- public int getIconWidth() {
- return width;
- }
+ @Override
+ public int getIconWidth() {
+ return width;
+ }
- public int getIconHeight() {
- return height;
- }
-
- };
+ @Override
+ public int getIconHeight() {
+ return height;
+ }
+ };
}
/**
@@ -502,6 +506,7 @@
final int height = shape.getBounds().height;
final GeneralPath path = new GeneralPath(shape);
return new Icon() {
+ @Override
public void paintIcon(Component c, Graphics g, int x, int y) {
Graphics2D g2 = (Graphics2D) g;
path.transform(AffineTransform.getTranslateInstance(x, y));
@@ -514,10 +519,12 @@
path.transform(AffineTransform.getTranslateInstance(-x, -y));
}
+ @Override
public int getIconWidth() {
return width;
}
+ @Override
public int getIconHeight() {
return height;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/ScatterRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -366,6 +366,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, true);
}
@@ -384,6 +385,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -462,6 +464,7 @@
*
* @return The legend item.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
CategoryPlot cp = getPlot();
@@ -518,6 +521,7 @@
* @param obj the object (<code>null</code> permitted).
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -558,6 +562,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ScatterRenderer clone = (ScatterRenderer) super.clone();
clone.seriesShapesFilled
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedAreaRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -157,6 +157,7 @@
*
* @return The number of passes required by the renderer.
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -169,6 +170,7 @@
*
* @return The range (or <code>null</code> if the dataset is empty).
*/
+ @Override
public Range findRangeBounds(CategoryDataset dataset) {
if (dataset == null) {
return null;
@@ -195,23 +197,18 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
+ int pass) {
if (!isSeriesVisible(row)) {
return;
}
// setup for collecting optional entity info...
- Shape entityArea = null;
+ Shape entityArea;
EntityCollection entities = state.getEntityCollection();
double y1 = 0.0;
@@ -496,6 +493,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -199,6 +199,7 @@
*
* @return The number of passes required by the renderer.
*/
+ @Override
public int getPassCount() {
return 3;
}
@@ -211,6 +212,7 @@
*
* @return The range (or <code>null</code> if the dataset is empty).
*/
+ @Override
public Range findRangeBounds(CategoryDataset dataset) {
if (dataset == null) {
return null;
@@ -231,10 +233,9 @@
* @param rendererIndex the renderer index.
* @param state the renderer state.
*/
- protected void calculateBarWidth(CategoryPlot plot,
- Rectangle2D dataArea,
- int rendererIndex,
- CategoryItemRendererState state) {
+ @Override
+ protected void calculateBarWidth(CategoryPlot plot, Rectangle2D dataArea,
+ int rendererIndex, CategoryItemRendererState state) {
// calculate the bar width
CategoryAxis xAxis = plot.getDomainAxisForDataset(rendererIndex);
@@ -282,16 +283,11 @@
* @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) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row,
+ int column, int pass) {
if (!isSeriesVisible(row)) {
return;
@@ -374,7 +370,7 @@
double barLength = Math.max(Math.abs(translatedValue - translatedBase),
getMinimumBarLength());
- Rectangle2D bar = null;
+ Rectangle2D bar;
if (orientation == PlotOrientation.HORIZONTAL) {
bar = new Rectangle2D.Double(barL0, barW0, barLength,
state.getBarWidth());
@@ -417,6 +413,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StackedBarRenderer3D.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -256,6 +256,7 @@
*
* @return The range (or <code>null</code> if the dataset is empty).
*/
+ @Override
public Range findRangeBounds(CategoryDataset dataset) {
if (dataset == null) {
return null;
@@ -274,10 +275,9 @@
* @param rendererIndex the renderer index.
* @param state the renderer state.
*/
- protected void calculateBarWidth(CategoryPlot plot,
- Rectangle2D dataArea,
- int rendererIndex,
- CategoryItemRendererState state) {
+ @Override
+ protected void calculateBarWidth(CategoryPlot plot, Rectangle2D dataArea,
+ int rendererIndex, CategoryItemRendererState state) {
// calculate the bar width
CategoryAxis domainAxis = getDomainAxis(plot, rendererIndex);
@@ -417,6 +417,7 @@
* @param column the column index (zero-based).
* @param pass the pass index.
*/
+ @Override
public void drawItem(Graphics2D g2, CategoryItemRendererState state,
Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
@@ -491,7 +492,7 @@
int index = (inverted ? blockCount - k - 1 : k);
Object[] prev = (Object[]) values.get(index);
Object[] curr = (Object[]) values.get(index + 1);
- int series = 0;
+ int series;
if (curr[0] == null) {
series = -((Integer) prev[0]).intValue() - 1;
}
@@ -684,7 +685,7 @@
int index = (inverted ? blockCount - k - 1 : k);
Object[] prev = (Object[]) values.get(index);
Object[] curr = (Object[]) values.get(index + 1);
- int series = 0;
+ int series;
if (curr[0] == null) {
series = -((Integer) prev[0]).intValue() - 1;
}
@@ -847,6 +848,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -869,6 +871,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = super.hashCode();
hash = HashUtilities.hashCode(hash, this.renderAsPercentages);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StandardBarPainter.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -81,6 +81,7 @@
* @param base indicates which side of the rectangle is the base of the
* bar.
*/
+ @Override
public void paintBar(Graphics2D g2, BarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base) {
@@ -118,6 +119,7 @@
* bar.
* @param pegShadow peg the shadow to the base of the bar?
*/
+ @Override
public void paintBarShadow(Graphics2D g2, BarRenderer renderer, int row,
int column, RectangularShape bar, RectangleEdge base,
boolean pegShadow) {
@@ -198,6 +200,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -213,6 +216,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 37;
// no fields to compute...
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalBarRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -196,6 +196,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, true);
}
@@ -215,16 +216,10 @@
* @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 data,
- int row,
- int column,
- int pass) {
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset data, int row, int column,
+ int pass) {
int visibleRow = state.getVisibleSeriesIndex(row);
if (visibleRow < 0) {
@@ -368,7 +363,7 @@
else {
g2.setStroke(getItemOutlineStroke(row, column));
}
- Line2D line = null;
+ Line2D line;
line = new Line2D.Double(lowVal, rectY + rectHeight / 2.0d,
highVal, rectY + rectHeight / 2.0d);
g2.draw(line);
@@ -516,7 +511,7 @@
g2.setStroke(getItemOutlineStroke(row, column));
}
- Line2D line = null;
+ Line2D line;
line = new Line2D.Double(rectX + rectWidth / 2.0d, lowVal,
rectX + rectWidth / 2.0d, highVal);
g2.draw(line);
@@ -549,6 +544,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/StatisticalLineAndShapeRenderer.java 2013-11-22 17:37:52 UTC (rev 3029)
@@ -198,6 +198,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, true);
}
@@ -217,16 +218,11 @@
* @param column the column index (zero-based).
* @param pass the pass.
*/
- public void drawItem(Graphics2D g2,
- CategoryItemRendererState state,
- Rectangle2D dataArea,
- CategoryPlot plot,
- CategoryAxis domainAxis,
- ValueAxis rangeAxis,
- CategoryDataset dataset,
- int row,
- int column,
- int pass) {
+ @Override
+ public void drawItem(Graphics2D g2, CategoryItemRendererState state,
+ Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+ ValueAxis rangeAxis, CategoryDataset dataset, int row, int column,
+ int pass) {
// do nothing if item is not visible
if (!getItemVisible(row, column)) {
@@ -431,6 +427,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -456,6 +453,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = super.hashCode();
hash = HashUtilities.hashCode(hash, this.errorIndicatorPaint);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:45:36
|
Revision: 3028
http://sourceforge.net/p/jfreechart/code/3028
Author: mungady
Date: 2013-11-22 16:45:33 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/LookupPaintScale.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AbstractRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -2948,6 +2948,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -3150,6 +3151,7 @@
*
* @return The hashcode.
*/
+ @Override
public int hashCode() {
int result = 193;
result = HashUtilities.hashCode(result, this.seriesVisibleList);
@@ -3192,6 +3194,7 @@
* @throws CloneNotSupportedException if some component of the renderer
* does not support cloning.
*/
+ @Override
protected Object clone() throws CloneNotSupportedException {
AbstractRenderer clone = (AbstractRenderer) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/AreaRendererEndType.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -86,6 +86,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -98,22 +99,19 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (this == obj) {
return true;
}
if (!(obj instanceof AreaRendererEndType)) {
return false;
}
-
- AreaRendererEndType t = (AreaRendererEndType) obj;
- if (!this.name.equals(t.toString())) {
+ AreaRendererEndType that = (AreaRendererEndType) obj;
+ if (!this.name.equals(that.toString())) {
return false;
}
-
return true;
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/GrayPaintScale.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -126,6 +126,7 @@
*
* @see #getUpperBound()
*/
+ @Override
public double getLowerBound() {
return this.lowerBound;
}
@@ -137,6 +138,7 @@
*
* @see #getLowerBound()
*/
+ @Override
public double getUpperBound() {
return this.upperBound;
}
@@ -160,6 +162,7 @@
*
* @return A paint for the specified value.
*/
+ @Override
public Paint getPaint(double value) {
double v = Math.max(value, this.lowerBound);
v = Math.min(v, this.upperBound);
@@ -183,6 +186,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -208,6 +212,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 7;
hash = HashUtilities.hashCode(hash, this.lowerBound);
@@ -224,6 +229,7 @@
* @throws CloneNotSupportedException if there is a problem cloning this
* instance.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/LookupPaintScale.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/LookupPaintScale.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/LookupPaintScale.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -100,6 +100,7 @@
*
* @return An int defining the relative order of the objects.
*/
+ @Override
public int compareTo(Object obj) {
PaintItem that = (PaintItem) obj;
double d1 = this.value;
@@ -120,6 +121,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -224,6 +226,7 @@
*
* @see #getUpperBound()
*/
+ @Override
public double getLowerBound() {
return this.lowerBound;
}
@@ -235,6 +238,7 @@
*
* @see #getLowerBound()
*/
+ @Override
public double getUpperBound() {
return this.upperBound;
}
@@ -283,6 +287,7 @@
*
* @see #getDefaultPaint()
*/
+ @Override
public Paint getPaint(double value) {
// handle value outside bounds...
@@ -334,6 +339,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -365,6 +371,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* instance.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
LookupPaintScale clone = (LookupPaintScale) super.clone();
clone.lookupTable = new java.util.ArrayList(this.lookupTable);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -142,6 +142,7 @@
* is less than, equal to, or greater than the specified object.
*
*/
+ @Override
public int compareTo(Object o) {
Outlier outlier = (Outlier) o;
Point2D p1 = getPoint();
@@ -181,6 +182,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -203,6 +205,7 @@
*
* @return A <code>String</code> representing the outlier.
*/
+ @Override
public String toString() {
return "{" + getX() + "," + getY() + "}";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java 2013-11-22 16:45:25 UTC (rev 3027)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/WaferMapRenderer.java 2013-11-22 16:45:33 UTC (rev 3028)
@@ -150,6 +150,7 @@
*
* @return The drawing supplier.
*/
+ @Override
public DrawingSupplier getDrawingSupplier() {
DrawingSupplier result = null;
WaferMapPlot p = getPlot();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:45:27
|
Revision: 3027
http://sourceforge.net/p/jfreechart/code/3027
Author: mungady
Date: 2013-11-22 16:45:25 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/ArcDialFrame.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialBackground.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialCap.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPointer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialTextAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialValueIndicator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialFrame.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialRange.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialScale.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/AbstractDialLayer.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -82,6 +82,7 @@
*
* @see #setVisible(boolean)
*/
+ @Override
public boolean isVisible() {
return this.visible;
}
@@ -107,6 +108,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -123,6 +125,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 23;
result = HashUtilities.hashCode(result, this.visible);
@@ -137,6 +140,7 @@
* @throws CloneNotSupportedException if there is a problem cloning this
* instance.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
AbstractDialLayer clone = (AbstractDialLayer) super.clone();
// we don't clone the listeners
@@ -151,6 +155,7 @@
*
* @see #removeChangeListener(DialLayerChangeListener)
*/
+ @Override
public void addChangeListener(DialLayerChangeListener listener) {
this.listenerList.add(DialLayerChangeListener.class, listener);
}
@@ -162,6 +167,7 @@
*
* @see #addChangeListener(DialLayerChangeListener)
*/
+ @Override
public void removeChangeListener(DialLayerChangeListener listener) {
this.listenerList.remove(DialLayerChangeListener.class, listener);
}
@@ -175,6 +181,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean hasListener(EventListener listener) {
List list = Arrays.asList(this.listenerList.getListenerList());
return list.contains(listener);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/ArcDialFrame.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/ArcDialFrame.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/ArcDialFrame.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -321,6 +321,7 @@
*
* @return The shape of the dial's window.
*/
+ @Override
public Shape getWindow(Rectangle2D frame) {
Rectangle2D innerFrame = DialPlot.rectangleByRadius(frame,
@@ -379,6 +380,7 @@
* @param frame the dial's reference frame.
* @param view the dial's view rectangle.
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -404,6 +406,7 @@
*
* @return <code>false</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return false;
}
@@ -415,6 +418,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -452,6 +456,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.startAngle);
@@ -478,6 +483,7 @@
* @throws CloneNotSupportedException if any attribute of this instance
* cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialBackground.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialBackground.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialBackground.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -163,6 +163,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -177,6 +178,7 @@
* @param frame the dial frame (ignored here).
* @param view the view rectangle (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -196,6 +198,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -219,6 +222,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + HashUtilities.hashCodeForPaint(this.paint);
@@ -234,6 +238,7 @@
* @throws CloneNotSupportedException if some attribute of this instance
* cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialCap.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialCap.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialCap.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -217,6 +217,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -231,6 +232,7 @@
* @param frame the dial frame (ignored here).
* @param view the view rectangle (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -254,6 +256,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -282,6 +285,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + HashUtilities.hashCodeForPaint(this.fillPaint);
@@ -299,6 +303,7 @@
* @throws CloneNotSupportedException if some attribute of the cap cannot
* be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPlot.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -525,6 +525,7 @@
* @param info used to collect plot rendering info (<code>null</code>
* permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
PlotState parentState, PlotRenderingInfo info) {
@@ -721,6 +722,7 @@
*
* @param event the event.
*/
+ @Override
public void dialLayerChanged(DialLayerChangeEvent event) {
fireChangeEvent();
}
@@ -734,6 +736,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -777,6 +780,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + ObjectUtilities.hashCode(this.background);
@@ -798,6 +802,7 @@
*
* @return <code>"DialPlot"</code>
*/
+ @Override
public String getPlotType() {
return "DialPlot";
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPointer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPointer.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialPointer.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -155,6 +155,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -166,6 +167,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -188,6 +190,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 23;
result = HashUtilities.hashCode(result, this.radius);
@@ -202,6 +205,7 @@
* @throws CloneNotSupportedException if one of the attributes cannot
* be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -297,6 +301,7 @@
* @param frame the dial's reference frame.
* @param view the dial's view.
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -324,6 +329,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -346,6 +352,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = HashUtilities.hashCode(result, this.paint);
@@ -519,6 +526,7 @@
* @param frame the dial's reference frame.
* @param view the dial's view.
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -579,6 +587,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -605,6 +614,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = HashUtilities.hashCode(result, this.widthRadius);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialTextAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialTextAnnotation.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialTextAnnotation.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -276,6 +276,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -290,6 +291,7 @@
* @param frame the dial frame (ignored here).
* @param view the view rectangle (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -312,6 +314,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -346,6 +349,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + HashUtilities.hashCodeForPaint(this.paint);
@@ -367,6 +371,7 @@
* @throws CloneNotSupportedException if some attribute of this instance
* cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialValueIndicator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialValueIndicator.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/DialValueIndicator.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -548,6 +548,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -562,6 +563,7 @@
* @param frame the dial frame (ignored here).
* @param view the view rectangle (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -657,6 +659,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -716,6 +719,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + HashUtilities.hashCodeForPaint(this.paint);
@@ -735,6 +739,7 @@
* @throws CloneNotSupportedException if some attribute of this instance
* cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialFrame.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialFrame.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialFrame.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -216,6 +216,7 @@
*
* @return The shape of the dial's window.
*/
+ @Override
public Shape getWindow(Rectangle2D frame) {
Rectangle2D f = DialPlot.rectangleByRadius(frame, this.radius,
this.radius);
@@ -229,6 +230,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isClippedToWindow() {
return false;
}
@@ -242,6 +244,7 @@
* @param frame the frame (<code>null</code> not permitted).
* @param view the view (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -271,6 +274,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -299,6 +303,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.radius);
@@ -319,6 +324,7 @@
* @throws CloneNotSupportedException if any of the frame's attributes
* cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialRange.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialRange.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialRange.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -299,6 +299,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -311,6 +312,7 @@
* @param frame the dial's reference frame (in Java2D space).
* @param view the dial's view rectangle (in Java2D space).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -345,6 +347,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -379,6 +382,7 @@
*
* @return The hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.lowerBound);
@@ -401,6 +405,7 @@
* @throws CloneNotSupportedException if any of the attributes of this
* instance cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialScale.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialScale.java 2013-11-22 16:36:25 UTC (rev 3026)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/dial/StandardDialScale.java 2013-11-22 16:45:25 UTC (rev 3027)
@@ -739,6 +739,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isClippedToWindow() {
return true;
}
@@ -753,6 +754,7 @@
* @param view the visible part of the plot (<code>null</code> not
* permitted).
*/
+ @Override
public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
Rectangle2D view) {
@@ -840,6 +842,7 @@
*
* @see #angleToValue(double)
*/
+ @Override
public double valueToAngle(double value) {
double range = this.upperBound - this.lowerBound;
double unit = this.extent / range;
@@ -855,6 +858,7 @@
*
* @see #valueToAngle(double)
*/
+ @Override
public double angleToValue(double angle) {
double range = this.upperBound - this.lowerBound;
double unit = range / this.extent;
@@ -869,6 +873,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -936,6 +941,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
// lowerBound
@@ -976,6 +982,7 @@
*
* @throws CloneNotSupportedException if this instance is not cloneable.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:36:28
|
Revision: 3026
http://sourceforge.net/p/jfreechart/code/3026
Author: mungady
Date: 2013-11-22 16:36:25 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryMarker.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ColorPalette.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CompassPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Crosshair.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Marker.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterInterval.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotRenderingInfo.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarAxisLocation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SpiderWebPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ThermometerPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryMarker.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryMarker.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CategoryMarker.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -162,6 +162,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ColorPalette.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ColorPalette.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ColorPalette.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -136,7 +136,7 @@
* @return The color.
*/
public Color getColorLinear(double value) {
- int izV = 0;
+ int izV;
if (this.stepped) {
int index = Arrays.binarySearch(this.tickValues, value);
if (index < 0) {
@@ -165,7 +165,7 @@
* @return The color.
*/
public Color getColorLog(double value) {
- int izV = 0;
+ int izV;
double minZtmp = this.minZ;
double maxZtmp = this.maxZ;
if (this.minZ <= 0.0) {
@@ -389,6 +389,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -440,6 +441,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
long temp;
@@ -462,11 +464,10 @@
*
* @throws CloneNotSupportedException never.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
-
ColorPalette clone = (ColorPalette) super.clone();
return clone;
-
}
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CompassPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CompassPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/CompassPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -564,9 +564,9 @@
* @param parentState the state from the parent plot, if there is one.
* @param info collects info about the drawing.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
- PlotState parentState,
- PlotRenderingInfo info) {
+ PlotState parentState, PlotRenderingInfo info) {
int outerRadius, innerRadius;
int x1, y1, x2, y2;
@@ -698,6 +698,7 @@
*
* @return A string describing the plot.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Compass_Plot");
}
@@ -708,6 +709,7 @@
*
* @return The legend items.
*/
+ @Override
public LegendItemCollection getLegendItems() {
return null;
}
@@ -717,6 +719,7 @@
*
* @param percent the zoom amount.
*/
+ @Override
public void zoom(double percent) {
// no zooming possible
}
@@ -744,6 +747,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -796,6 +800,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CompassPlot clone = (CompassPlot) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ContourPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -557,9 +557,9 @@
* @param info collects chart drawing information (<code>null</code>
* permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
- PlotState parentState,
- PlotRenderingInfo info) {
+ PlotState parentState, PlotRenderingInfo info) {
// if the plot area is too small, just return...
boolean b1 = (area.getWidth() <= MINIMUM_WIDTH_TO_DRAW);
@@ -1153,6 +1153,7 @@
* @param y y-coordinate, where the click occured.
* @param info An object for collection dimension information.
*/
+ @Override
public void handleClick(int x, int y, PlotRenderingInfo info) {
/* // set the anchor value for the horizontal axis...
@@ -1183,6 +1184,7 @@
*
* @param percent The amount of the zoom.
*/
+ @Override
public void zoom(double percent) {
if (percent > 0) {
@@ -1206,6 +1208,7 @@
*
* @return A short string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Contour_Plot");
}
@@ -1217,6 +1220,7 @@
*
* @return The range for an axis.
*/
+ @Override
public Range getDataRange(ValueAxis axis) {
if (this.dataset == null) {
@@ -1231,9 +1235,7 @@
else if (axis == getRangeAxis()) {
result = DatasetUtilities.findRangeBounds(this.dataset);
}
-
return result;
-
}
/**
@@ -1241,18 +1243,15 @@
*
* @return The range for the Contours (z-axis).
*/
+ @Override
public Range getContourDataRange() {
-
Range result = null;
-
ContourDataset data = getDataset();
-
if (data != null) {
Range h = getDomainAxis().getRange();
Range v = getRangeAxis().getRange();
result = this.visibleRange(data, h, v);
}
-
return result;
}
@@ -1263,6 +1262,7 @@
*
* @param event Information about the property change.
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
fireChangeEvent();
}
@@ -1275,6 +1275,7 @@
*
* @param event Information about the event (not used here).
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
if (this.domainAxis != null) {
this.domainAxis.configure();
@@ -1706,6 +1707,7 @@
*
* @param event information about the event.
*/
+ @Override
public void axisChanged(AxisChangeEvent event) {
Object source = event.getSource();
if (source.equals(this.rangeAxis) || source.equals(this.domainAxis)) {
@@ -1820,6 +1822,7 @@
* Extends plot cloning to this plot type
* @see org.jfree.chart.plot.Plot#clone()
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ContourPlot clone = (ContourPlot) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Crosshair.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Crosshair.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Crosshair.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -567,6 +567,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -630,6 +631,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int hash = 7;
hash = HashUtilities.hashCode(hash, this.visible);
@@ -657,6 +659,7 @@
*
* @throws java.lang.CloneNotSupportedException
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
// FIXME: clone generator
return super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DatasetRenderingOrder.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -86,6 +86,7 @@
*
* @return The string (never <code>null</code>).
*/
+ @Override
public String toString() {
return this.name;
}
@@ -98,6 +99,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -117,6 +119,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DefaultDrawingSupplier.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -208,6 +208,7 @@
*
* @return The paint.
*/
+ @Override
public Paint getNextPaint() {
Paint result
= this.paintSequence[this.paintIndex % this.paintSequence.length];
@@ -220,6 +221,7 @@
*
* @return The paint.
*/
+ @Override
public Paint getNextOutlinePaint() {
Paint result = this.outlinePaintSequence[
this.outlinePaintIndex % this.outlinePaintSequence.length];
@@ -234,6 +236,7 @@
*
* @since 1.0.6
*/
+ @Override
public Paint getNextFillPaint() {
Paint result = this.fillPaintSequence[this.fillPaintIndex
% this.fillPaintSequence.length];
@@ -246,6 +249,7 @@
*
* @return The stroke.
*/
+ @Override
public Stroke getNextStroke() {
Stroke result = this.strokeSequence[
this.strokeIndex % this.strokeSequence.length];
@@ -258,6 +262,7 @@
*
* @return The stroke.
*/
+ @Override
public Stroke getNextOutlineStroke() {
Stroke result = this.outlineStrokeSequence[
this.outlineStrokeIndex % this.outlineStrokeSequence.length];
@@ -270,6 +275,7 @@
*
* @return The shape.
*/
+ @Override
public Shape getNextShape() {
Shape result = this.shapeSequence[
this.shapeIndex % this.shapeSequence.length];
@@ -289,8 +295,8 @@
double size = 6.0;
double delta = size / 2.0;
- int[] xpoints = null;
- int[] ypoints = null;
+ int[] xpoints;
+ int[] ypoints;
// square
result[0] = new Rectangle2D.Double(-delta, -delta, size, size);
@@ -342,18 +348,15 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (obj == this) {
return true;
}
-
if (!(obj instanceof DefaultDrawingSupplier)) {
return false;
}
-
DefaultDrawingSupplier that = (DefaultDrawingSupplier) obj;
-
if (!Arrays.equals(this.paintSequence, that.paintSequence)) {
return false;
}
@@ -387,7 +390,6 @@
return false;
}
return true;
-
}
/**
@@ -539,6 +541,7 @@
* @throws CloneNotSupportedException if a component of the supplier does
* not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultDrawingSupplier clone = (DefaultDrawingSupplier) super.clone();
return clone;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/DialShape.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -79,6 +79,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -91,6 +92,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -110,6 +112,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/FastScatterPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -224,6 +224,7 @@
*
* @return A short string describing the plot type.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Fast_Scatter_Plot");
}
@@ -257,6 +258,7 @@
*
* @return The orientation (always {@link PlotOrientation#VERTICAL}).
*/
+ @Override
public PlotOrientation getOrientation() {
return PlotOrientation.VERTICAL;
}
@@ -514,9 +516,9 @@
* @param info collects chart drawing information (<code>null</code>
* permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
- PlotState parentState,
- PlotRenderingInfo info) {
+ PlotState parentState, PlotRenderingInfo info) {
// set up info collection...
if (info != null) {
@@ -677,6 +679,7 @@
*
* @return The range (possibly <code>null</code>).
*/
+ @Override
public Range getDataRange(ValueAxis axis) {
Range result = null;
if (axis == this.domainAxis) {
@@ -757,6 +760,7 @@
* @param info the plot rendering info.
* @param source the source point.
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo info,
Point2D source) {
this.domainAxis.resizeRange(factor);
@@ -774,6 +778,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo info,
Point2D source, boolean useAnchor) {
@@ -801,6 +806,7 @@
* @param info the plot rendering info.
* @param source the source point.
*/
+ @Override
public void zoomDomainAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo info, Point2D source) {
this.domainAxis.zoomRange(lowerPercent, upperPercent);
@@ -813,8 +819,9 @@
* @param info the plot rendering info.
* @param source the source point.
*/
- public void zoomRangeAxes(double factor,
- PlotRenderingInfo info, Point2D source) {
+ @Override
+ public void zoomRangeAxes(double factor, PlotRenderingInfo info,
+ Point2D source) {
this.rangeAxis.resizeRange(factor);
}
@@ -830,6 +837,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomRangeAxes(double factor, PlotRenderingInfo info,
Point2D source, boolean useAnchor) {
@@ -857,6 +865,7 @@
* @param info the plot rendering info.
* @param source the source point.
*/
+ @Override
public void zoomRangeAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo info, Point2D source) {
this.rangeAxis.zoomRange(lowerPercent, upperPercent);
@@ -867,6 +876,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isDomainZoomable() {
return true;
}
@@ -876,6 +886,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isRangeZoomable() {
return true;
}
@@ -888,6 +899,7 @@
*
* @since 1.0.13
*/
+ @Override
public boolean isDomainPannable() {
return this.domainPannable;
}
@@ -912,6 +924,7 @@
*
* @since 1.0.13
*/
+ @Override
public boolean isRangePannable() {
return this.rangePannable;
}
@@ -937,6 +950,7 @@
*
* @since 1.0.13
*/
+ @Override
public void panDomainAxes(double percent, PlotRenderingInfo info,
Point2D source) {
if (!isDomainPannable() || this.domainAxis == null) {
@@ -960,6 +974,7 @@
*
* @since 1.0.13
*/
+ @Override
public void panRangeAxes(double percent, PlotRenderingInfo info,
Point2D source) {
if (!isRangePannable() || this.rangeAxis == null) {
@@ -984,6 +999,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1046,6 +1062,7 @@
* @throws CloneNotSupportedException if some component of the plot does
* not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
FastScatterPlot clone = (FastScatterPlot) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/GreyPalette.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -71,6 +71,7 @@
/**
* Intializes the palette's indices.
*/
+ @Override
public void initialize() {
setPaletteName("Grey");
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/IntervalMarker.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -194,6 +194,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -226,6 +227,7 @@
* @throws CloneNotSupportedException Not thrown by this class, but the
* exception is declared for the use of subclasses.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/JThermometer.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -256,6 +256,7 @@
*
* @param fg the foreground color.
*/
+ @Override
public void setForeground(Color fg) {
super.setForeground(fg);
if (this.plot != null) {
@@ -268,6 +269,7 @@
*
* @param bg the background color.
*/
+ @Override
public void setBackground(Color bg) {
super.setBackground(bg);
if (this.plot != null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Marker.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Marker.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Marker.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -567,6 +567,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -621,6 +622,7 @@
*
* @throws CloneNotSupportedException never.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterInterval.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterInterval.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterInterval.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -165,6 +165,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/MeterPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -757,6 +757,7 @@
*
* @return A collection of legend items.
*/
+ @Override
public LegendItemCollection getLegendItems() {
LegendItemCollection result = new LegendItemCollection();
Iterator iterator = this.intervals.iterator();
@@ -785,9 +786,9 @@
* @param parentState the state from the parent plot, if there is one.
* @param info collects info about the drawing.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
- PlotState parentState,
- PlotRenderingInfo info) {
+ PlotState parentState, PlotRenderingInfo info) {
if (info != null) {
info.setPlotArea(area);
@@ -1086,8 +1087,8 @@
g2.setPaint(this.tickPaint);
g2.setStroke(new BasicStroke(2.0f));
- double valueP2X = 0;
- double valueP2Y = 0;
+ double valueP2X;
+ double valueP2Y;
double radius = (meterArea.getWidth() / 2) + DEFAULT_BORDER_SIZE;
double radius1 = radius - 15;
@@ -1163,6 +1164,7 @@
*
* @return A string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Meter_Plot");
}
@@ -1174,6 +1176,7 @@
*
* @param percent The zoom percentage.
*/
+ @Override
public void zoom(double percent) {
// intentionally blank
}
@@ -1186,6 +1189,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1303,6 +1307,7 @@
* @throws CloneNotSupportedException if some component of the plot cannot
* be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
MeterPlot clone = (MeterPlot) super.clone();
clone.tickLabelFormat = (NumberFormat) this.tickLabelFormat.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelLinkStyle.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -80,6 +80,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -92,6 +93,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -111,6 +113,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PieLabelRecord.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -217,6 +217,7 @@
*
* @return An integer that specifies the relative order of the two objects.
*/
+ @Override
public int compareTo(Object obj) {
int result = 0;
if (obj instanceof PieLabelRecord) {
@@ -238,6 +239,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -278,6 +280,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return this.baseY + ", " + this.key.toString();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -2987,7 +2987,7 @@
while (iterator.hasNext()) {
Comparable key = (Comparable) iterator.next();
Number n = this.dataset.getValue(key);
- boolean include = true;
+ boolean include;
if (n == null) {
include = !this.ignoreNullValues;
}
@@ -3042,6 +3042,7 @@
*
* @return The plot type.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Pie_Plot");
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PiePlot3D.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -230,9 +230,9 @@
* @param info collects info about the drawing
* (<code>null</code> permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D plotArea, Point2D anchor,
- PlotState parentState,
- PlotRenderingInfo info) {
+ PlotState parentState, PlotRenderingInfo info) {
// adjust for insets...
RectangleInsets insets = getInsets();
@@ -996,6 +996,7 @@
*
* @return <i>Pie 3D Plot</i>.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Pie_3D_Plot");
}
@@ -1033,6 +1034,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/Plot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -614,7 +614,7 @@
* @see #setDrawingSupplier(DrawingSupplier)
*/
public DrawingSupplier getDrawingSupplier() {
- DrawingSupplier result = null;
+ DrawingSupplier result;
Plot p = getParent();
if (p != null) {
result = p.getDrawingSupplier();
@@ -895,6 +895,7 @@
*
* @return The legend items for the plot (possibly <code>null</code>).
*/
+ @Override
public LegendItemCollection getLegendItems() {
return null;
}
@@ -1204,6 +1205,7 @@
*
* @since 1.0.14
*/
+ @Override
public void annotationChanged(AnnotationChangeEvent event) {
fireChangeEvent();
}
@@ -1213,6 +1215,7 @@
*
* @param event information about the event (not used here).
*/
+ @Override
public void axisChanged(AxisChangeEvent event) {
fireChangeEvent();
}
@@ -1225,6 +1228,7 @@
*
* @param event information about the event (not used here).
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
PlotChangeEvent newEvent = new PlotChangeEvent(this);
newEvent.setType(ChartChangeEventType.DATASET_UPDATED);
@@ -1239,6 +1243,7 @@
*
* @since 1.0.3
*/
+ @Override
public void markerChanged(MarkerChangeEvent event) {
fireChangeEvent();
}
@@ -1298,6 +1303,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1366,6 +1372,7 @@
* @throws CloneNotSupportedException if some component of the plot does not
* support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Plot clone = (Plot) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotOrientation.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -78,6 +78,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -90,6 +91,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -109,6 +111,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotRenderingInfo.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotRenderingInfo.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PlotRenderingInfo.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -213,6 +213,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -240,6 +241,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
PlotRenderingInfo clone = (PlotRenderingInfo) super.clone();
if (this.plotArea != null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarAxisLocation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarAxisLocation.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarAxisLocation.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -102,6 +102,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -114,6 +115,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RainbowPalette.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -175,6 +175,7 @@
/**
* Intializes the palettes indexes
*/
+ @Override
public void initialize() {
setPaletteName("Rainbow");
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/RingPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -316,6 +316,7 @@
* @return A state object (maintains state information relevant to one
* chart drawing).
*/
+ @Override
public PiePlotState initialise(Graphics2D g2, Rectangle2D plotArea,
PiePlot plot, Integer index, PlotRenderingInfo info) {
@@ -334,11 +335,9 @@
* @param state state information for one chart.
* @param currentPass the current pass index.
*/
- protected void drawItem(Graphics2D g2,
- int section,
- Rectangle2D dataArea,
- PiePlotState state,
- int currentPass) {
+ @Override
+ protected void drawItem(Graphics2D g2, int section, Rectangle2D dataArea,
+ PiePlotState state, int currentPass) {
PieDataset dataset = getDataset();
Number n = dataset.getValue(section);
@@ -464,6 +463,7 @@
*
* @return The label link depth, as a percentage of the plot's radius.
*/
+ @Override
protected double getLabelLinkDepth() {
return Math.min(super.getLabelLinkDepth(), getSectionDepth() / 2);
}
@@ -475,6 +475,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SeriesRenderingOrder.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -84,6 +84,7 @@
*
* @return The string (never <code>null</code>).
*/
+ @Override
public String toString() {
return this.name;
}
@@ -96,6 +97,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -115,6 +117,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.name.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SpiderWebPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SpiderWebPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/SpiderWebPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -329,6 +329,7 @@
*
* @return The plot type.
*/
+ @Override
public String getPlotType() {
// return localizationResources.getString("Radar_Plot");
return ("Spider Web Plot");
@@ -1054,6 +1055,7 @@
*
* @return The legend items (never <code>null</code>).
*/
+ @Override
public LegendItemCollection getLegendItems() {
LegendItemCollection result = new LegendItemCollection();
if (getDataset() == null) {
@@ -1121,6 +1123,7 @@
* @param parentState the state from the parent plot, if there is one.
* @param info collects info about the drawing.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
PlotState parentState, PlotRenderingInfo info) {
@@ -1144,7 +1147,7 @@
getForegroundAlpha()));
if (!DatasetUtilities.isEmptyOrNull(this.dataset)) {
- int seriesCount = 0, catCount = 0;
+ int seriesCount, catCount;
if (this.dataExtractOrder == TableOrder.BY_ROW) {
seriesCount = this.dataset.getRowCount();
@@ -1221,8 +1224,8 @@
* @param catCount the number of categories
*/
private void calculateMaxValue(int seriesCount, int catCount) {
- double v = 0;
- Number nV = null;
+ double v;
+ Number nV;
for (int seriesIndex = 0; seriesIndex < seriesCount; seriesIndex++) {
for (int catIndex = 0; catIndex < catCount; catIndex++) {
@@ -1309,7 +1312,7 @@
g2.draw(head);
if (entities != null) {
- int row = 0; int col = 0;
+ int row, col;
if (this.dataExtractOrder == TableOrder.BY_ROW) {
row = series;
col = cat;
@@ -1401,7 +1404,7 @@
int cat, double startAngle, double extent) {
FontRenderContext frc = g2.getFontRenderContext();
- String label = null;
+ String label;
if (this.dataExtractOrder == TableOrder.BY_ROW) {
// if series are in rows, then the categories are the column keys
label = this.labelGenerator.generateColumnLabel(this.dataset, cat);
@@ -1477,6 +1480,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1581,6 +1585,7 @@
* @throws CloneNotSupportedException if the plot cannot be cloned for
* any reason.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SpiderWebPlot clone = (SpiderWebPlot) super.clone();
clone.legendItemShape = ShapeUtilities.clone(this.legendItemShape);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ThermometerPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ThermometerPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ThermometerPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -1142,6 +1142,7 @@
* @param parentState the state from the parent plot, if there is one.
* @param info collects info about the drawing.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
PlotState parentState,
PlotRenderingInfo info) {
@@ -1151,8 +1152,8 @@
RoundRectangle2D mercuryStem = new RoundRectangle2D.Double();
Ellipse2D outerBulb = new Ellipse2D.Double();
Ellipse2D innerBulb = new Ellipse2D.Double();
- String temp = null;
- FontMetrics metrics = null;
+ String temp;
+ FontMetrics metrics;
if (info != null) {
info.setPlotArea(area);
}
@@ -1269,7 +1270,7 @@
drawWidth += getColumnDiameter();
}
Rectangle2D drawArea;
- double cursor = 0;
+ double cursor;
switch (this.axisLocation) {
case RIGHT:
@@ -1346,6 +1347,7 @@
*
* @param percent the zoom percentage.
*/
+ @Override
public void zoom(double percent) {
// intentionally blank
}
@@ -1355,6 +1357,7 @@
*
* @return A short string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("Thermometer_Plot");
}
@@ -1364,6 +1367,7 @@
*
* @param event the dataset change event.
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
if (this.dataset != null) {
Number vn = this.dataset.getValue();
@@ -1422,6 +1426,7 @@
*
* @return The range of data displayed.
*/
+ @Override
public Range getDataRange(ValueAxis axis) {
return new Range(this.lowerBound, this.upperBound);
}
@@ -1445,6 +1450,7 @@
*
* @return <code>null</code>.
*/
+ @Override
public LegendItemCollection getLegendItems() {
return null;
}
@@ -1454,6 +1460,7 @@
*
* @return The orientation (always {@link PlotOrientation#VERTICAL}).
*/
+ @Override
public PlotOrientation getOrientation() {
return PlotOrientation.VERTICAL;
}
@@ -1515,6 +1522,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1633,6 +1641,7 @@
*
* @throws CloneNotSupportedException if the plot cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ThermometerPlot clone = (ThermometerPlot) super.clone();
@@ -1705,6 +1714,7 @@
* @param state the plot state.
* @param source the source point.
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo state,
Point2D source) {
// no domain axis to zoom
@@ -1721,6 +1731,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo state,
Point2D source, boolean useAnchor) {
// no domain axis to zoom
@@ -1733,6 +1744,7 @@
* @param state the plot state.
* @param source the source point.
*/
+ @Override
public void zoomRangeAxes(double factor, PlotRenderingInfo state,
Point2D source) {
this.rangeAxis.resizeRange(factor);
@@ -1749,6 +1761,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomRangeAxes(double factor, PlotRenderingInfo state,
Point2D source, boolean useAnchor) {
double anchorY = this.getRangeAxis().java2DToValue(source.getY(),
@@ -1764,6 +1777,7 @@
* @param state the plot state.
* @param source the source point.
*/
+ @Override
public void zoomDomainAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo state, Point2D source) {
// no domain axis to zoom
@@ -1777,6 +1791,7 @@
* @param state the plot state.
* @param source the source point.
*/
+ @Override
public void zoomRangeAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo state, Point2D source) {
this.rangeAxis.zoomRange(lowerPercent, upperPercent);
@@ -1787,6 +1802,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isDomainZoomable() {
return false;
}
@@ -1796,6 +1812,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isRangeZoomable() {
return true;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/ValueMarker.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -137,6 +137,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/WaferMapPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -166,6 +166,7 @@
*
* @return A short string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return ("WMAP_Plot");
}
@@ -230,6 +231,7 @@
* @param state the plot state.
* @param info the plot rendering info.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
PlotState state,
PlotRenderingInfo info) {
@@ -279,8 +281,7 @@
double chipWidth = 1d;
double chipHeight = 1d;
if (plotArea.getWidth() != plotArea.getHeight()) {
- double major = 0d;
- double minor = 0d;
+ double major, minor;
if (plotArea.getWidth() > plotArea.getHeight()) {
major = plotArea.getWidth();
minor = plotArea.getHeight();
@@ -343,8 +344,7 @@
double upperLeftY = plotArea.getY();
//get major dimension
if (plotArea.getWidth() != plotArea.getHeight()) {
- double major = 0d;
- double minor = 0d;
+ double major, minor;
if (plotArea.getWidth() > plotArea.getHeight()) {
major = plotArea.getWidth();
minor = plotArea.getHeight();
@@ -381,7 +381,7 @@
// calculate and draw the notch
// horizontal orientation is considered notch right
// vertical orientation is considered notch down
- Arc2D notch = null;
+ Arc2D notch;
Rectangle2D waferFrame = waferEdge.getFrame();
double notchDiameter = waferFrame.getWidth() * 0.04;
if (this.orientation == PlotOrientation.HORIZONTAL) {
@@ -416,6 +416,7 @@
*
* @return The legend items.
*/
+ @Override
public LegendItemCollection getLegendItems() {
return this.renderer.getLegendCollection();
}
@@ -425,6 +426,7 @@
*
* @param event the event.
*/
+ @Override
public void rendererChanged(RendererChangeEvent event) {
fireChangeEvent();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2013-11-22 16:36:11 UTC (rev 3025)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/XYPlot.java 2013-11-22 16:36:25 UTC (rev 3026)
@@ -723,6 +723,7 @@
*
* @return A short string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return localizationResources.getString("XY_Plot");
}
@@ -734,6 +735,7 @@
*
* @see #setOrientation(PlotOrientation)
*/
+ @Override
public PlotOrientation getOrientation() {
return this.orientation;
}
@@ -3943,7 +3945,7 @@
ValueAxis axis = getRangeAxis();
if (axis != null) {
Iterator iterator = ticks.iterator();
- boolean paintLine = false;
+ boolean paintLine;
while (iterator.hasNext()) {
paintLine = false;
ValueTick tick = (ValueTick) iterator.next();
@@ -5072,6 +5074,7 @@
*
* @since 1.0.13
*/
+ @Override
public void panRangeAxes(double percent, PlotRenderingInfo info,
Point2D source) {
if (!isRangePannable()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:36:14
|
Revision: 3025
http://sourceforge.net/p/jfreechart/code/3025
Author: mungady
Date: 2013-11-22 16:36:11 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ArrowNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -88,11 +88,12 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
Line2D shape = new Line2D.Float();
- Shape d = null;
+ Shape d;
float x = (float) (plotArea.getMinX() + (plotArea.getWidth() / 2));
float minY = (float) plotArea.getMinY();
@@ -138,6 +139,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -160,6 +162,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = HashUtilities.hashCode(result, this.isArrowAtTop);
@@ -174,6 +177,7 @@
* @throws CloneNotSupportedException if the <code>ArrowNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LineNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -69,6 +69,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -96,6 +97,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -111,6 +113,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -123,6 +126,7 @@
* @throws CloneNotSupportedException if the <code>LineNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/LongNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -77,6 +77,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -153,6 +154,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -168,6 +170,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -180,6 +183,7 @@
* @throws CloneNotSupportedException if the <code>LongNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MeterNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -352,6 +352,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -389,6 +390,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = HashUtilities.hashCode(193, this.fillPaint);
result = HashUtilities.hashCode(result, this.highlightPaint);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/MiddlePinNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -70,6 +70,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -116,6 +117,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object object) {
if (object == null) {
return false;
@@ -134,6 +136,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -146,6 +149,7 @@
* @throws CloneNotSupportedException if the <code>MiddlePinNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PinNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -70,6 +70,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -114,6 +115,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -132,6 +134,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -144,6 +147,7 @@
* @throws CloneNotSupportedException if the <code>PinNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PlumNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -69,6 +69,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -102,6 +103,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -120,6 +122,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -132,6 +135,7 @@
* @throws CloneNotSupportedException if the <code>PlumNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/PointerNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -69,6 +69,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -123,6 +124,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -141,6 +143,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -153,6 +156,7 @@
* @throws CloneNotSupportedException if the <code>PointerNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/ShipNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -70,6 +70,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -99,6 +100,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object object) {
if (object == null) {
return false;
@@ -117,6 +119,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -129,6 +132,7 @@
* @throws CloneNotSupportedException if the <code>ShipNeedle</code>
* cannot be cloned (in theory, this should not happen).
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java 2013-11-22 16:25:48 UTC (rev 3024)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/needle/WindNeedle.java 2013-11-22 16:36:11 UTC (rev 3025)
@@ -73,6 +73,7 @@
* @param rotate the rotation point.
* @param angle the angle.
*/
+ @Override
protected void drawNeedle(Graphics2D g2, Rectangle2D plotArea,
Point2D rotate, double angle) {
@@ -102,6 +103,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object object) {
if (object == null) {
return false;
@@ -120,6 +122,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:25:51
|
Revision: 3024
http://sourceforge.net/p/jfreechart/code/3024
Author: mungady
Date: 2013-11-22 16:25:48 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/CompositeTitle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ImageTitle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendItemBlockContainer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendTitle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/Title.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/CompositeTitle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/CompositeTitle.java 2013-11-22 16:24:46 UTC (rev 3023)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/CompositeTitle.java 2013-11-22 16:25:48 UTC (rev 3024)
@@ -154,6 +154,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
RectangleConstraint contentConstraint = toContentConstraint(constraint);
Size2D contentSize = this.container.arrange(g2, contentConstraint);
@@ -168,6 +169,7 @@
* @param g2 the graphics device.
* @param area the area allocated for the title.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area) {
draw(g2, area, null);
}
@@ -181,6 +183,7 @@
*
* @return Always <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
area = trimMargin(area);
drawBorder(g2, area);
@@ -200,6 +203,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ImageTitle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ImageTitle.java 2013-11-22 16:24:46 UTC (rev 3023)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ImageTitle.java 2013-11-22 16:25:48 UTC (rev 3024)
@@ -180,6 +180,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
Size2D s = new Size2D(this.image.getWidth(null),
this.image.getHeight(null));
@@ -194,6 +195,7 @@
* @param g2 the graphics device.
* @param area the area allocated for the title.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area) {
RectangleEdge position = getPosition();
if (position == RectangleEdge.TOP || position == RectangleEdge.BOTTOM) {
@@ -219,13 +221,12 @@
* @return The size of the area used by the title.
*/
protected Size2D drawHorizontal(Graphics2D g2, Rectangle2D chartArea) {
+ double startY;
+ double topSpace;
+ double bottomSpace;
+ double leftSpace;
+ double rightSpace;
- double startY = 0.0;
- double topSpace = 0.0;
- double bottomSpace = 0.0;
- double leftSpace = 0.0;
- double rightSpace = 0.0;
-
double w = getWidth();
double h = getHeight();
RectangleInsets padding = getPadding();
@@ -274,7 +275,7 @@
*/
protected Size2D drawVertical(Graphics2D g2, Rectangle2D chartArea) {
- double startX = 0.0;
+ double startX;
double topSpace = 0.0;
double bottomSpace = 0.0;
double leftSpace = 0.0;
@@ -329,6 +330,7 @@
*
* @return Always <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
draw(g2, area);
return null;
@@ -348,6 +350,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendItemBlockContainer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendItemBlockContainer.java 2013-11-22 16:24:46 UTC (rev 3023)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendItemBlockContainer.java 2013-11-22 16:25:48 UTC (rev 3024)
@@ -217,10 +217,11 @@
*
* @return An instance of {@link EntityBlockResult}, or <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
// draw the block without collecting entities
super.draw(g2, area, null);
- EntityBlockParams ebp = null;
+ EntityBlockParams ebp;
BlockResult r = new BlockResult();
if (params instanceof EntityBlockParams) {
ebp = (EntityBlockParams) params;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendTitle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendTitle.java 2013-11-22 16:24:46 UTC (rev 3023)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendTitle.java 2013-11-22 16:25:48 UTC (rev 3024)
@@ -465,7 +465,7 @@
* @return The block.
*/
protected Block createLegendItemBlock(LegendItem item) {
- BlockContainer result = null;
+ BlockContainer result;
LegendGraphic lg = new LegendGraphic(item.getShape(),
item.getFillPaint());
lg.setFillPaintTransformer(item.getFillPaintTransformer());
@@ -525,6 +525,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
Size2D result = new Size2D();
fetchLegendItems();
@@ -549,6 +550,7 @@
* @param g2 the graphics device.
* @param area the available area for the title.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area) {
draw(g2, area, null);
}
@@ -563,6 +565,7 @@
* @return An {@link org.jfree.chart.block.EntityBlockResult} or
* <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
Rectangle2D target = (Rectangle2D) area.clone();
Rectangle2D hotspot = (Rectangle2D) area.clone();
@@ -623,6 +626,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/Title.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/Title.java 2013-11-22 16:24:46 UTC (rev 3023)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/Title.java 2013-11-22 16:25:48 UTC (rev 3024)
@@ -325,6 +325,7 @@
* @param area the area allocated for the title (subclasses should not
* draw outside this area).
*/
+ @Override
public abstract void draw(Graphics2D g2, Rectangle2D area);
/**
@@ -339,6 +340,7 @@
* @throws CloneNotSupportedException not thrown by this class, but it may
* be thrown by subclasses.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Title duplicate = (Title) super.clone();
duplicate.listenerList = new EventListenerList();
@@ -390,6 +392,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -421,6 +424,7 @@
*
* @return The hashcode.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + ObjectUtilities.hashCode(this.position);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 16:24:49
|
Revision: 3023
http://sourceforge.net/p/jfreechart/code/3023
Author: mungady
Date: 2013-11-22 16:24:46 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractPieItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelPosition.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYZToolTipGenerator.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -263,6 +263,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -290,6 +291,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.labelFormat);
@@ -307,6 +309,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
AbstractCategoryItemLabelGenerator clone
= (AbstractCategoryItemLabelGenerator) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractPieItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractPieItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractPieItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -181,6 +181,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -209,6 +210,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.labelFormat);
@@ -224,6 +226,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
AbstractPieItemLabelGenerator clone
= (AbstractPieItemLabelGenerator) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/AbstractXYItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -234,7 +234,7 @@
* @return The label (possibly <code>null</code>).
*/
public String generateLabelString(XYDataset dataset, int series, int item) {
- String result = null;
+ String result;
Object[] items = createItemArray(dataset, series, item);
result = MessageFormat.format(this.formatString, items);
return result;
@@ -297,6 +297,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -331,6 +332,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.formatString);
@@ -348,6 +350,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
AbstractXYItemLabelGenerator clone
= (AbstractXYItemLabelGenerator) super.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -107,6 +107,7 @@
*
* @return The items (never <code>null</code>).
*/
+ @Override
protected Object[] createItemArray(CategoryDataset dataset, int series,
int item) {
Object[] result = new Object[8];
@@ -134,6 +135,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BoxAndWhiskerXYToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -122,6 +122,7 @@
*
* @return The items (never <code>null</code>).
*/
+ @Override
protected Object[] createItemArray(XYDataset dataset, int series,
int item) {
Object[] result = new Object[8];
@@ -154,6 +155,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/BubbleXYItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -160,6 +160,7 @@
*
* @return The item label (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(XYDataset dataset, int series, int item) {
return generateLabelString(dataset, series, item);
}
@@ -173,9 +174,10 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabelString(XYDataset dataset, int series, int item) {
- String result = null;
- Object[] items = null;
+ String result;
+ Object[] items;
if (dataset instanceof XYZDataset) {
items = createItemArray((XYZDataset) dataset, series, item);
}
@@ -239,6 +241,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -264,6 +267,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int h = super.hashCode();
h = HashUtilities.hashCode(h, this.zFormat);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -140,10 +140,9 @@
*
* @return The tooltip text.
*/
+ @Override
public String generateToolTip(XYDataset data, int series, int item) {
-
return getToolTipText(series, item);
-
}
/**
@@ -153,16 +152,16 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
-
CustomXYToolTipGenerator clone
= (CustomXYToolTipGenerator) super.clone();
if (this.toolTipSeries != null) {
clone.toolTipSeries = new java.util.ArrayList(this.toolTipSeries);
}
return clone;
+ }
- }
/**
* Tests if this object is equal to another.
*
@@ -170,12 +169,11 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (obj == this) {
return true;
}
-
if (obj instanceof CustomXYToolTipGenerator) {
CustomXYToolTipGenerator generator = (CustomXYToolTipGenerator) obj;
boolean result = true;
@@ -193,9 +191,7 @@
}
return result;
}
-
return false;
-
}
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -27,7 +27,7 @@
* ------------------------------
* HighLowItemLabelGenerator.java
* ------------------------------
- * (C) Copyright 2001-2008, by Object Refinery Limited.
+ * (C) Copyright 2001-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): David Basten;
@@ -117,45 +117,40 @@
*
* @return The tooltip text.
*/
+ @Override
public String generateToolTip(XYDataset dataset, int series, int item) {
-
- String result = null;
-
- if (dataset instanceof OHLCDataset) {
- OHLCDataset d = (OHLCDataset) dataset;
- Number high = d.getHigh(series, item);
- Number low = d.getLow(series, item);
- Number open = d.getOpen(series, item);
- Number close = d.getClose(series, item);
- Number x = d.getX(series, item);
-
- result = d.getSeriesKey(series).toString();
-
- if (x != null) {
- Date date = new Date(x.longValue());
- result = result + "--> Date=" + this.dateFormatter.format(date);
- if (high != null) {
- result = result + " High="
- + this.numberFormatter.format(high.doubleValue());
- }
- if (low != null) {
- result = result + " Low="
- + this.numberFormatter.format(low.doubleValue());
- }
- if (open != null) {
- result = result + " Open="
- + this.numberFormatter.format(open.doubleValue());
- }
- if (close != null) {
- result = result + " Close="
- + this.numberFormatter.format(close.doubleValue());
- }
+ if (!(dataset instanceof OHLCDataset)) {
+ return null;
+ }
+ StringBuilder sb = new StringBuilder();
+ OHLCDataset d = (OHLCDataset) dataset;
+ Number high = d.getHigh(series, item);
+ Number low = d.getLow(series, item);
+ Number open = d.getOpen(series, item);
+ Number close = d.getClose(series, item);
+ Number x = d.getX(series, item);
+ sb.append(d.getSeriesKey(series).toString());
+ if (x != null) {
+ Date date = new Date(x.longValue());
+ sb.append("--> Date=").append(this.dateFormatter.format(date));
+ if (high != null) {
+ sb.append(" High=");
+ sb.append(this.numberFormatter.format(high.doubleValue()));
}
-
+ if (low != null) {
+ sb.append(" Low=");
+ sb.append(this.numberFormatter.format(low.doubleValue()));
+ }
+ if (open != null) {
+ sb.append(" Open=");
+ sb.append(this.numberFormatter.format(open.doubleValue()));
+ }
+ if (close != null) {
+ sb.append(" Close=");
+ sb.append(this.numberFormatter.format(close.doubleValue()));
+ }
}
-
- return result;
-
+ return sb.toString();
}
/**
@@ -168,6 +163,7 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(XYDataset dataset, int series, int category) {
return null; //TODO: implement this method properly
}
@@ -179,20 +175,17 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
-
HighLowItemLabelGenerator clone
- = (HighLowItemLabelGenerator) super.clone();
-
+ = (HighLowItemLabelGenerator) super.clone();
if (this.dateFormatter != null) {
clone.dateFormatter = (DateFormat) this.dateFormatter.clone();
}
if (this.numberFormatter != null) {
clone.numberFormatter = (NumberFormat) this.numberFormatter.clone();
}
-
return clone;
-
}
/**
@@ -202,6 +195,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -224,6 +218,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.dateFormatter);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -105,6 +105,7 @@
*
* @return The items (never <code>null</code>).
*/
+ @Override
protected Object[] createItemArray(CategoryDataset dataset,
int row, int column) {
Object[] result = new Object[5];
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -102,6 +102,7 @@
*
* @return The items (never <code>null</code>).
*/
+ @Override
protected Object[] createItemArray(CategoryDataset dataset,
int row, int column) {
Object[] result = new Object[5];
@@ -139,6 +140,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelAnchor.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -27,7 +27,7 @@
* --------------------
* ItemLabelAnchor.java
* --------------------
- * (C) Copyright 2003-2008, by Object Refinery Limited.
+ * (C) Copyright 2003-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -173,6 +173,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -185,22 +186,19 @@
*
* @return A boolean.
*/
- public boolean equals(Object o) {
-
- if (this == o) {
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
return true;
}
- if (!(o instanceof ItemLabelAnchor)) {
+ if (!(obj instanceof ItemLabelAnchor)) {
return false;
}
-
- ItemLabelAnchor order = (ItemLabelAnchor) o;
- if (!this.name.equals(order.toString())) {
+ ItemLabelAnchor that = (ItemLabelAnchor) obj;
+ if (!this.name.equals(that.toString())) {
return false;
}
-
return true;
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelPosition.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelPosition.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/ItemLabelPosition.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -158,6 +158,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -123,6 +123,7 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(CategoryDataset dataset, int row, int column) {
return generateLabelString(dataset, row, column);
}
@@ -135,6 +136,7 @@
* @return <code>true</code> if this generator is equal to
* <code>obj</code>, and <code>false</code> otherwise.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -94,6 +94,7 @@
*
* @return A series label.
*/
+ @Override
public String generateLabel(CategoryDataset dataset, int series) {
ParamChecks.nullNotPermitted(dataset, "dataset");
String label = MessageFormat.format(this.formatPattern,
@@ -123,6 +124,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -134,6 +136,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -154,6 +157,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.formatPattern);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCategoryToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -105,6 +105,7 @@
*
* @return The tooltip text (possibly <code>null</code>).
*/
+ @Override
public String generateToolTip(CategoryDataset dataset,
int row, int column) {
return generateLabelString(dataset, row, column);
@@ -117,6 +118,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardContourToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -77,12 +77,13 @@
*
* @return The tooltip text.
*/
+ @Override
public String generateToolTip(ContourDataset data, int item) {
double x = data.getXValue(0, item);
double y = data.getYValue(0, item);
double z = data.getZValue(0, item);
- String xString = null;
+ String xString;
if (data.isDateAxis(0)) {
SimpleDateFormat formatter
@@ -116,22 +117,20 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (obj == this) {
return true;
}
-
if (!(obj instanceof StandardContourToolTipGenerator)) {
return false;
}
StandardContourToolTipGenerator that
- = (StandardContourToolTipGenerator) obj;
+ = (StandardContourToolTipGenerator) obj;
if (this.valueForm != null) {
return this.valueForm.equals(that.valueForm);
}
return false;
-
}
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardCrosshairLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -114,6 +114,7 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(Crosshair crosshair) {
Object[] v = new Object[] {this.numberFormat.format(
crosshair.getValue())};
@@ -128,6 +129,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -151,6 +153,7 @@
*
* @return A hash code for this instance.
*/
+ @Override
public int hashCode() {
return this.labelTemplate.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -174,6 +174,7 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateSectionLabel(PieDataset dataset, Comparable key) {
return super.generateSectionLabel(dataset, key);
}
@@ -205,6 +206,7 @@
*
* @return An attributed label (possibly <code>null</code>).
*/
+ @Override
public AttributedString generateAttributedSectionLabel(PieDataset dataset,
Comparable key) {
return getAttributedLabel(dataset.getIndex(key));
@@ -217,6 +219,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -242,6 +245,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -154,6 +154,7 @@
*
* @return The tool tip text (possibly <code>null</code>).
*/
+ @Override
public String generateToolTip(PieDataset dataset, Comparable key) {
return generateSectionLabel(dataset, key);
}
@@ -165,6 +166,7 @@
*
* @throws CloneNotSupportedException should not happen.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -179,6 +179,7 @@
*
* @return The label text (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(XYDataset dataset, int series, int item) {
return generateLabelString(dataset, series, item);
}
@@ -190,6 +191,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -201,6 +203,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -98,6 +98,7 @@
*
* @return A series label.
*/
+ @Override
public String generateLabel(XYDataset dataset, int series) {
ParamChecks.nullNotPermitted(dataset, "dataset");
String label = MessageFormat.format(
@@ -130,6 +131,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -141,6 +143,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -161,6 +164,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
result = HashUtilities.hashCode(result, this.formatPattern);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -161,6 +161,7 @@
*
* @return The tooltip text (possibly <code>null</code>).
*/
+ @Override
public String generateToolTip(XYDataset dataset, int series, int item) {
return generateLabelString(dataset, series, item);
}
@@ -172,6 +173,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -189,6 +191,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYZToolTipGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYZToolTipGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/StandardXYZToolTipGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -156,6 +156,7 @@
*
* @return The tooltip text (possibly <code>null</code>).
*/
+ @Override
public String generateToolTip(XYZDataset dataset, int series, int item) {
return generateLabelString(dataset, series, item);
}
@@ -169,8 +170,9 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabelString(XYDataset dataset, int series, int item) {
- String result = null;
+ String result;
Object[] items = createItemArray((XYZDataset) dataset, series, item);
result = MessageFormat.format(getFormatString(), items);
return result;
@@ -229,6 +231,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2013-11-22 16:24:22 UTC (rev 3022)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2013-11-22 16:24:46 UTC (rev 3023)
@@ -77,6 +77,7 @@
*
* @return The tool tip text (possibly <code>null</code>).
*/
+ @Override
public String generateToolTip(XYDataset data, int series, int item) {
String xStr, yStr;
@@ -113,6 +114,7 @@
*
* @return The label (possibly <code>null</code>).
*/
+ @Override
public String generateLabel(XYDataset dataset, int series, int category) {
return null; //TODO: implement this method properly
}
@@ -141,6 +143,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -152,6 +155,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -167,6 +171,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 127;
return result;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
