From: David G. <mu...@us...> - 2011-11-03 20:53:49
|
Update of /cvsroot/jfreechart/jcommon/source/org/jfree/util In directory vz-cvs-3.sog:/tmp/cvs-serv28052/source/org/jfree/util Modified Files: PaintList.java Log Message: Fixed PaintList.equals() method. Index: PaintList.java =================================================================== RCS file: /cvsroot/jfreechart/jcommon/source/org/jfree/util/PaintList.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PaintList.java 18 Oct 2005 13:24:19 -0000 1.5 --- PaintList.java 3 Nov 2011 20:53:47 -0000 1.6 *************** *** 3,7 **** * ======================================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jcommon/index.html --- 3,7 ---- * ======================================================================== * ! * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jcommon/index.html *************** *** 28,35 **** * PaintList.java * -------------- ! * (C) Copyright 2003, 2004, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); ! * Contributor(s): -; * * $Id$ --- 28,35 ---- * PaintList.java * -------------- ! * (C) Copyright 2003-2011, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); ! * Contributor(s): Ryan Hirrlinger (Patch 2999449); * * $Id$ *************** *** 39,42 **** --- 39,43 ---- * 13-Aug-2003 : Version 1 (DG); * 27-Jun-2005 : Fixed equals() method to handle GradientPaint (DG); + * 03-Nov-2011 : Fix equals() method - patch 2999449 by Ryan Hirrlinger (DG); * */ *************** *** 53,61 **** /** * A table of {@link Paint} objects. - * - * @author David Gilbert */ public class PaintList extends AbstractObjectList { /** * Creates a new list. --- 54,62 ---- /** * A table of {@link Paint} objects. */ public class PaintList extends AbstractObjectList { + private static final long serialVersionUID = -708669381577938219L; + /** * Creates a new list. *************** *** 100,111 **** return true; } ! if (obj instanceof PaintList) { ! PaintList that = (PaintList) obj; ! int listSize = size(); ! for (int i = 0; i < listSize; i++) { ! if (!PaintUtilities.equal(getPaint(i), that.getPaint(i))) { ! return false; ! } ! } } return true; --- 101,113 ---- return true; } ! if (!(obj instanceof PaintList)) { ! return false; ! } ! PaintList that = (PaintList) obj; ! int listSize = size(); ! for (int i = 0; i < listSize; i++) { ! if (!PaintUtilities.equal(getPaint(i), that.getPaint(i))) { ! return false; ! } } return true; |