From: <mu...@us...> - 2008-07-22 08:19:35
|
Revision: 1321 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1321&view=rev Author: mungady Date: 2008-07-22 08:19:32 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValues2DDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValuesDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValueDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValues2DDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValuesDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/PieDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DatasetGroup.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------- * DatasetGroup.java * ----------------- - * (C) Copyright 2002-2007, by Object Refinery Limited. + * (C) Copyright 2002-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,13 +49,13 @@ * purpose). */ public class DatasetGroup implements Cloneable, Serializable { - + /** For serialization. */ private static final long serialVersionUID = -3640642179674185688L; - + /** The group id. */ private String id; - + /** * Constructs a new group. */ @@ -66,55 +66,55 @@ /** * Creates a new group with the specified id. - * + * * @param id the identification for the group. */ public DatasetGroup(String id) { if (id == null) { - throw new IllegalArgumentException("Null 'id' argument."); + throw new IllegalArgumentException("Null 'id' argument."); } - this.id = id; + this.id = id; } - + /** * Returns the identification string for this group. - * + * * @return The identification string. */ public String getID() { - return this.id; + return this.id; } - + /** * Clones the group. - * + * * @return A clone. - * + * * @throws CloneNotSupportedException not by this class. */ public Object clone() throws CloneNotSupportedException { - return super.clone(); + return super.clone(); } - + /** * Tests this instance for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof DatasetGroup)) { - return false; + return false; } DatasetGroup that = (DatasetGroup) obj; if (!this.id.equals(that.id)) { - return false; + return false; } return true; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValueDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------------- * DefaultKeyedValueDataset.java * ----------------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -51,12 +51,11 @@ * A default implementation of the {@link KeyedValueDataset} interface. */ public class DefaultKeyedValueDataset extends AbstractDataset - implements KeyedValueDataset, - Serializable { + implements KeyedValueDataset, Serializable { /** For serialization. */ private static final long serialVersionUID = -8149484339560406750L; - + /** Storage for the data. */ private KeyedValue data; @@ -78,7 +77,7 @@ } /** - * Creates a new dataset that uses the data from a {@link KeyedValue} + * Creates a new dataset that uses the data from a {@link KeyedValue} * instance. * * @param data the data (<code>null</code> permitted). @@ -88,7 +87,7 @@ } /** - * Returns the key associated with the value, or <code>null</code> if the + * Returns the key associated with the value, or <code>null</code> if the * dataset has no data item. * * @return The key. @@ -127,7 +126,7 @@ } /** - * Sets the value for the dataset and sends a {@link DatasetChangeEvent} to + * Sets the value for the dataset and sends a {@link DatasetChangeEvent} to * all registered listeners. * * @param key the key. @@ -171,7 +170,7 @@ /** * Returns a hash code. - * + * * @return A hash code. */ public int hashCode() { @@ -180,16 +179,16 @@ /** * Creates a clone of the dataset. - * + * * @return A clone. - * - * @throws CloneNotSupportedException This class will not throw this + * + * @throws CloneNotSupportedException This class will not throw this * exception, but subclasses (if any) might. */ public Object clone() throws CloneNotSupportedException { - DefaultKeyedValueDataset clone + DefaultKeyedValueDataset clone = (DefaultKeyedValueDataset) super.clone(); - return clone; + return clone; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValues2DDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValues2DDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValues2DDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * -------------------------------- @@ -35,7 +35,7 @@ * Changes * ------- * 13-Mar-2003 : Version 1 (copied from DefaultCategoryDataset) (DG); - * 23-Apr-2003 : Moved implementation into the DefaultCategoryDataset + * 23-Apr-2003 : Moved implementation into the DefaultCategoryDataset * class (DG); * */ @@ -51,12 +51,11 @@ * */ public class DefaultKeyedValues2DDataset extends DefaultCategoryDataset - implements KeyedValues2DDataset, - Serializable { + implements KeyedValues2DDataset, Serializable { /** For serialization. */ private static final long serialVersionUID = 4288210771905990424L; - + // no new methods - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValuesDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValuesDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultKeyedValuesDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------------ * DefaultKeyedValuesDataset.java * ------------------------------ - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -45,12 +45,12 @@ * A default implementation of the {@link KeyedValuesDataset} interface. * This is an alias for {@link DefaultPieDataset}. */ -public class DefaultKeyedValuesDataset extends DefaultPieDataset +public class DefaultKeyedValuesDataset extends DefaultPieDataset implements KeyedValuesDataset { /** For serialization. */ private static final long serialVersionUID = 306264413152815781L; - + // no new methods - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultPieDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -6,22 +6,22 @@ * * Project Info: http://www.jfree.org/jfreechart/index.html * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- @@ -36,9 +36,9 @@ * ------- * 17-Nov-2001 : Version 1 (DG); * 22-Jan-2002 : Removed legend methods from dataset implementations (DG); - * 07-Apr-2002 : Modified implementation to guarantee data sequence to remain + * 07-Apr-2002 : Modified implementation to guarantee data sequence to remain * in the order categories are added (oldman); - * 23-Oct-2002 : Added getCategory(int) method and getItemCount() method, in + * 23-Oct-2002 : Added getCategory(int) method and getItemCount() method, in * line with changes to the PieDataset interface (DG); * 04-Feb-2003 : Changed underlying data storage to DefaultKeyedValues (DG); * 04-Mar-2003 : Inserted DefaultKeyedValuesDataset class into hierarchy (DG); @@ -47,11 +47,11 @@ * 03-Mar-2005 : Implemented PublicCloneable (DG); * 29-Jun-2005 : Added remove() method (DG); * ------------- JFREECHART 1.0.0 --------------------------------------------- - * 31-Jul-2006 : Added a clear() method to clear all values from the + * 31-Jul-2006 : Added a clear() method to clear all values from the * dataset (DG); * 28-Sep-2006 : Added sortByKeys() and sortByValues() methods (DG); * 30-Apr-2007 : Added new insertValues() methods (DG); - * + * */ package org.jfree.data.general; @@ -70,13 +70,11 @@ * A default implementation of the {@link PieDataset} interface. */ public class DefaultPieDataset extends AbstractDataset - implements PieDataset, - Cloneable, PublicCloneable, - Serializable { + implements PieDataset, Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 2904745139106540618L; - + /** Storage for the data. */ private DefaultKeyedValues data; @@ -88,14 +86,14 @@ } /** - * Creates a new dataset by copying data from a {@link KeyedValues} + * Creates a new dataset by copying data from a {@link KeyedValues} * instance. * * @param data the data (<code>null</code> not permitted). */ public DefaultPieDataset(KeyedValues data) { if (data == null) { - throw new IllegalArgumentException("Null 'data' argument."); + throw new IllegalArgumentException("Null 'data' argument."); } this.data = new DefaultKeyedValues(); for (int i = 0; i < data.getItemCount(); i++) { @@ -113,7 +111,7 @@ } /** - * Returns the categories in the dataset. The returned list is + * Returns the categories in the dataset. The returned list is * unmodifiable. * * @return The categories in the dataset. @@ -123,13 +121,13 @@ } /** - * Returns the key for the specified item, or <code>null</code>. + * Returns the key for the specified item, or <code>null</code>. * - * @param item the item index (in the range <code>0</code> to + * @param item the item index (in the range <code>0</code> to * <code>getItemCount() - 1</code>). * * @return The key, or <code>null</code>. - * + * * @throws IndexOutOfBoundsException if <code>item</code> is not in the * specified range. */ @@ -143,8 +141,8 @@ * @param key the key (<code>null</code> not permitted). * * @return The index, or <code>-1</code> if the key is unrecognised. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public int getIndex(Comparable key) { @@ -174,7 +172,7 @@ * @param key the key (<code>null</code> not permitted). * * @return The value (possibly <code>null</code>). - * + * * @throws UnknownKeyException if the key is not recognised. */ public Number getValue(Comparable key) { @@ -190,8 +188,8 @@ * * @param key the key (<code>null</code> not permitted). * @param value the value. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public void setValue(Comparable key, Number value) { @@ -205,25 +203,25 @@ * * @param key the key (<code>null</code> not permitted). * @param value the value. - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public void setValue(Comparable key, double value) { setValue(key, new Double(value)); } - + /** * Inserts a new value at the specified position in the dataset or, if - * there is an existing item with the specified key, updates the value + * there is an existing item with the specified key, updates the value * for that item and moves it to the specified position. After the change - * is made, this methods sends a {@link DatasetChangeEvent} to all + * is made, this methods sends a {@link DatasetChangeEvent} to all * registered listeners. - * + * * @param position the position (in the range 0 to getItemCount()). * @param key the key (<code>null</code> not permitted). * @param value the value (<code>null</code> permitted). - * + * * @since 1.0.6 */ public void insertValue(int position, Comparable key, double value) { @@ -232,15 +230,15 @@ /** * Inserts a new value at the specified position in the dataset or, if - * there is an existing item with the specified key, updates the value + * there is an existing item with the specified key, updates the value * for that item and moves it to the specified position. After the change - * is made, this methods sends a {@link DatasetChangeEvent} to all + * is made, this methods sends a {@link DatasetChangeEvent} to all * registered listeners. - * + * * @param position the position (in the range 0 to getItemCount()). * @param key the key (<code>null</code> not permitted). * @param value the value (<code>null</code> permitted). - * + * * @since 1.0.6 */ public void insertValue(int position, Comparable key, Number value) { @@ -251,21 +249,21 @@ /** * Removes an item from the dataset and sends a {@link DatasetChangeEvent} * to all registered listeners. - * + * * @param key the key (<code>null</code> not permitted). - * - * @throws IllegalArgumentException if <code>key</code> is + * + * @throws IllegalArgumentException if <code>key</code> is * <code>null</code>. */ public void remove(Comparable key) { - this.data.removeValue(key); + this.data.removeValue(key); fireDatasetChanged(); } - + /** * Clears all data from this dataset and sends a {@link DatasetChangeEvent} * to all registered listeners (unless the dataset was already empty). - * + * * @since 1.0.2 */ public void clear() { @@ -278,22 +276,22 @@ /** * Sorts the dataset's items by key and sends a {@link DatasetChangeEvent} * to all registered listeners. - * + * * @param order the sort order (<code>null</code> not permitted). - * + * * @since 1.0.3 */ public void sortByKeys(SortOrder order) { this.data.sortByKeys(order); fireDatasetChanged(); } - + /** * Sorts the dataset's items by value and sends a {@link DatasetChangeEvent} * to all registered listeners. - * + * * @param order the sort order (<code>null</code> not permitted). - * + * * @since 1.0.3 */ public void sortByValues(SortOrder order) { @@ -348,7 +346,7 @@ /** * Returns a hash code. - * + * * @return A hash code. */ public int hashCode() { @@ -357,16 +355,16 @@ /** * Returns a clone of the dataset. - * + * * @return A clone. - * - * @throws CloneNotSupportedException This class will not throw this + * + * @throws CloneNotSupportedException This class will not throw this * exception, but subclasses (if any) might. */ public Object clone() throws CloneNotSupportedException { DefaultPieDataset clone = (DefaultPieDataset) super.clone(); clone.data = (DefaultKeyedValues) this.data.clone(); - return clone; + return clone; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/DefaultValueDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ------------------------ * DefaultValueDataset.java * ------------------------ - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -39,7 +39,7 @@ * 03-Mar-2005 : Implemented PublicCloneable (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- * 30-Jan-2007 : Added explicit super() call in constructor (for clarity) (DG); - * + * */ package org.jfree.data.general; @@ -50,18 +50,16 @@ import org.jfree.util.PublicCloneable; /** - * A dataset that stores a single value (that is possibly <code>null</code>). - * This class provides a default implementation of the {@link ValueDataset} + * A dataset that stores a single value (that is possibly <code>null</code>). + * This class provides a default implementation of the {@link ValueDataset} * interface. */ public class DefaultValueDataset extends AbstractDataset - implements ValueDataset, - Cloneable, PublicCloneable, - Serializable { + implements ValueDataset, Cloneable, PublicCloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = 8137521217249294891L; - + /** The value. */ private Number value; @@ -71,10 +69,10 @@ public DefaultValueDataset() { this(null); } - + /** * Creates a new dataset with the specified value. - * + * * @param value the value. */ public DefaultValueDataset(double value) { @@ -101,7 +99,7 @@ } /** - * Sets the value and sends a {@link DatasetChangeEvent} to all registered + * Sets the value and sends a {@link DatasetChangeEvent} to all registered * listeners. * * @param value the new value (<code>null</code> permitted). @@ -131,11 +129,11 @@ /** * Returns a hash code. - * + * * @return A hash code. */ public int hashCode() { return (this.value != null ? this.value.hashCode() : 0); } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValueDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValueDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValueDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ---------------------- * KeyedValueDataset.java * ---------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValues2DDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValues2DDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValues2DDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------- * KeyedValues2DDataset.java * ----------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -35,7 +35,7 @@ * Changes: * -------- * 13-Mar-2003 : Version 1 (DG); - * 23-Apr-2003 : Switched CategoryDataset and KeyedValues2DDataset so that + * 23-Apr-2003 : Switched CategoryDataset and KeyedValues2DDataset so that * CategoryDataset is the super interface (DG); * */ @@ -45,7 +45,7 @@ import org.jfree.data.category.CategoryDataset; /** - * A dataset containing (key, value) data items. This dataset is equivalent + * A dataset containing (key, value) data items. This dataset is equivalent * to a {@link CategoryDataset} and is included for completeness only. */ public interface KeyedValues2DDataset extends CategoryDataset { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValuesDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValuesDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/KeyedValuesDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------------------- * KeyedValuesDataset.java * ----------------------- - * (C) Copyright 2003-2007, by Object Refinery Limited. + * (C) Copyright 2003-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/PieDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/PieDataset.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/PieDataset.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * --------------- * PieDataset.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): Sam (oldman); @@ -35,10 +35,10 @@ * Changes * ------- * 17-Nov-2001 : Version 1 (DG); - * 22-Jan-2002 : Removed the getCategoryCount() method, updated Javadoc + * 22-Jan-2002 : Removed the getCategoryCount() method, updated Javadoc * comments (DG); * 18-Apr-2002 : getCategories() now returns List instead of Set (oldman); - * 23-Oct-2002 : Reorganised the code: PieDataset now extends KeyedValues + * 23-Oct-2002 : Reorganised the code: PieDataset now extends KeyedValues * interface (DG); * 04-Mar-2003 : Now just replicates the KeyedValuesDataset interface (DG); * @@ -49,7 +49,7 @@ import org.jfree.data.KeyedValues; /** - * A general purpose dataset where values are associated with keys. As the + * A general purpose dataset where values are associated with keys. As the * name suggests, you can use this dataset to supply data for pie charts (refer * to the {@link org.jfree.chart.plot.PiePlot} class). */ Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java 2008-07-22 08:15:34 UTC (rev 1320) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/general/Series.java 2008-07-22 08:19:32 UTC (rev 1321) @@ -2,32 +2,32 @@ * 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 * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. + * [Java is a trademark or registered trademark of Sun Microsystems, Inc. * in the United States and other countries.] * * ----------- * Series.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): -; @@ -36,20 +36,20 @@ * ------- * 15-Nov-2001 : Version 1 (DG); * 29-Nov-2001 : Added cloning and property change support (DG); - * 30-Jan-2002 : Added a description attribute and changed the constructors to + * 30-Jan-2002 : Added a description attribute and changed the constructors to * protected (DG); * 07-Oct-2002 : Fixed errors reported by Checkstyle (DG); * 13-Mar-2003 : Implemented Serializable (DG); * 01-May-2003 : Added equals() method (DG); - * 26-Jun-2003 : Changed listener list to use EventListenerList - see bug + * 26-Jun-2003 : Changed listener list to use EventListenerList - see bug * 757027 (DG); - * 15-Oct-2003 : Added a flag to control whether or not change events are sent + * 15-Oct-2003 : Added a flag to control whether or not change events are sent * to registered listeners (DG); * 19-May-2005 : Made abstract (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- * 04-May-2006 : Updated API docs (DG); * 26-Sep-2007 : Added isEmpty() and getItemCount() methods (DG); - * + * */ package org.jfree.data.general; @@ -69,14 +69,14 @@ * The series has two properties ("Key" and "Description") for which you can * register a <code>PropertyChangeListener</code>. * <P> - * You can also register a {@link SeriesChangeListener} to receive notification + * You can also register a {@link SeriesChangeListener} to receive notification * of changes to the series data. */ public abstract class Series implements Cloneable, Serializable { /** For serialization. */ private static final long serialVersionUID = -6906561437538683581L; - + /** The key for the series. */ private Comparable key; @@ -93,7 +93,7 @@ private boolean notify; /** - * Creates a new series with the specified key. + * Creates a new series with the specified key. * * @param key the series key (<code>null</code> not permitted). */ @@ -115,14 +115,14 @@ this.description = description; this.listeners = new EventListenerList(); this.propertyChangeSupport = new PropertyChangeSupport(this); - this.notify = true; + this.notify = true; } /** * Returns the key for the series. * * @return The series key (never <code>null</code>). - * + * * @see #setKey(Comparable) */ public Comparable getKey() { @@ -130,11 +130,11 @@ } /** - * Sets the key for the series and sends a <code>PropertyChangeEvent</code> + * Sets the key for the series and sends a <code>PropertyChangeEvent</code> * (with the property name "Key") to all registered listeners. * * @param key the key (<code>null</code> not permitted). - * + * * @see #getKey() */ public void setKey(Comparable key) { @@ -150,7 +150,7 @@ * Returns a description of the series. * * @return The series description (possibly <code>null</code>). - * + * * @see #setDescription(String) */ public String getDescription() { @@ -158,38 +158,38 @@ } /** - * Sets the description of the series and sends a + * Sets the description of the series and sends a * <code>PropertyChangeEvent</code> to all registered listeners. * * @param description the description (<code>null</code> permitted). - * + * * @see #getDescription() */ public void setDescription(String description) { String old = this.description; this.description = description; - this.propertyChangeSupport.firePropertyChange("Description", old, + this.propertyChangeSupport.firePropertyChange("Description", old, description); } /** - * Returns the flag that controls whether or not change events are sent to + * Returns the flag that controls whether or not change events are sent to * registered listeners. - * + * * @return A boolean. - * + * * @see #setNotify(boolean) */ public boolean getNotify() { return this.notify; } - + /** - * Sets the flag that controls whether or not change events are sent to + * Sets the flag that controls whether or not change events are sent to * registered listeners. - * + * * @param notify the new value of the flag. - * + * * @see #getNotify() */ public void setNotify(boolean notify) { @@ -198,41 +198,41 @@ fireSeriesChanged(); } } - + /** * Returns <code>true</code> if the series contains no data items, and * <code>false</code> otherwise. - * + * * @return A boolean. - * + * * @since 1.0.7 */ public boolean isEmpty() { return (getItemCount() == 0); } - + /** * Returns the number of data items in the series. - * + * * @return The number of data items in the series. */ public abstract int getItemCount(); - + /** * Returns a clone of the series. * <P> * Notes: * <ul> - * <li>No need to clone the name or description, since String object is + * <li>No need to clone the name or description, since String object is * immutable.</li> - * <li>We set the listener list to empty, since the listeners did not + * <li>We set the listener list to empty, since the listeners did not * register with the clone.</li> * <li>Same applies to the PropertyChangeSupport instance.</li> * </ul> * * @return A clone of the series. - * - * @throws CloneNotSupportedException not thrown by this class, but + * + * @throws CloneNotSupportedException not thrown by this class, but * subclasses may differ. */ public Object clone() throws CloneNotSupportedException { @@ -270,22 +270,22 @@ /** * Returns a hash code. - * + * * @return A hash code. */ public int hashCode() { int result; result = this.key.hashCode(); - result = 29 * result + (this.description != null + result = 29 * result + (this.description != null ? this.description.hashCode() : 0); return result; } /** - * Registers an object with this series, to receive notification whenever + * Registers an object with this series, to receive notification whenever * the series changes. * <P> - * Objects being registered must implement the {@link SeriesChangeListener} + * Objects being registered must implement the {@link SeriesChangeListener} * interface. * * @param listener the listener to register. @@ -295,7 +295,7 @@ } /** - * Deregisters an object, so that it not longer receives notification + * Deregisters an object, so that it not longer receives notification * whenever the series changes. * * @param listener the listener to deregister. @@ -317,7 +317,7 @@ /** * Sends a change event to all registered listeners. * - * @param event contains information about the event that triggered the + * @param event contains information about the event that triggered the * notification. */ protected void notifyListeners(SeriesChangeEvent event) { @@ -357,9 +357,9 @@ * @param oldValue the old value. * @param newValue the new value. */ - protected void firePropertyChange(String property, Object oldValue, + protected void firePropertyChange(String property, Object oldValue, Object newValue) { - this.propertyChangeSupport.firePropertyChange(property, oldValue, + this.propertyChangeSupport.firePropertyChange(property, oldValue, newValue); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |