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-22 12:55:37
|
Revision: 2997
http://sourceforge.net/p/jfreechart/code/2997
Author: mungady
Date: 2013-11-22 12:55:34 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TitleEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TitleEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TitleEntity.java 2013-11-22 12:54:39 UTC (rev 2996)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/TitleEntity.java 2013-11-22 12:55:34 UTC (rev 2997)
@@ -120,11 +120,12 @@
*
* @return A string.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("TitleEntity: ");
- buf.append("tooltip = ");
- buf.append(getToolTipText());
- return buf.toString();
+ StringBuilder sb = new StringBuilder("TitleEntity: ");
+ sb.append("tooltip = ");
+ sb.append(getToolTipText());
+ return sb.toString();
}
/**
@@ -134,6 +135,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -162,6 +164,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 41;
result = HashUtilities.hashCode(result, getToolTipText());
@@ -177,6 +180,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* entity.
*/
+ @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 12:54:42
|
Revision: 2996
http://sourceforge.net/p/jfreechart/code/2996
Author: mungady
Date: 2013-11-22 12:54:39 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PlotEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PlotEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PlotEntity.java 2013-11-22 12:53:38 UTC (rev 2995)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/PlotEntity.java 2013-11-22 12:54:39 UTC (rev 2996)
@@ -120,11 +120,12 @@
*
* @return A string.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("PlotEntity: ");
- buf.append("tooltip = ");
- buf.append(getToolTipText());
- return buf.toString();
+ StringBuilder sb = new StringBuilder("PlotEntity: ");
+ sb.append("tooltip = ");
+ sb.append(getToolTipText());
+ return sb.toString();
}
/**
@@ -134,6 +135,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -162,6 +164,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 39;
result = HashUtilities.hashCode(result, getToolTipText());
@@ -177,6 +180,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* entity.
*/
+ @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 12:53:42
|
Revision: 2995
http://sourceforge.net/p/jfreechart/code/2995
Author: mungady
Date: 2013-11-22 12:53:38 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/JFreeChartEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/JFreeChartEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/JFreeChartEntity.java 2013-11-22 12:52:29 UTC (rev 2994)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/JFreeChartEntity.java 2013-11-22 12:53:38 UTC (rev 2995)
@@ -120,11 +120,12 @@
*
* @return A string.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("JFreeChartEntity: ");
- buf.append("tooltip = ");
- buf.append(getToolTipText());
- return buf.toString();
+ StringBuilder sb = new StringBuilder("JFreeChartEntity: ");
+ sb.append("tooltip = ");
+ sb.append(getToolTipText());
+ return sb.toString();
}
/**
@@ -134,6 +135,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -162,6 +164,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 39;
result = HashUtilities.hashCode(result, getToolTipText());
@@ -177,6 +180,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* entity.
*/
+ @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 12:52:32
|
Revision: 2994
http://sourceforge.net/p/jfreechart/code/2994
Author: mungady
Date: 2013-11-22 12:52:29 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java 2013-11-22 12:51:20 UTC (rev 2993)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/ChartEntity.java 2013-11-22 12:52:29 UTC (rev 2994)
@@ -271,7 +271,7 @@
*/
private String getPolyCoords(Shape shape) {
ParamChecks.nullNotPermitted(shape, "shape");
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
boolean first = true;
float[] coords = new float[6];
PathIterator pi = shape.getPathIterator(null, 1.0);
@@ -310,7 +310,7 @@
ToolTipTagFragmentGenerator toolTipTagFragmentGenerator,
URLTagFragmentGenerator urlTagFragmentGenerator) {
- StringBuffer tag = new StringBuffer();
+ StringBuilder tag = new StringBuilder();
boolean hasURL = (this.urlText == null ? false
: !this.urlText.equals(""));
boolean hasToolTip = (this.toolTipText == null ? false
@@ -345,11 +345,12 @@
*
* @return A string.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("ChartEntity: ");
- buf.append("tooltip = ");
- buf.append(this.toolTipText);
- return buf.toString();
+ StringBuilder sb = new StringBuilder("ChartEntity: ");
+ sb.append("tooltip = ");
+ sb.append(this.toolTipText);
+ return sb.toString();
}
/**
@@ -359,6 +360,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -384,6 +386,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 37;
result = HashUtilities.hashCode(result, this.toolTipText);
@@ -399,6 +402,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* entity.
*/
+ @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 12:51:23
|
Revision: 2993
http://sourceforge.net/p/jfreechart/code/2993
Author: mungady
Date: 2013-11-22 12:51:20 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java 2013-11-22 12:50:08 UTC (rev 2992)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/CategoryLabelEntity.java 2013-11-22 12:51:20 UTC (rev 2993)
@@ -87,6 +87,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -106,6 +107,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = HashUtilities.hashCode(result, this.key);
@@ -118,12 +120,13 @@
*
* @return A string representation of this entity.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("CategoryLabelEntity: ");
- buf.append("category=");
- buf.append(this.key);
- buf.append(", tooltip=").append(getToolTipText());
- buf.append(", url=").append(getURLText());
- return buf.toString();
+ StringBuilder sb = new StringBuilder("CategoryLabelEntity: ");
+ sb.append("category=");
+ sb.append(this.key);
+ sb.append(", tooltip=").append(getToolTipText());
+ sb.append(", url=").append(getURLText());
+ return sb.toString();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 12:50:11
|
Revision: 2992
http://sourceforge.net/p/jfreechart/code/2992
Author: mungady
Date: 2013-11-22 12:50:08 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Fixed NB warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/AxisEntity.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/AxisEntity.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/AxisEntity.java 2013-11-22 12:20:45 UTC (rev 2991)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/entity/AxisEntity.java 2013-11-22 12:50:08 UTC (rev 2992)
@@ -53,7 +53,8 @@
import org.jfree.util.ObjectUtilities;
/**
- * A class that captures information about an Axis of a chart.
+ * A class that captures information about an {@link Axis} belonging to a
+ * chart.
*
* @since 1.0.13
*/
@@ -120,11 +121,12 @@
*
* @return A string.
*/
+ @Override
public String toString() {
- StringBuffer buf = new StringBuffer("AxisEntity: ");
- buf.append("tooltip = ");
- buf.append(getToolTipText());
- return buf.toString();
+ StringBuilder sb = new StringBuilder("AxisEntity: ");
+ sb.append("tooltip = ");
+ sb.append(getToolTipText());
+ return sb.toString();
}
/**
@@ -134,6 +136,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -162,6 +165,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 39;
result = HashUtilities.hashCode(result, getToolTipText());
@@ -177,6 +181,7 @@
* @throws CloneNotSupportedException if there is a problem cloning the
* entity.
*/
+ @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 12:20:48
|
Revision: 2991
http://sourceforge.net/p/jfreechart/code/2991
Author: mungady
Date: 2013-11-22 12:20:45 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
2013-11-22 David Gilbert <dav...@ob...>
* org/jfree/chart/util/PaintAlpha.java
(darker): Remove reflection code no longer required,
(darkerLinearGradientPaint): Likewise,
(darkerRadialGradientPaint): Likewise,
(darkerTexturePaint): Likewise.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/PaintAlpha.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/PaintAlpha.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/PaintAlpha.java 2013-11-22 12:20:33 UTC (rev 2990)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/PaintAlpha.java 2013-11-22 12:20:45 UTC (rev 2991)
@@ -27,16 +27,17 @@
* ---------------
* PaintAlpha.java
* ---------------
- * (C) Copyright 2011 by DaveLaw and Contributors.
+ * (C) Copyright 2011-2013 by DaveLaw and Contributors.
*
* Original Author: DaveLaw (dave ATT davelaw D0TT de);
- * Contributor(s): could this be you?;
+ * Contributor(s): David Gilbert (for Object Refinery Limited);
*
* Changes
* -------
* 09-Mar-2011 : Written (DaveLaw)
- * 03-Jul-2012 : JDK 1.6 References made reflective for JDK 1.3 compatibility (
- * DaveLaw)
+ * 03-Jul-2012 : JDK 1.6 References made reflective for JDK 1.3 compatibility
+ * (DaveLaw);
+ * 16-Sep-2013 : Removed reflection since we are requiring JDK 1.6 now (DG)
*
*/
@@ -44,15 +45,13 @@
import java.awt.Color;
import java.awt.GradientPaint;
+import java.awt.LinearGradientPaint;
import java.awt.Paint;
+import java.awt.RadialGradientPaint;
import java.awt.TexturePaint;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
import java.awt.image.IndexColorModel;
import java.awt.image.WritableRaster;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.util.Hashtable;
/**
@@ -78,6 +77,8 @@
* method which is needed to darken objects of type {@link TexturePaint}.
*
* @author DaveLaw
+ *
+ * @since 1.0.15
*/
public class PaintAlpha {
// TODO Revert to SVN revision 2469 in JFreeChart 1.0.16
@@ -133,16 +134,25 @@
if (paint instanceof GradientPaint) {
return darker((GradientPaint) paint);
}
- if (paint.getClass().getName().equals("java.awt.LinearGradientPaint")) {
- // TODO -> instanceof
- return darkerLinearGradientPaint(paint);
+ if (paint instanceof LinearGradientPaint) {
+ return darkerLinearGradientPaint((LinearGradientPaint) paint);
}
- if (paint.getClass().getName().equals("java.awt.RadialGradientPaint")) {
- // TODO -> instanceof
- return darkerRadialGradientPaint(paint);
+ if (paint instanceof RadialGradientPaint) {
+ return darkerRadialGradientPaint((RadialGradientPaint) paint);
}
if (paint instanceof TexturePaint) {
- return darker((TexturePaint) paint, true);
+ try {
+ return darkerTexturePaint((TexturePaint) paint);
+ }
+ catch (Exception e) {
+ /*
+ * Lots can go wrong while fiddling with Images, Color Models
+ * & such! If anything at all goes awry, just return the original
+ * TexturePaint. (TexturePaint's are immutable anyway, so no harm
+ * done)
+ */
+ return paint;
+ }
}
return paint;
}
@@ -165,9 +175,9 @@
}
/**
- * Create a new Gradient with its colours darkened.
+ * Create a new <code>GradientPaint</code> with its colors darkened.
*
- * @param paint a <code>GradientPaint</code>
+ * @param paint the gradient paint (<code>null</code> not permitted).
*
* @return a darker version of the <code>GradientPaint</code>
*/
@@ -185,46 +195,15 @@
*
* @return a darker version of the <code>LinearGradientPaint</code>
*/
- private static final Paint darkerLinearGradientPaint(Paint paint) {
- // TODO Rename->darker & change Paint->LinearGradientPaint
- try {
- final Color[] paintColours = (Color[]) invokeZeroArgumentMethod(
- paint, "getColors");
-
- for (int i = 0; i < paintColours.length; i++) {
- paintColours[i] = darker(paintColours[i]);
- }
-
- final Constructor[] constructors
- = paint.getClass().getConstructors();
-
- for (int i = 0; i < constructors.length; i++) {
-
- final Class[] args = constructors[i].getParameterTypes();
-
- if (args.length == 7
- && args[args.length-1].equals(AffineTransform.class)) {
-
- return (Paint) constructors[i].newInstance(new Object[] {
- (Point2D) invokeZeroArgumentMethod(paint, "getStartPoint"),
- (Point2D) invokeZeroArgumentMethod(paint, "getEndPoint"),
- (float[]) invokeZeroArgumentMethod(paint, "getFractions"),
- paintColours,
- (Object) invokeZeroArgumentMethod(paint, "getCycleMethod"),
- (Object) invokeZeroArgumentMethod(paint, "getColorSpace"),
- (AffineTransform) invokeZeroArgumentMethod(paint,
- "getTransform") });
- }
- }
- } catch (IllegalArgumentException e) {
- } catch (SecurityException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- } catch (NoSuchMethodException e) {
- } catch (InstantiationException e) {
+ private static Paint darkerLinearGradientPaint(LinearGradientPaint paint) {
+ final Color[] paintColors = paint.getColors();
+ for (int i = 0; i < paintColors.length; i++) {
+ paintColors[i] = darker(paintColors[i]);
}
- throw new UnsupportedOperationException(
- "Probably new Constructor signatures in newer JDK");
+ return new LinearGradientPaint(paint.getStartPoint(),
+ paint.getEndPoint(), paint.getFractions(), paintColors,
+ paint.getCycleMethod(), paint.getColorSpace(),
+ paint.getTransform());
}
/**
@@ -234,114 +213,30 @@
*
* @return a darker version of the <code>RadialGradientPaint</code>
*/
- private static final Paint darkerRadialGradientPaint(Paint paint) {
- // TODO Rename->darker & change Paint->RadialGradientPaint
- try {
- final Color[] paintColours
- = (Color[]) invokeZeroArgumentMethod(paint, "getColors");
-
- for (int i = 0; i < paintColours.length; i++) {
- paintColours[i] = darker(paintColours[i]);
- }
-
- final Constructor[] constructors
- = paint.getClass().getConstructors();
-
- for (int i = 0; i < constructors.length; i++) {
-
- final Class[] args = constructors[i].getParameterTypes();
-
- if ( args.length == 8
- && args[args.length-1].equals(AffineTransform.class)) {
-
- return (Paint) constructors[i].newInstance(new Object[] {
- (Point2D) invokeZeroArgumentMethod(paint, "getCenterPoint"),
- (Float) invokeZeroArgumentMethod(paint, "getRadius"),
- (Point2D) invokeZeroArgumentMethod(paint, "getFocusPoint"),
- (float[]) invokeZeroArgumentMethod(paint, "getFractions"),
- paintColours,
- (Object) invokeZeroArgumentMethod(paint, "getCycleMethod"),
- (Object) invokeZeroArgumentMethod(paint, "getColorSpace"),
- (AffineTransform) invokeZeroArgumentMethod(paint,
- "getTransform") });
- }
- }
- } catch (IllegalArgumentException e) {
- } catch (SecurityException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- } catch (NoSuchMethodException e) {
- } catch (InstantiationException e) {
+ private static Paint darkerRadialGradientPaint(RadialGradientPaint paint) {
+ final Color[] paintColors = paint.getColors();
+ for (int i = 0; i < paintColors.length; i++) {
+ paintColors[i] = darker(paintColors[i]);
}
- throw new UnsupportedOperationException(
- "Probably new Constructor signatures in newer JDK");
+ return new RadialGradientPaint(paint.getCenterPoint(),
+ paint.getRadius(), paint.getFocusPoint(),
+ paint.getFractions(), paintColors, paint.getCycleMethod(),
+ paint.getColorSpace(), paint.getTransform());
}
/**
- * Convenience method to invoke the zero argument <code>methodName</code>
- * method of <code>object</code> via Reflection.
- *
- * @param object
- * @param methodName
- *
- * @return the result
- *
- * @throws IllegalArgumentException
- * @throws SecurityException
- * @throws IllegalAccessException
- * @throws InvocationTargetException
- * @throws NoSuchMethodException
- */
- private static final Object invokeZeroArgumentMethod(Object object,
- String methodName) throws IllegalArgumentException,
- SecurityException, IllegalAccessException,
- InvocationTargetException, NoSuchMethodException {
- return object.getClass().getMethod(methodName,
- new Class[] {}).invoke(object, new Object[] {});
- }
-
- /**
- * Create a new <code>TexturePaint</code> with its colours darkened.
+ * Create a new <code>TexturePaint</code> with its colors darkened.
* <p>
* This entails cloning the underlying <code>BufferedImage</code>,
- * then darkening each colour-pixel individually!
+ * then darkening each color-pixel individually!
*
* @param paint a <code>TexturePaint</code>
*
- * @param ignoreThisDummyArgument which is just to guarantee a unique
- * method signature
- *
* @return a darker version of the <code>TexturePaint</code>
*/
- private static TexturePaint darker(TexturePaint paint,
- boolean ignoreThisDummyArgument) {
- try {
- return darker(paint);
- }
- catch (Exception e) {
- /*
- * Lots can go wrong while fiddling with Images, Colour Models
- * & such! If anything at all goes awry, just return the original
- * TexturePaint. (TexturePaint's are immutable anyway, so no harm
- * done)
- */
- return paint;
- }
- }
-
- /**
- * Create a new <code>TexturePaint</code> with its colours darkened.
- * <p>
- * This entails cloning the underlying <code>BufferedImage</code>,
- * then darkening each colour-pixel individually!
- *
- * @param paint a <code>TexturePaint</code>
- *
- * @return a darker version of the <code>TexturePaint</code>
- */
- private static TexturePaint darker(TexturePaint paint) {
+ private static TexturePaint darkerTexturePaint(TexturePaint paint) {
/**
- * Colour Models with pre-multiplied Alpha tested OK without any
+ * Color Models with pre-multiplied Alpha tested OK without any
* special logic
*
* BufferedImage.TYPE_INT_ARGB_PRE: // Type 03: tested OK 2011.02.27
@@ -365,16 +260,16 @@
/* (pix-buffer is large enough for all pixels of one row) */
/**
- * Indexed Colour Models (sort of a Palette) CANNOT be simply
+ * Indexed Color Models (sort of a Palette) CANNOT be simply
* multiplied (the pixel-value is just an index into the Palette).
*
- * Fortunately, IndexColorModel.getComponents(..) resolves the colours.
- * The resolved colours can then be multiplied by our FACTOR.
+ * Fortunately, IndexColorModel.getComponents(..) resolves the colors.
+ * The resolved colors can then be multiplied by our FACTOR.
* IndexColorModel.getDataElement(..) then tries to map the computed
- * colour to the "nearest" in the Palette.
+ * color to the "nearest" in the Palette.
*
- * It is quite possible that the "nearest" colour is the ORIGINAL
- * colour! In the worst case, the returned Image will be identical to
+ * It is quite possible that the "nearest" color is the ORIGINAL
+ * color! In the worst case, the returned Image will be identical to
* the original.
*
* Applies to following Image Types:
@@ -407,7 +302,7 @@
}
/**
- * For the other 2 Colour Models, java.awt.image.ComponentColorModel and
+ * For the other 2 Color Models, java.awt.image.ComponentColorModel and
* java.awt.image.DirectColorModel, the order of subpixels returned by
* ras.getPixels(..) was observed to correspond to the following...
*/
@@ -447,7 +342,7 @@
return new TexturePaint(img, paint.getAnchorRect());
/**
* Above, we multiplied every pixel by our FACTOR because the
- * applicable Image Types consist only of colour or grey channels:
+ * applicable Image Types consist only of color or grey channels:
*
* BufferedImage.TYPE_INT_RGB: // Type 01: tested OK 2011.02.27
* BufferedImage.TYPE_INT_BGR: // Type 04: tested OK 2011.02.27
@@ -467,9 +362,9 @@
/**
* Clone a {@link BufferedImage}.
* <p>
- * Note: when constructing the clone, the original Colour Model Object is
+ * Note: when constructing the clone, the original Color Model Object is
* reused.<br> That keeps things simple & should not be a problem, as all
- * known Colour Models<br>
+ * known Color Models<br>
* ({@link java.awt.image.IndexColorModel IndexColorModel},
* {@link java.awt.image.DirectColorModel DirectColorModel},
* {@link java.awt.image.ComponentColorModel ComponentColorModel}) are
@@ -477,7 +372,7 @@
*
* @param image original BufferedImage to clone
*
- * @return a new BufferedImage reusing the original's Colour Model &
+ * @return a new BufferedImage reusing the original's Color Model &
* containing a clone of its pixels
*/
public static BufferedImage cloneImage(BufferedImage image) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 12:20:38
|
Revision: 2990
http://sourceforge.net/p/jfreechart/code/2990
Author: mungady
Date: 2013-11-22 12:20:33 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
2013-11-22 David Gilbert <dav...@ob...>
* org/jfree/chart/util/PaintAlpha.java
(darker): Remove reflection code no longer required,
(darkerLinearGradientPaint): Likewise,
(darkerRadialGradientPaint): Likewise,
(darkerTexturePaint): Likewise.
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 12:17:25 UTC (rev 2989)
+++ branches/jfreechart-1.0.x-branch/ChangeLog 2013-11-22 12:20:33 UTC (rev 2990)
@@ -1,3 +1,11 @@
+2013-11-22 David Gilbert <dav...@ob...>
+
+ * org/jfree/chart/util/PaintAlpha.java
+ (darker): Remove reflection code no longer required,
+ (darkerLinearGradientPaint): Likewise,
+ (darkerRadialGradientPaint): Likewise,
+ (darkerTexturePaint): Likewise.
+
2013-11-21 David Gilbert <dav...@ob...>
* org/jfree/chart/util/DirectionalGradientPaintTransformer.java: New file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 12:17:28
|
Revision: 2989
http://sourceforge.net/p/jfreechart/code/2989
Author: mungady
Date: 2013-11-22 12:17:25 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Added default constructor.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DirectionalGradientPaintTransformer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DirectionalGradientPaintTransformer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DirectionalGradientPaintTransformer.java 2013-11-22 12:16:57 UTC (rev 2988)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/DirectionalGradientPaintTransformer.java 2013-11-22 12:17:25 UTC (rev 2989)
@@ -75,6 +75,13 @@
implements GradientPaintTransformer {
/**
+ * Default constructor.
+ */
+ public DirectionalGradientPaintTransformer() {
+ super();
+ }
+
+ /**
* Transforms a <code>GradientPaint</code> instance to fit some target
* shape.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 12:17:01
|
Revision: 2988
http://sourceforge.net/p/jfreechart/code/2988
Author: mungady
Date: 2013-11-22 12:16:57 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Javadoc updates.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java 2013-11-22 12:15:52 UTC (rev 2987)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/util/AttrStringUtils.java 2013-11-22 12:16:57 UTC (rev 2988)
@@ -49,6 +49,8 @@
/**
* Some <code>AttributedString</code> utilities.
+ *
+ * @since 1.0.16
*/
public class AttrStringUtils {
@@ -65,6 +67,8 @@
* @param angle the angle.
* @param x the x-coordinate.
* @param y the y-coordinate.
+ *
+ * @since 1.0.16
*/
public static void drawRotatedString(AttributedString text, Graphics2D g2,
double angle, float x, float y) {
@@ -77,11 +81,13 @@
*
* @param text the attributed string (<code>null</code> not permitted).
* @param g2 the graphics output target.
- * @param textX
- * @param textY
- * @param angle
- * @param rotateX
- * @param rotateY
+ * @param textX the x-coordinate for the text.
+ * @param textY the y-coordinate for the text.
+ * @param angle the rotation angle (in radians).
+ * @param rotateX the x-coordinate for the rotation point.
+ * @param rotateY the y-coordinate for the rotation point.
+ *
+ * @since 1.0.16
*/
public static void drawRotatedString(AttributedString text, Graphics2D g2,
float textX, float textY, double angle, float rotateX,
@@ -100,19 +106,23 @@
}
/**
+ * Draws the string anchored to <code>(x, y)</code>, rotated by the
+ * specified angle about <code>(rotationX, rotationY)</code>.
*
- * @param text
- * @param g2
- * @param x
- * @param y
- * @param textAnchor
- * @param angle
- * @param rotationX
- * @param rotationY
+ * @param text the text (<code>null</code> not permitted).
+ * @param g2 the graphics target.
+ * @param x the x-coordinate for the text location.
+ * @param y the y-coordinate for the text location.
+ * @param textAnchor the text anchor point.
+ * @param angle the rotation (in radians).
+ * @param rotationX the x-coordinate for the rotation point.
+ * @param rotationY the y-coordinate for the rotation point.
+ *
+ * @since 1.0.16
*/
public static void drawRotatedString(AttributedString text, Graphics2D g2,
float x, float y, TextAnchor textAnchor,
- final double angle, float rotationX, float rotationY) {
+ double angle, float rotationX, float rotationY) {
ParamChecks.nullNotPermitted(text, "text");
float[] textAdj = deriveTextBoundsAnchorOffsets(g2, text, textAnchor,
null);
@@ -121,14 +131,17 @@
}
/**
+ * Draws a rotated string.
*
- * @param text
- * @param g2
- * @param x
- * @param y
- * @param textAnchor
- * @param angle
- * @param rotationAnchor
+ * @param text the text to draw.
+ * @param g2 the graphics target.
+ * @param x the x-coordinate for the text location.
+ * @param y the y-coordinate for the text location.
+ * @param textAnchor the text anchor point.
+ * @param angle the rotation (in radians).
+ * @param rotationAnchor the rotation anchor point.
+ *
+ * @since 1.0.16
*/
public static void drawRotatedString(AttributedString text, Graphics2D g2,
float x, float y, TextAnchor textAnchor,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 12:15:55
|
Revision: 2987
http://sourceforge.net/p/jfreechart/code/2987
Author: mungady
Date: 2013-11-22 12:15:52 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Javadoc updates.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYSplineRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYSplineRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYSplineRenderer.java 2013-11-22 11:27:02 UTC (rev 2986)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYSplineRenderer.java 2013-11-22 12:15:52 UTC (rev 2987)
@@ -59,6 +59,7 @@
import java.util.List;
import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.event.RendererChangeEvent;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.PlotRenderingInfo;
import org.jfree.chart.plot.XYPlot;
@@ -172,9 +173,10 @@
}
/**
- * Returns the resolution of splines.
+ * Returns the number of line segments used to approximate the spline
+ * curve between data points.
*
- * @return Number of line segments between points.
+ * @return The number of line segments.
*
* @see #setPrecision(int)
*/
@@ -203,7 +205,7 @@
*
* @return The type of fill (never <code>null</code>).
*
- * @see #setFillMode(FillType)
+ * @see #setFillType(FillType)
*
* @since 1.0.17
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 11:27:06
|
Revision: 2986
http://sourceforge.net/p/jfreechart/code/2986
Author: mungady
Date: 2013-11-22 11:27:02 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Update Ant build script.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/ant/build-swt.xml
Modified: branches/jfreechart-1.0.x-branch/ant/build-swt.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build-swt.xml 2013-11-22 11:21:09 UTC (rev 2985)
+++ branches/jfreechart-1.0.x-branch/ant/build-swt.xml 2013-11-22 11:27:02 UTC (rev 2986)
@@ -4,9 +4,9 @@
<target name="initialise" description="Initialise required settings.">
<tstamp />
<property name="jfreechart.name" value="jfreechart" />
- <property name="jfreechart.version" value="1.0.16" />
+ <property name="jfreechart.version" value="1.0.17" />
<property name="jcommon.name" value="jcommon" />
- <property name="jcommon.version" value="1.0.20" />
+ <property name="jcommon.version" value="1.0.21" />
<property name="builddir" value="${basedir}/build" />
<property name="jcommon.jar" value="${basedir}/lib/${jcommon.name}-${jcommon.version}.jar"/>
<property name="jfreechart.jar" value="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 11:21:14
|
Revision: 2985
http://sourceforge.net/p/jfreechart/code/2985
Author: mungady
Date: 2013-11-22 11:21:09 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Update Ant build script.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/ant/build.xml
Modified: branches/jfreechart-1.0.x-branch/ant/build.xml
===================================================================
--- branches/jfreechart-1.0.x-branch/ant/build.xml 2013-11-22 11:19:29 UTC (rev 2984)
+++ branches/jfreechart-1.0.x-branch/ant/build.xml 2013-11-22 11:21:09 UTC (rev 2985)
@@ -20,15 +20,15 @@
<target name="initialise" description="Initialise required settings.">
<tstamp />
<property name="jfreechart.name" value="jfreechart" />
- <property name="jfreechart.version" value="1.0.16" />
+ <property name="jfreechart.version" value="1.0.17" />
<property name="jfreechart-bundle-file" value="${jfreechart.name}-${jfreechart.version}-bundle.jar" />
<property name="jcommon.name" value="jcommon" />
- <property name="jcommon.version" value="1.0.20" />
+ <property name="jcommon.version" value="1.0.21" />
<property name="jcommon.jar" value="${basedir}/lib/${jcommon.name}-${jcommon.version}.jar"/>
<property name="jfreesvg.name" value="jfreesvg" />
- <property name="jfreesvg.version" value="1.2" />
+ <property name="jfreesvg.version" value="1.4" />
<property name="orsonpdf.name" value="orsonpdf" />
- <property name="orsonpdf.version" value="1.2-eval" />
+ <property name="orsonpdf.version" value="1.3-eval" />
<property name="builddir" value="${basedir}/build" />
<property name="servlet.jar" value="${basedir}/lib/servlet.jar"/>
<property name="junit.jar" value="${basedir}/lib/junit-4.11.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 11:19:31
|
Revision: 2984
http://sourceforge.net/p/jfreechart/code/2984
Author: mungady
Date: 2013-11-22 11:19:29 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Update README.txt file for release.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/README.txt
Modified: branches/jfreechart-1.0.x-branch/README.txt
===================================================================
--- branches/jfreechart-1.0.x-branch/README.txt 2013-11-22 11:19:05 UTC (rev 2983)
+++ branches/jfreechart-1.0.x-branch/README.txt 2013-11-22 11:19:29 UTC (rev 2984)
@@ -1,8 +1,8 @@
********************************
-* JFREECHART: Version 1.0.16 *
+* JFREECHART: Version 1.0.17 *
********************************
-13 September 2013
+22 November 2013
(C)opyright 2000-2013, by Object Refinery Limited and Contributors.
@@ -38,7 +38,7 @@
3. DOCUMENTATION
-----------------
You can download installation instructions
-(jfreechart-1.0.16-install.pdf) from the JFreeChart home
+(jfreechart-1.0.17-install.pdf) from the JFreeChart home
page or the project page on SourceForge.
Further documentation for JFreeChart (the JFreeChart Developer Guide) is
@@ -66,7 +66,7 @@
to get JFreeChart working on these older versions, but we are no longer
supporting it.
-(b) JCommon - version 1.0.0 or later. The runtime jar file (version 1.0.20)
+(b) JCommon - version 1.0.0 or later. The runtime jar file (version 1.0.21)
is included in the JFreeChart distribution. You can obtain the complete
source code for JCommon from:
@@ -123,7 +123,7 @@
generated is included in the JFreeChart distribution. To run the
demo (using JDK 1.6.0 or later), use the following command:
- java -jar jfreechart-1.0.16-demo.jar
+ java -jar jfreechart-1.0.17-demo.jar
The complete source code for the demo application is available for
download when you purchase the JFreeChart Developer Guide.
@@ -155,11 +155,17 @@
--------------
A list of changes in recent versions:
-1.0.16 : (13-Sep-2013)
+1.0.17 : (22-Nov-2013)
- see the NEWS and ChangeLog files for details.
+1.0.16 : (13-Sep-2013)
+ - bumped the required JRE to 1.6, enhanced axis labelling, provided
+ integration with JFreeSVG and OrsonPDF for vector output, and fixed
+ bugs.
+
1.0.15 : (4-Jul-2013)
- - see the NEWS and ChangeLog files for details.
+ - various minor feature enhancements and a range of bug fixes, see the
+ NEWS and ChangeLog files for details.
1.0.14 : (20-Nov-2011)
- added support for multiple axes in PolarPlot, performance
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-22 11:19:09
|
Revision: 2983
http://sourceforge.net/p/jfreechart/code/2983
Author: mungady
Date: 2013-11-22 11:19:05 +0000 (Fri, 22 Nov 2013)
Log Message:
-----------
Update NEWS file for release.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/NEWS
Modified: branches/jfreechart-1.0.x-branch/NEWS
===================================================================
--- branches/jfreechart-1.0.x-branch/NEWS 2013-11-21 17:31:15 UTC (rev 2982)
+++ branches/jfreechart-1.0.x-branch/NEWS 2013-11-22 11:19:05 UTC (rev 2983)
@@ -1,3 +1,38 @@
+JFreeChart 1.0.17
+-----------------
+22 November 2013
+
+Enhanced XYSplineRenderer with new area fill (contributed by Klaus Rheinwald),
+added a notify flag to all datasets that extend AbstractDataset, extended
+TimeSeriesCollection to validate TimeSeries keys for uniqueness, added a new
+DirectionalGradientPaintTransformer (by Peter Kolb), updated OHLCSeries, added
+HMSNumberFormat, updated JCommon to version 1.0.21 (includes rotated text
+improvements) and fixed some minor bugs.
+
+Bug Fixes:
+
+1084 : BorderArrangement.add() possible ClassCastException;
+1099 : XYSeriesCollection.removeSeries(int) does not deregister listener;
+1109 : WaterfallBarRenderer uses wrong color for diff 0.
+
+And now a word from our sponsors, Object Refinery Limited...
+
+> ORSON CHARTS 3D
+> ---------------
+> We are pleased to announce the release of Orson Charts, a 3D chart library
+> for the Java(tm) platform. Orson Charts has a similar architecture to
+> JFreeChart and provides high-quality 3D chart rendering using just the Java2D
+> API. The built-in Swing-based viewer provides zooming and full 360 degree
+> rotation of charts in any direction. Export options include PNG, PDF and SVG.
+> You can download a free evaluation copy of Orson Charts from:
+>
+> http://www.object-refinery.com/orsoncharts
+>
+> We've also added a tab to the JFreeChart demo application so you can see
+> Orson Charts in action. Orson Charts is not free, but provides a very
+> nice complement to the extensive 2D charting capabilities of JFreeChart.
+
+
JFreeChart 1.0.16
-----------------
13 September 2013
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-21 17:31:18
|
Revision: 2982
http://sourceforge.net/p/jfreechart/code/2982
Author: mungady
Date: 2013-11-21 17:31:15 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java 2013-11-21 17:29:50 UTC (rev 2981)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/block/BorderArrangement.java 2013-11-21 17:31:15 UTC (rev 2982)
@@ -170,6 +170,7 @@
constraint.getHeightRange(), g2);
}
}
+ assert contentSize != null;
return new Size2D(container.calculateTotalWidth(contentSize.getWidth()),
container.calculateTotalHeight(contentSize.getHeight()));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-21 17:29:53
|
Revision: 2981
http://sourceforge.net/p/jfreechart/code/2981
Author: mungady
Date: 2013-11-21 17:29:50 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java 2013-11-21 17:27:28 UTC (rev 2980)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/plot/PolarPlot.java 2013-11-21 17:29:50 UTC (rev 2981)
@@ -327,6 +327,7 @@
*
* @return A short string describing the type of plot.
*/
+ @Override
public String getPlotType() {
return PolarPlot.localizationResources.getString("Polar_Plot");
}
@@ -1367,6 +1368,7 @@
* @param info collects chart drawing information (<code>null</code>
* permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area, Point2D anchor,
PlotState parentState, PlotRenderingInfo info) {
@@ -1638,6 +1640,7 @@
*
* @param percent the amount of the zoom.
*/
+ @Override
public void zoom(double percent) {
for (int axisIdx = 0; axisIdx < getAxisCount(); axisIdx++) {
final ValueAxis axis = getAxis(axisIdx);
@@ -1691,6 +1694,7 @@
*
* @return The range.
*/
+ @Override
public Range getDataRange(ValueAxis axis) {
Range result = null;
int axisIdx = getAxisIndex(axis);
@@ -1724,6 +1728,7 @@
*
* @param event information about the event (not used here).
*/
+ @Override
public void datasetChanged(DatasetChangeEvent event) {
for (int i = 0; i < this.axes.size(); i++) {
final ValueAxis axis = (ValueAxis) this.axes.get(i);
@@ -1746,6 +1751,7 @@
*
* @param event information about the property change.
*/
+ @Override
public void rendererChanged(RendererChangeEvent event) {
fireChangeEvent();
}
@@ -1757,6 +1763,7 @@
*
* @return The legend items.
*/
+ @Override
public LegendItemCollection getLegendItems() {
if (this.fixedLegendItems != null) {
return this.fixedLegendItems;
@@ -1784,6 +1791,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1869,8 +1877,8 @@
* @throws CloneNotSupportedException this can occur if some component of
* the plot cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
-
PolarPlot clone = (PolarPlot) super.clone();
clone.axes = (ObjectList) ObjectUtilities.clone(this.axes);
for (int i = 0; i < this.axes.size(); i++) {
@@ -1975,6 +1983,7 @@
* @param state the plot state.
* @param source the source point (in Java2D coordinates).
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo state,
Point2D source) {
// do nothing
@@ -1991,6 +2000,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomDomainAxes(double factor, PlotRenderingInfo state,
Point2D source, boolean useAnchor) {
// do nothing
@@ -2005,6 +2015,7 @@
* @param state the plot state.
* @param source the source point (in Java2D coordinates).
*/
+ @Override
public void zoomDomainAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo state, Point2D source) {
// do nothing
@@ -2017,6 +2028,7 @@
* @param state the plot state.
* @param source the source point (in Java2D coordinates).
*/
+ @Override
public void zoomRangeAxes(double factor, PlotRenderingInfo state,
Point2D source) {
zoom(factor);
@@ -2034,6 +2046,7 @@
*
* @since 1.0.7
*/
+ @Override
public void zoomRangeAxes(double factor, PlotRenderingInfo info,
Point2D source, boolean useAnchor) {
// get the source coordinate - this plot has always a VERTICAL
@@ -2063,6 +2076,7 @@
* @param state the plot state.
* @param source the source point (in Java2D coordinates).
*/
+ @Override
public void zoomRangeAxes(double lowerPercent, double upperPercent,
PlotRenderingInfo state, Point2D source) {
zoom((upperPercent + lowerPercent) / 2.0);
@@ -2073,6 +2087,7 @@
*
* @return <code>false</code> always.
*/
+ @Override
public boolean isDomainZoomable() {
return false;
}
@@ -2082,6 +2097,7 @@
*
* @return <code>true</code>.
*/
+ @Override
public boolean isRangeZoomable() {
return true;
}
@@ -2091,6 +2107,7 @@
*
* @return The orientation.
*/
+ @Override
public PlotOrientation getOrientation() {
return PlotOrientation.HORIZONTAL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-21 17:27:32
|
Revision: 2980
http://sourceforge.net/p/jfreechart/code/2980
Author: mungady
Date: 2013-11-21 17:27:28 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java 2013-11-21 17:14:52 UTC (rev 2979)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/DefaultPolarItemRenderer.java 2013-11-21 17:27:28 UTC (rev 2980)
@@ -224,6 +224,7 @@
*
* @see #getPlot()
*/
+ @Override
public void setPlot(PolarPlot plot) {
this.plot = plot;
}
@@ -235,6 +236,7 @@
*
* @see #setPlot(PolarPlot)
*/
+ @Override
public PolarPlot getPlot() {
return this.plot;
}
@@ -348,6 +350,7 @@
*
* @return The drawing supplier.
*/
+ @Override
public DrawingSupplier getDrawingSupplier() {
DrawingSupplier result = null;
PolarPlot p = getPlot();
@@ -493,6 +496,7 @@
* @param dataset the dataset.
* @param seriesIndex the series index.
*/
+ @Override
public void drawSeries(Graphics2D g2, Rectangle2D dataArea,
PlotRenderingInfo info, PolarPlot plot, XYDataset dataset,
int seriesIndex) {
@@ -515,7 +519,7 @@
poly.lineTo(p.x, p.y);
}
}
-
+ assert poly != null;
if (getConnectFirstAndLastPoint()) {
poly.closePath();
}
@@ -594,6 +598,7 @@
* @param ticks the ticks (<code>null</code> not permitted).
* @param dataArea the data area.
*/
+ @Override
public void drawAngularGridLines(Graphics2D g2, PolarPlot plot,
List ticks, Rectangle2D dataArea) {
@@ -638,6 +643,7 @@
* @param ticks the ticks (<code>null</code> not permitted).
* @param dataArea the data area.
*/
+ @Override
public void drawRadialGridLines(Graphics2D g2, PolarPlot plot,
ValueAxis radialAxis, List ticks, Rectangle2D dataArea) {
@@ -678,6 +684,7 @@
*
* @return The legend item.
*/
+ @Override
public LegendItem getLegendItem(int series) {
LegendItem result;
PolarPlot plot = getPlot();
@@ -739,6 +746,7 @@
*
* @since 1.0.14
*/
+ @Override
public XYToolTipGenerator getToolTipGenerator(int series, int item) {
XYToolTipGenerator generator
= (XYToolTipGenerator) this.toolTipGeneratorList.get(series);
@@ -755,6 +763,7 @@
*
* @since 1.0.14
*/
+ @Override
public XYToolTipGenerator getSeriesToolTipGenerator(int series) {
return (XYToolTipGenerator) this.toolTipGeneratorList.get(series);
}
@@ -767,6 +776,7 @@
*
* @since 1.0.14
*/
+ @Override
public void setSeriesToolTipGenerator(int series,
XYToolTipGenerator generator) {
this.toolTipGeneratorList.set(series, generator);
@@ -780,6 +790,7 @@
*
* @since 1.0.14
*/
+ @Override
public XYToolTipGenerator getBaseToolTipGenerator() {
return this.baseToolTipGenerator;
}
@@ -792,6 +803,7 @@
*
* @since 1.0.14
*/
+ @Override
public void setBaseToolTipGenerator(XYToolTipGenerator generator) {
this.baseToolTipGenerator = generator;
fireChangeEvent();
@@ -804,6 +816,7 @@
*
* @since 1.0.14
*/
+ @Override
public XYURLGenerator getURLGenerator() {
return this.urlGenerator;
}
@@ -815,6 +828,7 @@
*
* @since 1.0.14
*/
+ @Override
public void setURLGenerator(XYURLGenerator urlGenerator) {
this.urlGenerator = urlGenerator;
fireChangeEvent();
@@ -881,6 +895,7 @@
* @return <code>true</code> if this renderer is equal to <code>obj</code>,
* and <code>false</code> otherwise.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -938,6 +953,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
DefaultPolarItemRenderer clone
= (DefaultPolarItemRenderer) 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-21 17:14:55
|
Revision: 2979
http://sourceforge.net/p/jfreechart/code/2979
Author: mungady
Date: 2013-11-21 17:14:52 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer3D.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/AbstractCategoryItemRenderer.java 2013-11-21 17:14:52 UTC (rev 2979)
@@ -895,6 +895,8 @@
else if (orientation == PlotOrientation.VERTICAL) {
line = new Line2D.Double(v, dataArea.getMinY(), v,
dataArea.getMaxY());
+ } else {
+ throw new IllegalStateException();
}
g2.setPaint(marker.getPaint());
g2.setStroke(marker.getStroke());
@@ -978,6 +980,8 @@
else if (orientation == PlotOrientation.VERTICAL) {
line = new Line2D.Double(dataArea.getMinX(), v,
dataArea.getMaxX(), v);
+ } else {
+ throw new IllegalStateException();
}
g2.setPaint(marker.getPaint());
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer3D.java 2013-11-21 16:58:53 UTC (rev 2978)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/BarRenderer3D.java 2013-11-21 17:14:52 UTC (rev 2979)
@@ -213,6 +213,7 @@
*
* @see #getYOffset()
*/
+ @Override
public double getXOffset() {
return this.xOffset;
}
@@ -222,6 +223,7 @@
*
* @return The 3D effect.
*/
+ @Override
public double getYOffset() {
return this.yOffset;
}
@@ -267,11 +269,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) {
Rectangle2D adjusted = new Rectangle2D.Double(dataArea.getX(),
dataArea.getY() + getYOffset(), dataArea.getWidth()
@@ -289,8 +290,9 @@
* @param plot the plot.
* @param dataArea the area inside the axes.
*/
+ @Override
public void drawBackground(Graphics2D g2, CategoryPlot plot,
- Rectangle2D dataArea) {
+ Rectangle2D dataArea) {
float x0 = (float) dataArea.getX();
float x1 = x0 + (float) Math.abs(this.xOffset);
@@ -370,6 +372,7 @@
* @param plot the plot.
* @param dataArea the area inside the axes.
*/
+ @Override
public void drawOutline(Graphics2D g2, CategoryPlot plot,
Rectangle2D dataArea) {
@@ -413,10 +416,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;
@@ -459,6 +461,7 @@
* @param value the value at which the grid line should be drawn.
*
*/
+ @Override
public void drawRangeGridline(Graphics2D g2, CategoryPlot plot,
ValueAxis axis, Rectangle2D dataArea, double value) {
@@ -520,6 +523,7 @@
*
* @since 1.0.13
*/
+ @Override
public void drawRangeLine(Graphics2D g2, CategoryPlot plot, ValueAxis axis,
Rectangle2D dataArea, double value, Paint paint, Stroke stroke) {
@@ -571,11 +575,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(),
@@ -615,6 +617,8 @@
y - (float) this.yOffset);
path.lineTo((float) (adjusted.getMaxX()), y);
path.closePath();
+ } else {
+ throw new IllegalStateException();
}
g2.setPaint(marker.getPaint());
g2.fill(path);
@@ -657,16 +661,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) {
// check the value we are plotting...
Number dataValue = dataset.getValue(row, column);
@@ -697,7 +696,7 @@
double barLength = Math.abs(transL1 - transL0);
// draw the bar...
- Rectangle2D bar = null;
+ Rectangle2D bar;
if (orientation == PlotOrientation.HORIZONTAL) {
bar = new Rectangle2D.Double(barL0, barW0, barLength,
state.getBarWidth());
@@ -721,7 +720,7 @@
double y3 = bar.getMaxY();
GeneralPath bar3dRight = null;
- GeneralPath bar3dTop = null;
+ GeneralPath bar3dTop;
if (barLength > 0.0) {
bar3dRight = new GeneralPath();
bar3dRight.moveTo((float) x2, (float) y3);
@@ -783,6 +782,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-21 16:58:56
|
Revision: 2978
http://sourceforge.net/p/jfreechart/code/2978
Author: mungady
Date: 2013-11-21 16:58:53 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/ClusteredXYBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYBarRenderer.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBubbleRenderer.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/YIntervalRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/AbstractXYItemRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -1098,6 +1098,8 @@
else if (orientation == PlotOrientation.VERTICAL) {
line = new Line2D.Double(v, dataArea.getMinY(), v,
dataArea.getMaxY());
+ } else {
+ throw new IllegalStateException();
}
final Composite originalComposite = g2.getComposite();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/ClusteredXYBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/ClusteredXYBarRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/ClusteredXYBarRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -135,6 +135,7 @@
*
* @return <code>2</code>.
*/
+ @Override
public int getPassCount() {
return 2;
}
@@ -146,6 +147,7 @@
*
* @return The bounds (possibly <code>null</code>).
*/
+ @Override
public Range findDomainBounds(XYDataset dataset) {
if (dataset == null) {
return null;
@@ -219,16 +221,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) {
IntervalXYDataset intervalDataset = (IntervalXYDataset) dataset;
@@ -295,6 +292,8 @@
double ry = Math.min(yy0, yy1);
double rh = intervalH;
bar = new Rectangle2D.Double(rx, ry, rw, rh);
+ } else {
+ throw new IllegalStateException();
}
boolean positive = (y1 > 0.0);
boolean inverted = rangeAxis.isInverted();
@@ -352,6 +351,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -373,6 +373,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/StackedXYBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYBarRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/StackedXYBarRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -165,6 +165,7 @@
*
* @return <code>2</code>.
*/
+ @Override
public int getPassCount() {
return 3;
}
@@ -183,11 +184,9 @@
*
* @return A state object.
*/
- 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) {
return new XYBarRendererState(info);
}
@@ -200,6 +199,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) {
if (this.renderAsPercentages) {
@@ -233,18 +233,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;
@@ -357,6 +350,8 @@
bar = new Rectangle2D.Double(Math.min(translatedStartX,
translatedEndX), Math.min(translatedBase, translatedValue),
translatedWidth, translatedHeight);
+ } else {
+ throw new IllegalStateException();
}
boolean positive = (value > 0.0);
boolean inverted = rangeAxis.isInverted();
@@ -417,6 +412,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -436,6 +432,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = result * 37 + (this.renderAsPercentages ? 1 : 0);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBubbleRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBubbleRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYBubbleRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -170,6 +170,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,
@@ -198,8 +199,8 @@
double transY = rangeAxis.valueToJava2D(y, dataArea,
rangeAxisLocation);
- double transDomain = 0.0;
- double transRange = 0.0;
+ double transDomain;
+ double transRange;
double zero;
switch(getScaleType()) {
@@ -237,6 +238,8 @@
else if (orientation == PlotOrientation.HORIZONTAL) {
circle = new Ellipse2D.Double(transY - transRange / 2.0,
transX - transDomain / 2.0, transRange, transDomain);
+ } else {
+ throw new IllegalStateException();
}
g2.setPaint(getItemPaint(series, item));
g2.fill(circle);
@@ -256,9 +259,9 @@
}
// add an entity if this info is being collected
- EntityCollection entities = null;
if (info != null) {
- entities = info.getOwner().getEntityCollection();
+ EntityCollection entities
+ = info.getOwner().getEntityCollection();
if (entities != null && circle.intersects(dataArea)) {
addEntity(entities, circle, dataset, series, item,
circle.getCenterX(), circle.getCenterY());
@@ -282,6 +285,7 @@
*
* @return A legend item for the series.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
LegendItem result = null;
XYPlot plot = getPlot();
@@ -332,6 +336,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -353,6 +358,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/XYDifferenceRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/XYDifferenceRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -326,17 +326,13 @@
*
* @return A state object.
*/
- 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);
state.setProcessVisibleItemsOnly(false);
return state;
-
}
/**
@@ -367,18 +363,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 (pass == 0) {
drawItemPass0(g2, dataArea, info, plot, domainAxis, rangeAxis,
@@ -1124,6 +1113,7 @@
*
* @return A legend item for the series.
*/
+ @Override
public LegendItem getLegendItem(int datasetIndex, int series) {
LegendItem result = null;
XYPlot p = getPlot();
@@ -1175,6 +1165,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1211,6 +1202,7 @@
*
* @throws CloneNotSupportedException if the renderer cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
XYDifferenceRenderer clone = (XYDifferenceRenderer) super.clone();
clone.legendLine = ShapeUtilities.clone(this.legendLine);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/YIntervalRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/YIntervalRenderer.java 2013-11-21 16:48:39 UTC (rev 2977)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/xy/YIntervalRenderer.java 2013-11-21 16:58:53 UTC (rev 2978)
@@ -70,7 +70,6 @@
import org.jfree.chart.plot.PlotRenderingInfo;
import org.jfree.chart.plot.XYPlot;
import org.jfree.data.Range;
-import org.jfree.data.general.DatasetUtilities;
import org.jfree.data.xy.IntervalXYDataset;
import org.jfree.data.xy.XYDataset;
import org.jfree.text.TextUtilities;
@@ -152,6 +151,7 @@
* @return The range (<code>null</code> if the dataset is <code>null</code>
* or empty).
*/
+ @Override
public Range findRangeBounds(XYDataset dataset) {
return findRangeBounds(dataset, true);
}
@@ -174,18 +174,11 @@
* (<code>null</code> permitted).
* @param pass the pass index (ignored here).
*/
- 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...
EntityCollection entities = null;
@@ -223,6 +216,8 @@
line = new Line2D.Double(xx, yyLow, xx, yyHigh);
top = ShapeUtilities.createTranslatedShape(shape, xx, yyHigh);
bottom = ShapeUtilities.createTranslatedShape(shape, xx, yyLow);
+ } else {
+ throw new IllegalStateException();
}
g2.setPaint(p);
g2.setStroke(s);
@@ -292,6 +287,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -314,6 +310,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-21 16:48:42
|
Revision: 2977
http://sourceforge.net/p/jfreechart/code/2977
Author: mungady
Date: 2013-11-21 16:48:39 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/PaintScaleLegend.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ShortTextTitle.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/TextTitle.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/PaintScaleLegend.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/PaintScaleLegend.java 2013-11-21 16:45:07 UTC (rev 2976)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/PaintScaleLegend.java 2013-11-21 16:48:39 UTC (rev 2977)
@@ -401,6 +401,7 @@
*
* @since 1.0.13
*/
+ @Override
public void axisChanged(AxisChangeEvent event) {
if (this.axis == event.getAxis()) {
notifyListeners(new TitleChangeEvent(this));
@@ -416,6 +417,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
RectangleConstraint cc = toContentConstraint(constraint);
LengthConstraintType w = cc.getWidthConstraintType();
@@ -455,6 +457,7 @@
throw new RuntimeException("Not yet implemented.");
}
}
+ assert contentSize != null; // suppress compiler warning
return new Size2D(calculateTotalWidth(contentSize.getWidth()),
calculateTotalHeight(contentSize.getHeight()));
}
@@ -507,6 +510,7 @@
* @param g2 the graphics target (<code>null</code> not permitted).
* @param area the drawing area (<code>null</code> not permitted).
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area) {
draw(g2, area, null);
}
@@ -520,8 +524,8 @@
*
* @return <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
-
Rectangle2D target = (Rectangle2D) area.clone();
target = trimMargin(target);
if (this.backgroundPaint != null) {
@@ -653,6 +657,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof PaintScaleLegend)) {
return false;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ShortTextTitle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ShortTextTitle.java 2013-11-21 16:45:07 UTC (rev 2976)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/ShortTextTitle.java 2013-11-21 16:48:39 UTC (rev 2977)
@@ -82,6 +82,7 @@
*
* @return The dimensions for the title.
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
RectangleConstraint cc = toContentConstraint(constraint);
LengthConstraintType w = cc.getWidthConstraintType();
@@ -121,6 +122,7 @@
throw new RuntimeException("Not yet implemented.");
}
}
+ assert contentSize != null;
if (contentSize.width <= 0.0 || contentSize.height <= 0.0) {
return new Size2D(0.0, 0.0);
}
@@ -138,6 +140,7 @@
*
* @return The content size.
*/
+ @Override
protected Size2D arrangeNN(Graphics2D g2) {
Range max = new Range(0.0, Float.MAX_VALUE);
return arrangeRR(g2, max, max);
@@ -152,6 +155,7 @@
*
* @return The content size.
*/
+ @Override
protected Size2D arrangeRN(Graphics2D g2, Range widthRange) {
Size2D s = arrangeNN(g2);
if (widthRange.contains(s.getWidth())) {
@@ -172,6 +176,7 @@
*
* @return The content size.
*/
+ @Override
protected Size2D arrangeFN(Graphics2D g2, double w) {
g2.setFont(getFont());
FontMetrics fm = g2.getFontMetrics(getFont());
@@ -193,6 +198,7 @@
*
* @return The content size.
*/
+ @Override
protected Size2D arrangeRR(Graphics2D g2, Range widthRange,
Range heightRange) {
@@ -217,6 +223,7 @@
*
* @return <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
if (area.isEmpty()) {
return null;
@@ -229,7 +236,6 @@
g2.setPaint(getPaint());
TextUtilities.drawAlignedString(getText(), g2, (float) area.getMinX(),
(float) area.getMinY(), TextAnchor.TOP_LEFT);
-
return null;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/TextTitle.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/TextTitle.java 2013-11-21 16:45:07 UTC (rev 2976)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/TextTitle.java 2013-11-21 16:48:39 UTC (rev 2977)
@@ -471,6 +471,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
RectangleConstraint cc = toContentConstraint(constraint);
LengthConstraintType w = cc.getWidthConstraintType();
@@ -510,6 +511,7 @@
throw new RuntimeException("Not yet implemented.");
}
}
+ assert contentSize != null; // suppress compiler warning
return new Size2D(calculateTotalWidth(contentSize.getWidth()),
calculateTotalHeight(contentSize.getHeight()));
}
@@ -665,6 +667,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);
}
@@ -681,6 +684,7 @@
* @return An {@link EntityCollection} containing a chart entity for the
* title, or <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
if (this.content == null) {
return null;
@@ -822,6 +826,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -865,6 +870,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = 29 * result + (this.text != null ? this.text.hashCode() : 0);
@@ -882,6 +888,7 @@
*
* @throws CloneNotSupportedException never.
*/
+ @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-21 16:45:10
|
Revision: 2976
http://sourceforge.net/p/jfreechart/code/2976
Author: mungady
Date: 2013-11-21 16:45:07 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Fix compiler warnings.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendGraphic.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendGraphic.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendGraphic.java 2013-11-21 16:37:07 UTC (rev 2975)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/title/LegendGraphic.java 2013-11-21 16:45:07 UTC (rev 2976)
@@ -500,6 +500,7 @@
*
* @return The block size (in Java2D units, never <code>null</code>).
*/
+ @Override
public Size2D arrange(Graphics2D g2, RectangleConstraint constraint) {
RectangleConstraint contentConstraint = toContentConstraint(constraint);
LengthConstraintType w = contentConstraint.getWidthConstraintType();
@@ -535,16 +536,13 @@
throw new RuntimeException("Not yet implemented.");
}
else if (h == LengthConstraintType.FIXED) {
- contentSize = new Size2D(
- contentConstraint.getWidth(),
- contentConstraint.getHeight()
- );
+ contentSize = new Size2D(contentConstraint.getWidth(),
+ contentConstraint.getHeight());
}
}
- return new Size2D(
- calculateTotalWidth(contentSize.getWidth()),
- calculateTotalHeight(contentSize.getHeight())
- );
+ assert contentSize != null;
+ return new Size2D(calculateTotalWidth(contentSize.getWidth()),
+ calculateTotalHeight(contentSize.getHeight()));
}
/**
@@ -573,6 +571,7 @@
* @param g2 the graphics device.
* @param area the area.
*/
+ @Override
public void draw(Graphics2D g2, Rectangle2D area) {
area = trimMargin(area);
@@ -611,7 +610,6 @@
g2.draw(s);
}
}
-
}
/**
@@ -623,6 +621,7 @@
*
* @return Always <code>null</code>.
*/
+ @Override
public Object draw(Graphics2D g2, Rectangle2D area, Object params) {
draw(g2, area);
return null;
@@ -636,6 +635,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof LegendGraphic)) {
return false;
@@ -692,6 +692,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + ObjectUtilities.hashCode(this.fillPaint);
@@ -706,6 +707,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
LegendGraphic clone = (LegendGraphic) super.clone();
clone.shape = ShapeUtilities.clone(this.shape);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mu...@us...> - 2013-11-21 16:37:10
|
Revision: 2975
http://sourceforge.net/p/jfreechart/code/2975
Author: mungady
Date: 2013-11-21 16:37:07 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Added @Override tags.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLabelLocation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLocation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisSpace.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPosition.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPositions.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelWidthType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CyclicNumberAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnit.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ExtendedCategoryAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MonthDateFormat.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnit.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/QuarterDateFormat.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SymbolAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Tick.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickType.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnit.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/TickUnits.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueAxis.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ValueTick.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/Axis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -1244,7 +1244,7 @@
*/
protected Rectangle2D getLabelEnclosure(Graphics2D g2, RectangleEdge edge) {
Rectangle2D result = new Rectangle2D.Double();
- Rectangle2D bounds = null;;
+ Rectangle2D bounds = null;
if (this.attributedLabel != null) {
TextLayout layout = new TextLayout(
this.attributedLabel.getIterator(),
@@ -1564,6 +1564,7 @@
* @throws CloneNotSupportedException if some component of the axis does
* not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
Axis clone = (Axis) super.clone();
// It's up to the plot which clones up to restore the correct references
@@ -1579,6 +1580,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1666,6 +1668,12 @@
return true;
}
+ /**
+ * Returns a hash code for this instance.
+ *
+ * @return A hash code.
+ */
+ @Override
public int hashCode() {
int hash = 3;
if (this.label != null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLabelLocation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLabelLocation.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLabelLocation.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -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) {
return true;
@@ -108,6 +110,12 @@
return true;
}
+ /**
+ * Returns a hash code for this instance.
+ *
+ * @return A hash code.
+ */
+ @Override
public int hashCode() {
int hash = 5;
hash = 83 * hash + this.name.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLocation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLocation.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisLocation.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -103,6 +103,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -115,6 +116,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -129,6 +131,12 @@
return true;
}
+ /**
+ * Returns a hash code for this instance.
+ *
+ * @return A hash code.
+ */
+ @Override
public int hashCode() {
int hash = 5;
hash = 83 * hash + this.name.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisSpace.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisSpace.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/AxisSpace.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -313,6 +313,7 @@
* @throws CloneNotSupportedException This class won't throw this exception,
* but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
@@ -324,6 +325,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -352,6 +354,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 23;
long l = Double.doubleToLongBits(this.top);
@@ -370,6 +373,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return super.toString() + "[left=" + this.left + ",right=" + this.right
+ ",top=" + this.top + ",bottom=" + this.bottom + "]";
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAnchor.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -81,6 +81,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -93,8 +94,8 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (this == obj) {
return true;
}
@@ -106,7 +107,6 @@
return false;
}
return true;
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -884,6 +884,7 @@
*
* @return The space required to draw the axis.
*/
+ @Override
public AxisSpace reserveSpace(Graphics2D g2, Plot plot,
Rectangle2D plotArea, RectangleEdge edge, AxisSpace space) {
@@ -938,6 +939,7 @@
/**
* Configures the axis against the current plot.
*/
+ @Override
public void configure() {
// nothing required
}
@@ -958,6 +960,7 @@
*
* @return The axis state (never <code>null</code>).
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
@@ -1117,6 +1120,7 @@
*
* @return A list of ticks.
*/
+ @Override
public List refreshTicks(Graphics2D g2, AxisState state,
Rectangle2D dataArea, RectangleEdge edge) {
@@ -1324,6 +1328,7 @@
* @throws CloneNotSupportedException if some component of the axis does
* not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
CategoryAxis clone = (CategoryAxis) super.clone();
clone.tickLabelFontMap = new HashMap(this.tickLabelFontMap);
@@ -1340,6 +1345,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1395,6 +1401,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryAxis3D.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -109,6 +109,7 @@
*
* @return The axis state (never <code>null</code>).
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
@@ -175,6 +176,7 @@
*
* @return The coordinate.
*/
+ @Override
public double getCategoryJava2DCoordinate(CategoryAnchor anchor,
int category, int categoryCount, Rectangle2D area,
RectangleEdge edge) {
@@ -224,6 +226,7 @@
* @throws CloneNotSupportedException If the axis is not cloneable for
* some reason.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPosition.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPosition.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPosition.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -219,6 +219,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -253,6 +254,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 19;
result = 37 * result + this.categoryAnchor.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPositions.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPositions.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelPositions.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -365,8 +365,8 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (this == obj) {
return true;
}
@@ -388,9 +388,7 @@
if (!this.positionForAxisAtRight.equals(that.positionForAxisAtRight)) {
return false;
}
-
return true;
-
}
/**
@@ -398,6 +396,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 19;
result = 37 * result + this.positionForAxisAtTop.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelWidthType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelWidthType.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryLabelWidthType.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -79,6 +79,7 @@
*
* @return The string (never </code>null</code>).
*/
+ @Override
public String toString() {
return this.name;
}
@@ -91,8 +92,8 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (this == obj) {
return true;
}
@@ -104,7 +105,6 @@
return false;
}
return true;
-
}
/**
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CategoryTick.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -116,6 +116,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -141,6 +142,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 41;
result = 37 * result + this.category.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ColorBar.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -191,7 +191,6 @@
Rectangle2D plotArea, Rectangle2D dataArea,
Rectangle2D reservedArea, RectangleEdge edge) {
-
Rectangle2D colorBarArea = null;
double thickness = calculateBarThickness(dataArea, edge);
@@ -199,7 +198,7 @@
thickness = this.colorBarThickness; // allow fixed thickness
}
- double length = 0.0;
+ double length;
if (RectangleEdge.isLeftOrRight(edge)) {
length = dataArea.getHeight();
}
@@ -234,6 +233,7 @@
drawColorBar(g2, colorBarArea, edge);
AxisState state = null;
+ assert colorBarArea != null; // suppresses compiler warnings
if (edge == RectangleEdge.TOP) {
cursor = colorBarArea.getMinY();
state = this.axis.draw(g2, cursor, reservedArea, colorBarArea,
@@ -254,6 +254,7 @@
state = this.axis.draw(g2, cursor, reservedArea, colorBarArea,
RectangleEdge.RIGHT, null);
}
+ assert state != null; // suppresses compiler warning
return state.getCursor();
}
@@ -394,8 +395,8 @@
* @return The thickness.
*/
private double calculateBarThickness(Rectangle2D plotArea,
- RectangleEdge edge) {
- double result = 0.0;
+ RectangleEdge edge) {
+ double result;
if (RectangleEdge.isLeftOrRight(edge)) {
result = plotArea.getWidth() * this.colorBarThicknessPercent;
}
@@ -413,12 +414,11 @@
* @throws CloneNotSupportedException if some component of the color bar
* does not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
-
ColorBar clone = (ColorBar) super.clone();
clone.axis = (ValueAxis) this.axis.clone();
return clone;
-
}
/**
@@ -428,8 +428,8 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
-
if (obj == this) {
return true;
}
@@ -456,7 +456,6 @@
return false;
}
return true;
-
}
/**
@@ -464,6 +463,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.axis.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CompassFormat.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -101,8 +101,9 @@
*
* @return The string buffer.
*/
+ @Override
public StringBuffer format(double number, StringBuffer toAppendTo,
- FieldPosition pos) {
+ FieldPosition pos) {
return toAppendTo.append(getDirectionCode(number));
}
@@ -115,8 +116,9 @@
*
* @return The string buffer.
*/
+ @Override
public StringBuffer format(long number, StringBuffer toAppendTo,
- FieldPosition pos) {
+ FieldPosition pos) {
return toAppendTo.append(getDirectionCode(number));
}
@@ -129,6 +131,7 @@
*
* @return <code>null</code>.
*/
+ @Override
public Number parse(String source, ParsePosition parsePosition) {
return null;
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CyclicNumberAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CyclicNumberAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/CyclicNumberAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -384,9 +384,9 @@
*
* @return The anchor point.
*/
+ @Override
protected float[] calculateAnchorPoint(ValueTick tick, double cursor,
- Rectangle2D dataArea,
- RectangleEdge edge) {
+ Rectangle2D dataArea, RectangleEdge edge) {
if (tick instanceof CycleBoundTick) {
boolean mapsav = this.boundMappedToLastCycle;
this.boundMappedToLastCycle
@@ -412,6 +412,7 @@
*
* @return A list of ticks.
*/
+ @Override
protected List refreshTicksHorizontal(Graphics2D g2, Rectangle2D dataArea,
RectangleEdge edge) {
@@ -733,8 +734,9 @@
*
* @return The data value.
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D dataArea,
- RectangleEdge edge) {
+ RectangleEdge edge) {
Range range = getRange();
double vmax = range.getUpperBound();
@@ -780,8 +782,9 @@
*
* @return The Java 2D value.
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D dataArea,
- RectangleEdge edge) {
+ RectangleEdge edge) {
Range range = getRange();
double vmin = range.getLowerBound();
@@ -833,6 +836,7 @@
*
* @param value the data value.
*/
+ @Override
public void centerRange(double value) {
setRange(value - this.period / 2.0, value + this.period / 2.0);
}
@@ -848,6 +852,7 @@
* @see org.jfree.chart.axis.ValueAxis#setAutoRangeMinimumSize(double,
* boolean)
*/
+ @Override
public void setAutoRangeMinimumSize(double size, boolean notify) {
if (size > this.period) {
this.period = size;
@@ -863,6 +868,7 @@
*
* @see org.jfree.chart.axis.ValueAxis#setFixedAutoRange(double)
*/
+ @Override
public void setFixedAutoRange(double length) {
this.period = length;
super.setFixedAutoRange(length);
@@ -878,8 +884,9 @@
*
* @see org.jfree.chart.axis.ValueAxis#setRange(Range, boolean, boolean)
*/
+ @Override
public void setRange(Range range, boolean turnOffAutoRange,
- boolean notify) {
+ boolean notify) {
double size = range.getUpperBound() - range.getLowerBound();
if (size > this.period) {
this.period = size;
@@ -970,6 +977,7 @@
*
* @return The axis state.
*/
+ @Override
protected AxisState drawTickMarksAndLabels(Graphics2D g2, double cursor,
Rectangle2D plotArea, Rectangle2D dataArea, RectangleEdge edge) {
this.internalMarkerWhenTicksOverlap = false;
@@ -1027,42 +1035,33 @@
*
* @return The axis state (never <code>null</code>).
*/
- public AxisState draw(Graphics2D g2,
- double cursor,
- Rectangle2D plotArea,
- Rectangle2D dataArea,
- RectangleEdge edge,
- PlotRenderingInfo plotState) {
+ @Override
+ public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
+ Rectangle2D dataArea, RectangleEdge edge, PlotRenderingInfo plotState) {
- AxisState ret = super.draw(
- g2, cursor, plotArea, dataArea, edge, plotState
- );
+ AxisState ret = super.draw(g2, cursor, plotArea, dataArea, edge,
+ plotState);
if (isAdvanceLineVisible()) {
- double xx = valueToJava2D(
- getRange().getUpperBound(), dataArea, edge
- );
+ double xx = valueToJava2D(getRange().getUpperBound(), dataArea,
+ edge);
Line2D mark = null;
g2.setStroke(getAdvanceLineStroke());
g2.setPaint(getAdvanceLinePaint());
if (edge == RectangleEdge.LEFT) {
- mark = new Line2D.Double(
- cursor, xx, cursor + dataArea.getWidth(), xx
- );
+ mark = new Line2D.Double(cursor, xx, cursor
+ + dataArea.getWidth(), xx);
}
else if (edge == RectangleEdge.RIGHT) {
- mark = new Line2D.Double(
- cursor - dataArea.getWidth(), xx, cursor, xx
- );
+ mark = new Line2D.Double(cursor - dataArea.getWidth(), xx,
+ cursor, xx);
}
else if (edge == RectangleEdge.TOP) {
- mark = new Line2D.Double(
- xx, cursor + dataArea.getHeight(), xx, cursor
- );
+ mark = new Line2D.Double(xx, cursor + dataArea.getHeight(), xx,
+ cursor);
}
else if (edge == RectangleEdge.BOTTOM) {
- mark = new Line2D.Double(
- xx, cursor, xx, cursor - dataArea.getHeight()
- );
+ mark = new Line2D.Double(xx, cursor, xx,
+ cursor - dataArea.getHeight());
}
g2.draw(mark);
}
@@ -1081,11 +1080,9 @@
*
* @return The reserved space.
*/
- public AxisSpace reserveSpace(Graphics2D g2,
- Plot plot,
- Rectangle2D plotArea,
- RectangleEdge edge,
- AxisSpace space) {
+ @Override
+ public AxisSpace reserveSpace(Graphics2D g2, Plot plot,
+ Rectangle2D plotArea, RectangleEdge edge, AxisSpace space) {
this.internalMarkerCycleBoundTick = null;
AxisSpace ret = super.reserveSpace(g2, plot, plotArea, edge, space);
@@ -1127,11 +1124,9 @@
* @throws IOException if there is an I/O error.
*/
private void writeObject(ObjectOutputStream stream) throws IOException {
-
stream.defaultWriteObject();
SerialUtilities.writePaint(this.advanceLinePaint, stream);
SerialUtilities.writeStroke(this.advanceLineStroke, stream);
-
}
/**
@@ -1143,12 +1138,10 @@
* @throws ClassNotFoundException if there is a classpath problem.
*/
private void readObject(ObjectInputStream stream)
- throws IOException, ClassNotFoundException {
-
+ throws IOException, ClassNotFoundException {
stream.defaultReadObject();
this.advanceLinePaint = SerialUtilities.readPaint(stream);
this.advanceLineStroke = SerialUtilities.readStroke(stream);
-
}
@@ -1159,6 +1152,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/axis/DateTick.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTick.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -113,6 +113,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -132,6 +133,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.date.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickMarkPosition.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -81,6 +81,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -93,6 +94,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnit.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnit.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnit.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -205,6 +205,7 @@
*
* @return The formatted date.
*/
+ @Override
public String valueToString(double milliseconds) {
return this.formatter.format(new Date((long) milliseconds));
}
@@ -417,6 +418,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -445,6 +447,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 19;
result = 37 * result + this.unitType.hashCode();
@@ -459,6 +462,7 @@
*
* @return A string representation of this instance.
*/
+ @Override
public String toString() {
return "DateTickUnit[" + this.unitType.toString() + ", "
+ this.count + "]";
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/DateTickUnitType.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -113,6 +113,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -125,6 +126,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/axis/ExtendedCategoryAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ExtendedCategoryAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ExtendedCategoryAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -165,6 +165,7 @@
*
* @return A label.
*/
+ @Override
protected TextBlock createLabel(Comparable category, float width,
RectangleEdge edge, Graphics2D g2) {
TextBlock label = super.createLabel(category, width, edge, g2);
@@ -194,6 +195,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -221,6 +223,7 @@
*
* @throws CloneNotSupportedException if there is a problem cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ExtendedCategoryAxis clone = (ExtendedCategoryAxis) super.clone();
clone.sublabels = new HashMap(this.sublabels);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -297,6 +297,7 @@
*
* @return A value along the axis scale.
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D area,
RectangleEdge edge) {
@@ -314,7 +315,7 @@
min = area.getMaxY();
max = area.getY();
}
- double log = 0.0;
+ double log;
if (isInverted()) {
log = axisMax - (java2DValue - min) / (max - min)
* (axisMax - axisMin);
@@ -337,6 +338,7 @@
*
* @return The Java2D coordinate corresponding to <code>value</code>.
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D area,
RectangleEdge edge) {
@@ -369,6 +371,7 @@
* Configures the axis. This method is typically called when an axis
* is assigned to a new plot.
*/
+ @Override
public void configure() {
if (isAutoRange()) {
autoAdjustRange();
@@ -379,6 +382,7 @@
* Adjusts the axis range to match the data range that the axis is
* required to display.
*/
+ @Override
protected void autoAdjustRange() {
Plot plot = getPlot();
if (plot == null) {
@@ -440,6 +444,7 @@
*
* @return The axis state (never <code>null</code>).
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
@@ -478,6 +483,7 @@
* @return A list of ticks.
*
*/
+ @Override
public List refreshTicks(Graphics2D g2, AxisState state,
Rectangle2D dataArea, RectangleEdge edge) {
List result = new java.util.ArrayList();
@@ -799,6 +805,7 @@
* @param lowerPercent the new lower bound.
* @param upperPercent the new upper bound.
*/
+ @Override
public void zoomRange(double lowerPercent, double upperPercent) {
Range range = getRange();
double start = range.getLowerBound();
@@ -827,6 +834,7 @@
*
* @since 1.0.13
*/
+ @Override
public void pan(double percent) {
Range range = getRange();
double lower = range.getLowerBound();
@@ -866,6 +874,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -888,6 +897,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.base);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/LogarithmicAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -274,6 +274,7 @@
*
* @param range the new range.
*/
+ @Override
public void setRange(Range range) {
super.setRange(range); // call parent method
setupSmallLogFlag(); // setup flag based on bounds values
@@ -502,6 +503,7 @@
/**
* Rescales the axis to ensure that all data is visible.
*/
+ @Override
public void autoAdjustRange() {
Plot plot = getPlot();
@@ -621,6 +623,7 @@
*
* @return The Java2D coordinate.
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D plotArea,
RectangleEdge edge) {
@@ -663,6 +666,7 @@
*
* @return The data value.
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D plotArea,
RectangleEdge edge) {
@@ -697,6 +701,7 @@
* @param lowerPercent the new lower bound.
* @param upperPercent the new upper bound.
*/
+ @Override
public void zoomRange(double lowerPercent, double upperPercent) {
double startLog = switchedLog10(getRange().getLowerBound());
double lengthLog = switchedLog10(getRange().getUpperBound()) - startLog;
@@ -704,10 +709,8 @@
if (isInverted()) {
adjusted = new Range(
- switchedPow10(
- startLog + (lengthLog * (1 - upperPercent))),
- switchedPow10(
- startLog + (lengthLog * (1 - lowerPercent))));
+ switchedPow10(startLog + (lengthLog * (1 - upperPercent))),
+ switchedPow10(startLog + (lengthLog * (1 - lowerPercent))));
}
else {
adjusted = new Range(
@@ -728,9 +731,9 @@
*
* @return A list of ticks.
*/
- protected List refreshTicksHorizontal(Graphics2D g2,
- Rectangle2D dataArea,
- RectangleEdge edge) {
+ @Override
+ protected List refreshTicksHorizontal(Graphics2D g2, Rectangle2D dataArea,
+ RectangleEdge edge) {
List ticks = new java.util.ArrayList();
Range range = getRange();
@@ -833,8 +836,8 @@
if (currentTickValue >= lowerBoundVal - SMALL_LOG_VALUE) {
//tick value not below lowest data value
- TextAnchor anchor = null;
- TextAnchor rotationAnchor = null;
+ TextAnchor anchor;
+ TextAnchor rotationAnchor;
double angle = 0.0;
if (isVerticalTickLabels()) {
anchor = TextAnchor.CENTER_RIGHT;
@@ -877,9 +880,9 @@
*
* @return A list of ticks.
*/
- protected List refreshTicksVertical(Graphics2D g2,
- Rectangle2D dataArea,
- RectangleEdge edge) {
+ @Override
+ protected List refreshTicksVertical(Graphics2D g2, Rectangle2D dataArea,
+ RectangleEdge edge) {
List ticks = new java.util.ArrayList();
@@ -1023,8 +1026,8 @@
if (tickVal >= lowerBoundVal - SMALL_LOG_VALUE) {
//tick value not below lowest data value
- TextAnchor anchor = null;
- TextAnchor rotationAnchor = null;
+ TextAnchor anchor;
+ TextAnchor rotationAnchor;
double angle = 0.0;
if (isVerticalTickLabels()) {
if (edge == RectangleEdge.LEFT) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MarkerAxisBand.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -230,6 +230,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -264,6 +265,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 37;
result = 19 * result + this.font.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/ModuloAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -125,6 +125,7 @@
* This method should calculate a range that will show all the data values.
* For now, it just sets the axis range to the fixedRange.
*/
+ @Override
protected void autoAdjustRange() {
setRange(this.fixedRange, false, false);
}
@@ -138,9 +139,10 @@
*
* @return A Java2D coordinate.
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D area,
RectangleEdge edge) {
- double result = 0.0;
+ double result;
double v = mapValueToFixedRange(value);
if (this.displayStart < this.displayEnd) { // regular number axis
result = trans(v, area, edge);
@@ -296,8 +298,9 @@
*
* @return The Java2D coordinate.
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D area,
- RectangleEdge edge) {
+ RectangleEdge edge) {
double result = 0.0;
if (this.displayStart < this.displayEnd) { // regular number axis
result = super.java2DToValue(java2DValue, area, edge);
@@ -329,9 +332,8 @@
* @return The central value.
*/
private double getDisplayCentralValue() {
- return mapValueToFixedRange(
- this.displayStart + (getDisplayLength() / 2)
- );
+ return mapValueToFixedRange(this.displayStart
+ + (getDisplayLength() / 2));
}
/**
@@ -344,6 +346,7 @@
*
* @param percent the resize factor.
*/
+ @Override
public void resizeRange(double percent) {
resizeRange(percent, getDisplayCentralValue());
}
@@ -359,6 +362,7 @@
* @param percent the resize factor.
* @param anchorValue the new central value after the resize.
*/
+ @Override
public void resizeRange(double percent, double anchorValue) {
if (percent > 0.0) {
@@ -381,6 +385,7 @@
*
* @return The length in Java2D coordinates.
*/
+ @Override
public double lengthToJava2D(double length, Rectangle2D area,
RectangleEdge edge) {
double axisLength = 0.0;
@@ -391,7 +396,7 @@
axisLength = (this.fixedRange.getUpperBound() - this.displayStart)
+ (this.displayEnd - this.fixedRange.getLowerBound());
}
- double areaLength = 0.0;
+ double areaLength;
if (RectangleEdge.isLeftOrRight(edge)) {
areaLength = area.getHeight();
}
@@ -408,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/axis/MonthDateFormat.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MonthDateFormat.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/MonthDateFormat.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -196,6 +196,7 @@
*
* @return The formatted date.
*/
+ @Override
public StringBuffer format(Date date, StringBuffer toAppendTo,
FieldPosition fieldPosition) {
this.calendar.setTime(date);
@@ -215,6 +216,7 @@
*
* @return <code>null</code>, as this method has not been implemented.
*/
+ @Override
public Date parse(String source, ParsePosition pos) {
return null;
}
@@ -226,6 +228,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/axis/NumberAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -409,6 +409,7 @@
* Configures the axis to work with the specified plot. If the axis has
* auto-scaling, then sets the maximum and minimum values.
*/
+ @Override
public void configure() {
if (isAutoRange()) {
autoAdjustRange();
@@ -418,6 +419,7 @@
/**
* Rescales the axis to ensure that all data is visible.
*/
+ @Override
protected void autoAdjustRange() {
Plot plot = getPlot();
@@ -520,6 +522,7 @@
*
* @see #java2DToValue(double, Rectangle2D, RectangleEdge)
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D area,
RectangleEdge edge) {
@@ -560,6 +563,7 @@
*
* @see #valueToJava2D(double, Rectangle2D, RectangleEdge)
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D area,
RectangleEdge edge) {
@@ -642,11 +646,12 @@
*
* @return The axis state (never <code>null</code>).
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
- AxisState state = null;
+ AxisState state;
// if the axis is not visible, don't draw it...
if (!isVisible()) {
state = new AxisState(cursor);
@@ -1118,8 +1123,8 @@
* @param edge the location of the axis.
*
* @return A list of ticks.
- *
*/
+ @Override
public List refreshTicks(Graphics2D g2, AxisState state,
Rectangle2D dataArea, RectangleEdge edge) {
@@ -1338,6 +1343,7 @@
* @throws CloneNotSupportedException if some component of the axis does
* not support cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
NumberAxis clone = (NumberAxis) super.clone();
if (this.numberFormatOverride != null) {
@@ -1354,6 +1360,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1386,6 +1393,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberAxis3D.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -122,6 +122,7 @@
*
* @return The updated cursor value.
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnit.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnit.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/NumberTickUnit.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -110,6 +110,7 @@
*
* @return The formatted string.
*/
+ @Override
public String valueToString(double value) {
return this.formatter.format(value);
}
@@ -121,6 +122,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -143,6 +145,7 @@
*
* @return A string.
*/
+ @Override
public String toString() {
return "[size=" + this.valueToString(this.getSize()) + "]";
}
@@ -152,6 +155,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = 29 * result + (this.formatter != null
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxis.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxis.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxis.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -393,6 +393,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isMinorTickMarksVisible() {
return this.minorTickMarksVisible;
}
@@ -404,6 +405,7 @@
*
* @param visible the flag.
*/
+ @Override
public void setMinorTickMarksVisible(boolean visible) {
this.minorTickMarksVisible = visible;
fireChangeEvent();
@@ -482,6 +484,7 @@
*
* @return The length.
*/
+ @Override
public float getMinorTickMarkInsideLength() {
return this.minorTickMarkInsideLength;
}
@@ -492,6 +495,7 @@
*
* @param length the length.
*/
+ @Override
public void setMinorTickMarkInsideLength(float length) {
this.minorTickMarkInsideLength = length;
fireChangeEvent();
@@ -502,6 +506,7 @@
*
* @return The length.
*/
+ @Override
public float getMinorTickMarkOutsideLength() {
return this.minorTickMarkOutsideLength;
}
@@ -512,6 +517,7 @@
*
* @param length the length.
*/
+ @Override
public void setMinorTickMarkOutsideLength(float length) {
this.minorTickMarkOutsideLength = length;
fireChangeEvent();
@@ -548,6 +554,7 @@
* @param notify a flag that controls whether or not listeners are
* notified.
*/
+ @Override
public void setRange(Range range, boolean turnOffAutoRange,
boolean notify) {
long upper = Math.round(range.getUpperBound());
@@ -565,6 +572,7 @@
* Configures the axis to work with the current plot. Override this method
* to perform any special processing (such as auto-rescaling).
*/
+ @Override
public void configure() {
if (this.isAutoRange()) {
autoAdjustRange();
@@ -584,6 +592,7 @@
* @return The space required to draw the axis (including pre-reserved
* space).
*/
+ @Override
public AxisSpace reserveSpace(Graphics2D g2, Plot plot,
Rectangle2D plotArea, RectangleEdge edge, AxisSpace space) {
// create a new space object if one wasn't supplied...
@@ -650,6 +659,7 @@
*
* @return The axis state (never <code>null</code>).
*/
+ @Override
public AxisState draw(Graphics2D g2, double cursor, Rectangle2D plotArea,
Rectangle2D dataArea, RectangleEdge edge,
PlotRenderingInfo plotState) {
@@ -952,6 +962,7 @@
*
* @return The list of ticks.
*/
+ @Override
public List refreshTicks(Graphics2D g2, AxisState state,
Rectangle2D dataArea, RectangleEdge edge) {
return Collections.EMPTY_LIST;
@@ -969,6 +980,7 @@
*
* @return The Java2D coordinate.
*/
+ @Override
public double valueToJava2D(double value, Rectangle2D area,
RectangleEdge edge) {
@@ -1013,6 +1025,7 @@
*
* @return The data value.
*/
+ @Override
public double java2DToValue(double java2DValue, Rectangle2D area,
RectangleEdge edge) {
@@ -1043,6 +1056,7 @@
/**
* Rescales the axis to ensure that all data is visible.
*/
+ @Override
protected void autoAdjustRange() {
Plot plot = getPlot();
@@ -1076,6 +1090,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1128,6 +1143,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -1140,6 +1156,7 @@
* @throws CloneNotSupportedException this class is cloneable, but
* subclasses may not be.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
PeriodAxis clone = (PeriodAxis) super.clone();
clone.timeZone = (TimeZone) this.timeZone.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -287,6 +287,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -327,6 +328,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 41;
result = result + 37 * this.periodClass.hashCode();
@@ -341,6 +343,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
PeriodAxisLabelInfo clone = (PeriodAxisLabelInfo) super.clone();
return clone;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/QuarterDateFormat.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/QuarterDateFormat.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/QuarterDateFormat.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -149,6 +149,7 @@
*
* @return The formatted date.
*/
+ @Override
public StringBuffer format(Date date, StringBuffer toAppendTo,
FieldPosition fieldPosition) {
this.calendar.setTime(date);
@@ -176,6 +177,7 @@
*
* @return <code>null</code>, as this method has not been implemented.
*/
+ @Override
public Date parse(String source, ParsePosition pos) {
return null;
}
@@ -187,6 +189,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/axis/SegmentedTimeline.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/SegmentedTimeline.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -589,6 +589,7 @@
*
* @return The timeline value.
*/
+ @Override
public long toTimelineValue(long millisecond) {
long result;
@@ -652,6 +653,7 @@
*
* @return The timeline value (in milliseconds).
*/
+ @Override
public long toTimelineValue(Date date) {
return toTimelineValue(getTime(date));
//return toTimelineValue(dateDomainValue.getTime());
@@ -664,6 +666,7 @@
*
* @return The domain value (in milliseconds).
*/
+ @Override
public long toMillisecond(long timelineValue) {
// calculate the result as if no exceptions
@@ -741,6 +744,7 @@
*
* @return <code>true</code> if value is contained in the timeline.
*/
+ @Override
public boolean containsDomainValue(long millisecond) {
Segment segment = getSegment(millisecond);
return segment.inIncludeSegments();
@@ -753,6 +757,7 @@
*
* @return <code>true</code> if value is contained in the timeline
*/
+ @Override
public boolean containsDomainValue(Date date) {
return containsDomainValue(getTime(date));
}
@@ -767,8 +772,9 @@
*
* @return <code>true</code> if the range is contained in the timeline
*/
+ @Override
public boolean containsDomainRange(long domainValueStart,
- long domainValueEnd) {
+ long domainValueEnd) {
if (domainValueEnd < domainValueStart) {
throw new IllegalArgumentException(
"domainValueEnd (" + domainValueEnd
@@ -799,8 +805,9 @@
*
* @return <code>true</code> if the range is contained in the timeline
*/
+ @Override
public boolean containsDomainRange(Date dateDomainValueStart,
- Date dateDomainValueEnd) {
+ Date dateDomainValueEnd) {
return containsDomainRange(getTime(dateDomainValueStart),
getTime(dateDomainValueEnd));
}
@@ -1096,6 +1103,7 @@
*
* @return <code>true</code> or <code>false</code>
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof SegmentedTimeline) {
SegmentedTimeline other = (SegmentedTimeline) o;
@@ -1118,6 +1126,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 19;
result = 37 * result
@@ -1216,6 +1225,7 @@
*
* @throws CloneNotSupportedException ??.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
SegmentedTimeline clone = (SegmentedTimeline) super.clone();
return clone;
@@ -1442,6 +1452,7 @@
*
* @return <code>true</code> if we are the same segment
*/
+ @Override
public boolean equals(Object object) {
if (object instanceof Segment) {
Segment other = (Segment) object;
@@ -1479,6 +1490,7 @@
* @return -1: this < object, 0: this.equal(object) and
* +1: this > object
*/
+ @Override
public int compareTo(Object object) {
Segment other = (Segment) object;
if (this.before(other)) {
@@ -1651,6 +1663,7 @@
*
* @return The segment count.
*/
+ @Override
public long getSegmentCount() {
return this.segmentCount;
}
@@ -1664,6 +1677,7 @@
*
* @return The intersection.
*/
+ @Override
public Segment intersect(long from, long to) {
// Segment fromSegment = getSegment(from);
@@ -1690,6 +1704,7 @@
*
* @return <code>true</code> or </code>false</code>.
*/
+ @Override
public boolean inIncludeSegments() {
for (Segment segment = getSegment(this.segmentStart);
segment.getSegmentStart() < this.segmentEnd;
@@ -1706,6 +1721,7 @@
*
* @return <code>true</code> or </code>false</code>.
*/
+ @Override
public boolean inExcludeSegments() {
for (Segment segment = getSegment(this.segmentStart);
segment.getSegmentStart() < this.segmentEnd;
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java 2013-11-21 16:36:50 UTC (rev 2974)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/axis/StandardTickUnitSource.java 2013-11-21 16:37:07 UTC (rev 2975)
@@ -69,6 +69,7 @@
*
* @return A tick unit that is larger than the supplied unit.
*/
+ @Override
public TickUnit getLargerTickUnit(TickUnit unit) {
double x = unit.getSize();
double log = Math.log(x) / LOG_10_VALUE;
@@ -85,6 +86,7 @@
*
* @return A unit from the collection.
*/
+ @Override
public TickUnit getCeilingTickUnit(TickUnit unit) {
return getLargerTickUnit(unit);
}
@@ -97,6 +99,7 @@
*
* @return A unit from the collection.
*/
+ @Override
public TickUnit getCeilingTickUnit(double size) {
double log = Math.log(size) / LOG_10_VALUE;
double higher = Math.ceil(log);
@@ -111,6 +114,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
...
[truncated message content] |
|
From: <mu...@us...> - 2013-11-21 16:36:53
|
Revision: 2974
http://sourceforge.net/p/jfreechart/code/2974
Author: mungady
Date: 2013-11-21 16:36:50 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Added @Override tags.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryTextAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/TextAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDataImageAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDrawableAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYImageAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYLineAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPointerAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPolygonAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYShapeAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTextAnnotation.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -27,10 +27,10 @@
* -----------------------
* AbstractAnnotation.java
* -----------------------
- * (C) Copyright 2009, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2009-2013, by Object Refinery Limited and Contributors.
*
* Original Author: Peter Kolb (see patch 2809117);
- * Contributor(s): ;
+ * Contributor(s): -;
*
* Changes:
* --------
@@ -86,6 +86,7 @@
*
* @see #removeChangeListener(AnnotationChangeListener)
*/
+ @Override
public void addChangeListener(AnnotationChangeListener listener) {
this.listenerList.add(AnnotationChangeListener.class, listener);
}
@@ -98,6 +99,7 @@
*
* @see #addChangeListener(AnnotationChangeListener)
*/
+ @Override
public void removeChangeListener(AnnotationChangeListener listener) {
this.listenerList.remove(AnnotationChangeListener.class, listener);
}
@@ -188,6 +190,7 @@
* @throws CloneNotSupportedException if the annotation does not support
* cloning.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
AbstractAnnotation clone = (AbstractAnnotation) super.clone();
clone.listenerList = new EventListenerList();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/AbstractXYAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -27,7 +27,7 @@
* -------------------------
* AbstractXYAnnotation.java
* -------------------------
- * (C) Copyright 2004-2009, by Object Refinery Limited.
+ * (C) Copyright 2004-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): Peter Kolb (patch 2809117);
@@ -135,6 +135,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public abstract void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -172,6 +173,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -194,6 +196,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
if (this.toolTipText != null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryLineAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -284,6 +284,7 @@
* @param domainAxis the domain axis.
* @param rangeAxis the range axis.
*/
+ @Override
public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea,
CategoryAxis domainAxis, ValueAxis rangeAxis) {
@@ -334,6 +335,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -368,6 +370,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + this.category1.hashCode();
@@ -389,6 +392,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -365,6 +365,7 @@
* @param domainAxis the domain axis.
* @param rangeAxis the range axis.
*/
+ @Override
public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea,
CategoryAxis domainAxis, ValueAxis rangeAxis) {
@@ -435,6 +436,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -479,6 +481,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
long temp = Double.doubleToLongBits(this.angle);
@@ -505,6 +508,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryTextAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryTextAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/CategoryTextAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -186,8 +186,9 @@
* @param domainAxis the domain axis.
* @param rangeAxis the range axis.
*/
+ @Override
public void draw(Graphics2D g2, CategoryPlot plot, Rectangle2D dataArea,
- CategoryAxis domainAxis, ValueAxis rangeAxis) {
+ CategoryAxis domainAxis, ValueAxis rangeAxis) {
CategoryDataset dataset = plot.getDataset();
int catIndex = dataset.getColumnIndex(this.category);
@@ -229,6 +230,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -257,6 +259,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
result = 37 * result + this.category.hashCode();
@@ -274,6 +277,7 @@
* @throws CloneNotSupportedException this class will not throw this
* exception, but subclasses (if any) might.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/TextAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/TextAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/TextAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -287,6 +287,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -326,6 +327,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + this.font.hashCode();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYBoxAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -27,7 +27,7 @@
* --------------------
* XYBoxAnnotation.java
* --------------------
- * (C) Copyright 2005-2009, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2005-2013, by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): Peter Kolb (see patch 2809117);
@@ -159,6 +159,7 @@
* @param rendererIndex the renderer index.
* @param info the plot rendering info.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex, PlotRenderingInfo info) {
@@ -207,6 +208,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -249,6 +251,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
long temp;
@@ -271,6 +274,7 @@
* @throws CloneNotSupportedException not thrown by this class, but may be
* by subclasses.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDataImageAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDataImageAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDataImageAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -197,6 +197,7 @@
*
* @since 1.0.13
*/
+ @Override
public boolean getIncludeInDataBounds() {
return this.includeInDataBounds;
}
@@ -208,6 +209,7 @@
*
* @since 1.0.13
*/
+ @Override
public Range getXRange() {
return new Range(this.x, this.x + this.w);
}
@@ -219,6 +221,7 @@
*
* @since 1.0.13
*/
+ @Override
public Range getYRange() {
return new Range(this.y, this.y + this.h);
}
@@ -237,6 +240,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -289,6 +293,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -328,6 +333,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.image.hashCode();
}
@@ -339,6 +345,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDrawableAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDrawableAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYDrawableAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -142,6 +142,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -189,6 +190,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) { // simple case
@@ -230,6 +232,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
long temp;
@@ -251,6 +254,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYImageAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYImageAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYImageAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -190,6 +190,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -241,6 +242,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -274,6 +276,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
return this.image.hashCode();
}
@@ -285,6 +288,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYLineAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYLineAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYLineAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -158,6 +158,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -217,6 +218,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -255,6 +257,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result;
long temp;
@@ -276,6 +279,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPointerAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPointerAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPointerAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -374,6 +374,7 @@
* @param rendererIndex the renderer index.
* @param info the plot rendering info.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis, int rendererIndex,
PlotRenderingInfo info) {
@@ -459,6 +460,7 @@
*
* @return <code>true</code> or <code>false</code>.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -499,6 +501,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = super.hashCode();
long temp = Double.doubleToLongBits(this.angle);
@@ -525,6 +528,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPolygonAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPolygonAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYPolygonAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -204,6 +204,7 @@
* @param rendererIndex the renderer index.
* @param info the plot rendering info.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex, PlotRenderingInfo info) {
@@ -268,6 +269,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -301,6 +303,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + HashUtilities.hashCodeForDoubleArray(
@@ -322,6 +325,7 @@
* @throws CloneNotSupportedException not thrown by this class, but may be
* by subclasses.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYShapeAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYShapeAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYShapeAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -157,6 +157,7 @@
* @param rendererIndex the renderer index.
* @param info the plot rendering info.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex,
@@ -221,6 +222,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -254,6 +256,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + this.shape.hashCode();
@@ -273,6 +276,7 @@
*
* @throws CloneNotSupportedException ???.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTextAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTextAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTextAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -512,6 +512,7 @@
* @param info an optional info object that will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex, PlotRenderingInfo info) {
@@ -565,6 +566,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -617,6 +619,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = 37 * result + this.text.hashCode();
@@ -640,6 +643,7 @@
*
* @throws CloneNotSupportedException if the annotation can't be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java 2013-11-21 15:41:08 UTC (rev 2973)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/annotations/XYTitleAnnotation.java 2013-11-21 16:36:50 UTC (rev 2974)
@@ -241,6 +241,7 @@
* @param info if supplied, this info object will be populated with
* entity information.
*/
+ @Override
public void draw(Graphics2D g2, XYPlot plot, Rectangle2D dataArea,
ValueAxis domainAxis, ValueAxis rangeAxis,
int rendererIndex, PlotRenderingInfo info) {
@@ -334,6 +335,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -371,6 +373,7 @@
*
* @return A hash code.
*/
+ @Override
public int hashCode() {
int result = 193;
result = HashUtilities.hashCode(result, this.anchor);
@@ -390,6 +393,7 @@
*
* @throws CloneNotSupportedException if the annotation can't 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-21 15:41:11
|
Revision: 2973
http://sourceforge.net/p/jfreechart/code/2973
Author: mungady
Date: 2013-11-21 15:41:08 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
Added @Override tags.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartRenderingInfo.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,7 +27,7 @@
* -----------------------
* ChartRenderingInfo.java
* -----------------------
- * (C) Copyright 2002-2008, by Object Refinery Limited.
+ * (C) Copyright 2002-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -187,6 +187,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -214,6 +215,7 @@
*
* @throws CloneNotSupportedException if the object cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ChartRenderingInfo clone = (ChartRenderingInfo) super.clone();
if (this.chartArea != null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ChartTransferable.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -24,10 +24,10 @@
* [Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.]
*
- * -------------------
- * ChartSelection.java
- * -------------------
- * (C) Copyright 2009, by Object Refinery Limited.
+ * ----------------------
+ * ChartTransferable.java
+ * ----------------------
+ * (C) Copyright 2009-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -172,6 +172,7 @@
*
* @return The data flavors supported.
*/
+ @Override
public DataFlavor[] getTransferDataFlavors() {
return new DataFlavor[] {this.imageFlavor};
}
@@ -183,6 +184,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean isDataFlavorSupported(DataFlavor flavor) {
return this.imageFlavor.equals(flavor);
}
@@ -197,6 +199,7 @@
* @throws java.awt.datatransfer.UnsupportedFlavorException
* @throws java.io.IOException
*/
+ @Override
public Object getTransferData(DataFlavor flavor)
throws UnsupportedFlavorException, IOException {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/ClipPath.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,7 +27,7 @@
* -------------
* ClipPath.java
* -------------
- * (C) Copyright 2003-2008, by David M. O'Donnell and Contributors.
+ * (C) Copyright 2003-2013, by David M. O'Donnell and Contributors.
*
* Original Author: David M. O'Donnell;
* Contributor(s): David Gilbert (for Object Refinery Limited);
@@ -429,6 +429,7 @@
*
* @throws CloneNotSupportedException if cloning is not supported.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
ClipPath clone = (ClipPath) super.clone();
clone.xValue = (double[]) this.xValue.clone();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItem.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -1002,6 +1002,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1083,6 +1084,7 @@
*
* @since 1.0.10
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
LegendItem clone = (LegendItem) super.clone();
if (this.seriesKey instanceof PublicCloneable) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendItemCollection.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,7 +27,7 @@
* -------------------------
* LegendItemCollection.java
* -------------------------
- * (C) Copyright 2002-2009, by Object Refinery Limited.
+ * (C) Copyright 2002-2013, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -124,6 +124,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -146,6 +147,7 @@
* @throws CloneNotSupportedException if an item in the collection is not
* cloneable.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
LegendItemCollection clone = (LegendItemCollection) super.clone();
clone.items = (List) ObjectUtilities.deepClone(this.items);
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/LegendRenderingOrder.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,10 +27,10 @@
* -------------------------
* LegendRenderingOrder.java
* -------------------------
- * (C) Copyright 2004-2008, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2004-2013, by Object Refinery Limited and Contributors.
*
* Original Author: Angel;
- * Contributor(s): -;
+ * Contributor(s): David Gilbert (for Object Refinery Limited);
*
* Changes
* -------
@@ -76,6 +76,7 @@
*
* @return The string.
*/
+ @Override
public String toString() {
return this.name;
}
@@ -88,6 +89,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/MouseWheelHandler.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/MouseWheelHandler.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,7 +27,7 @@
* ----------------------
* MouseWheelHandler.java
* ----------------------
- * (C) Copyright 2009 by Object Refinery Limited and Contributors.
+ * (C) Copyright 2009-2013 by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): Ulrich Voigt - patch 2686040;
@@ -109,6 +109,7 @@
*
* @param e the event.
*/
+ @Override
public void mouseWheelMoved(MouseWheelEvent e) {
JFreeChart chart = this.chartPanel.getChart();
if (chart == null) {
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PaintMap.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -140,6 +140,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -171,6 +172,7 @@
*
* @throws CloneNotSupportedException if any key is not cloneable.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
// TODO: I think we need to make sure the keys are actually cloned,
// whereas the paint instances are always immutable so they're OK
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/PolarChartPanel.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -27,7 +27,7 @@
* --------------------
* PolarChartPanel.java
* --------------------
- * (C) Copyright 2004-2008, by Solution Engineering, Inc. and Contributors.
+ * (C) Copyright 2004-2013, by Solution Engineering, Inc. and Contributors.
*
* Original Author: Daniel Bridenbecker, Solution Engineering, Inc.;
* Contributor(s): David Gilbert (for Object Refinery Limited);
@@ -124,6 +124,7 @@
*
* @param chart The chart.
*/
+ @Override
public void setChart(JFreeChart chart) {
checkChart(chart);
super.setChart(chart);
@@ -139,10 +140,9 @@
*
* @return The popup menu.
*/
- protected JPopupMenu createPopupMenu(boolean properties,
- boolean save,
- boolean print,
- boolean zoom) {
+ @Override
+ protected JPopupMenu createPopupMenu(boolean properties, boolean save,
+ boolean print, boolean zoom) {
JPopupMenu result = super.createPopupMenu(properties, save, print, zoom);
int zoomInIndex = getPopupMenuItem(result,
@@ -197,6 +197,7 @@
*
* @param event the event.
*/
+ @Override
public void actionPerformed(ActionEvent event) {
String command = event.getActionCommand();
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StandardChartTheme.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -303,6 +303,7 @@
*/
public static ChartTheme createLegacyTheme() {
StandardChartTheme theme = new StandardChartTheme("Legacy") {
+ @Override
public void apply(JFreeChart chart) {
// do nothing at all
}
@@ -1097,6 +1098,7 @@
*
* @param chart the chart (<code>null</code> not permitted).
*/
+ @Override
public void apply(JFreeChart chart) {
ParamChecks.nullNotPermitted(chart, "chart");
TextTitle title = chart.getTitle();
@@ -1650,6 +1652,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -1770,6 +1773,7 @@
*
* @throws CloneNotSupportedException if the theme cannot be cloned.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2013-11-21 11:57:19 UTC (rev 2972)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/StrokeMap.java 2013-11-21 15:41:08 UTC (rev 2973)
@@ -135,6 +135,7 @@
*
* @return A boolean.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -166,6 +167,7 @@
*
* @throws CloneNotSupportedException if any key is not cloneable.
*/
+ @Override
public Object clone() throws CloneNotSupportedException {
// TODO: I think we need to make sure the keys are actually cloned,
// whereas the stroke instances are always immutable so they're OK
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.
