From: <mu...@us...> - 2008-03-31 19:15:41
|
Revision: 795 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=795&view=rev Author: mungady Date: 2008-03-31 12:15:38 -0700 (Mon, 31 Mar 2008) Log Message: ----------- 2008-03-31 David Gilbert <dav...@ob...> * source/org/jfree/chart/labels/HighLowItemLabelGenerator.java: (hashCode): Implemented, * source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java: Likewise, * source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java: Likewise, * source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java: Likewise, * source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java: Likewise. Modified Paths: -------------- trunk/ChangeLog trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java trunk/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java trunk/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/ChangeLog 2008-03-31 19:15:38 UTC (rev 795) @@ -1,5 +1,18 @@ 2008-03-31 David Gilbert <dav...@ob...> + * source/org/jfree/chart/labels/HighLowItemLabelGenerator.java: + (hashCode): Implemented, + * source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java: + Likewise, + * source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java: + Likewise, + * source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java: + Likewise, + * source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java: + Likewise. + +2008-03-31 David Gilbert <dav...@ob...> + * source/org/jfree/chart/plot/CombinedDomainCategoryPlot.java (getSubplots): Return null if this.subplots is null, * source/org/jfree/chart/plot/CombinedDomainXYPlot.java: Likewise, Modified: trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java =================================================================== --- trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java 2008-03-31 19:15:38 UTC (rev 795) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------------------ * HighLowItemLabelGenerator.java * ------------------------------ - * (C) Copyright 2001-2007, by Object Refinery Limited. + * (C) Copyright 2001-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): David Basten; @@ -47,6 +47,7 @@ * getYValue() (DG); * 20-Apr-2005 : Renamed XYLabelGenerator --> XYItemLabelGenerator (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); + * 31-Mar-2008 : Added hashCode() method to appease FindBugs (DG); * */ @@ -57,6 +58,7 @@ import java.text.NumberFormat; import java.util.Date; +import org.jfree.chart.util.HashUtilities; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.xy.OHLCDataset; import org.jfree.data.xy.XYDataset; @@ -66,10 +68,7 @@ * {@link OHLCDataset}. */ public class HighLowItemLabelGenerator implements XYItemLabelGenerator, - XYToolTipGenerator, - Cloneable, - PublicCloneable, - Serializable { + XYToolTipGenerator, Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 5617111754832211830L; @@ -100,13 +99,11 @@ NumberFormat numberFormatter) { if (dateFormatter == null) { throw new IllegalArgumentException( - "Null 'dateFormatter' argument." - ); + "Null 'dateFormatter' argument."); } if (numberFormatter == null) { throw new IllegalArgumentException( - "Null 'numberFormatter' argument." - ); + "Null 'numberFormatter' argument."); } this.dateFormatter = dateFormatter; this.numberFormatter = numberFormatter; @@ -223,4 +220,16 @@ return true; } + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 127; + result = HashUtilities.hashCode(result, this.dateFormatter); + result = HashUtilities.hashCode(result, this.numberFormatter); + return result; + } + } Modified: trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java =================================================================== --- trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java 2008-03-31 19:15:38 UTC (rev 795) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------------------- * MultipleXYSeriesLabelGenerator.java * ----------------------------------- - * (C) Copyright 2004, 2005, 2007, by Object Refinery Limited. + * (C) Copyright 2004-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -38,6 +38,7 @@ * 18-Apr-2005 : Use StringBuffer (DG); * 20-Feb-2007 : Fixed for equals() and cloning() (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); + * 31-Mar-2008 : Added hashCode() method to appease FindBugs (DG); * */ @@ -51,6 +52,7 @@ import java.util.Map; import java.util.Set; +import org.jfree.chart.util.HashUtilities; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.xy.XYDataset; @@ -222,5 +224,18 @@ } return true; } + + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 127; + result = HashUtilities.hashCode(result, this.formatPattern); + result = HashUtilities.hashCode(result, this.additionalFormatPattern); + result = HashUtilities.hashCode(result, this.seriesLabelLists); + return result; + } } Modified: trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java =================================================================== --- trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java 2008-03-31 19:15:38 UTC (rev 795) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------------------------- * StandardCategorySeriesLabelGenerator.java * ----------------------------------------- - * (C) Copyright 2005-2007, by Object Refinery Limited. + * (C) Copyright 2005-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -38,6 +38,7 @@ * ------------- JFREECHART 1.0.x --------------------------------------------- * 03-May-2006 : Fixed equals() method (bug 1481102) (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); + * 31-Mar-2008 : Added hashCode() method to appease FindBugs (DG); * */ @@ -46,6 +47,7 @@ import java.io.Serializable; import java.text.MessageFormat; +import org.jfree.chart.util.HashUtilities; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.category.CategoryDataset; @@ -149,5 +151,16 @@ } return true; } + + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 127; + result = HashUtilities.hashCode(result, this.formatPattern); + return result; + } } Modified: trunk/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java =================================================================== --- trunk/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java 2008-03-31 19:15:38 UTC (rev 795) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------------------- * StandardXYSeriesLabelGenerator.java * ----------------------------------- - * (C) Copyright 2004-2007, by Object Refinery Limited. + * (C) Copyright 2004-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -38,6 +38,7 @@ * ------------- JFREECHART 1.0.x --------------------------------------------- * 24-Nov-2006 : Fixed equals() method and updated API docs (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); + * 31-Mar-2008 : Added hashCode() method to appease FindBugs (DG); * */ @@ -46,6 +47,7 @@ import java.io.Serializable; import java.text.MessageFormat; +import org.jfree.chart.util.HashUtilities; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.xy.XYDataset; @@ -57,9 +59,7 @@ * this for the sake of backward compatibility. */ public class StandardXYSeriesLabelGenerator implements XYSeriesLabelGenerator, - Cloneable, - PublicCloneable, - Serializable { + Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 1916017081848400024L; @@ -158,5 +158,16 @@ } return true; } + + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 127; + result = HashUtilities.hashCode(result, this.formatPattern); + return result; + } } Modified: trunk/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java =================================================================== --- trunk/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2008-03-31 19:01:00 UTC (rev 794) +++ trunk/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java 2008-03-31 19:15:38 UTC (rev 795) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------------------- * SymbolicXYItemLabelGenerator.java * --------------------------------- - * (C) Copyright 2001-2007, by Anthony Boulestreau and Contributors. + * (C) Copyright 2001-2008, by Anthony Boulestreau and Contributors. * * Original Author: Anthony Boulestreau; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -44,6 +44,7 @@ * 20-Apr-2005 : Renamed XYLabelGenerator --> XYItemLabelGenerator (DG); * 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG); * 21-Jun-2007 : Removed JCommon dependencies (DG); + * 31-Mar-2008 : Added hashCode() method to appease FindBugs (DG); * */ @@ -63,10 +64,7 @@ * {@link XYDataset}. */ public class SymbolicXYItemLabelGenerator implements XYItemLabelGenerator, - XYToolTipGenerator, - Cloneable, - PublicCloneable, - Serializable { + XYToolTipGenerator, Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 3963400354475494395L; @@ -165,4 +163,14 @@ return false; } + /** + * Returns a hash code for this instance. + * + * @return A hash code. + */ + public int hashCode() { + int result = 127; + return result; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |