From: <mu...@us...> - 2008-07-21 14:14:52
|
Revision: 1306 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1306&view=rev Author: mungady Date: 2008-07-21 14:14:49 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2008-07-21 14:02:14 UTC (rev 1305) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2008-07-21 14:14:49 UTC (rev 1306) @@ -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.] * * ------------------------------ * AbstractIntervalXYDataset.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): -; @@ -35,92 +35,92 @@ * Changes * ------- * 05-May-2004 : Version 1 (DG); - * 15-Jul-2004 : Switched getStartX() and getStartXValue() methods and + * 15-Jul-2004 : Switched getStartX() and getStartXValue() methods and * others (DG); * 18-Aug-2004 : Moved from org.jfree.data --> org.jfree.data.xy (DG); - * + * */ package org.jfree.data.xy; /** - * An base class that you can use to create new implementations of the + * An base class that you can use to create new implementations of the * {@link IntervalXYDataset} interface. */ -public abstract class AbstractIntervalXYDataset extends AbstractXYDataset - implements IntervalXYDataset { +public abstract class AbstractIntervalXYDataset extends AbstractXYDataset + implements IntervalXYDataset { /** - * Returns the start x-value (as a double primitive) for an item within a + * Returns the start x-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The value. */ public double getStartXValue(int series, int item) { double result = Double.NaN; Number x = getStartX(series, item); if (x != null) { - result = x.doubleValue(); + result = x.doubleValue(); } - return result; + return result; } /** - * Returns the end x-value (as a double primitive) for an item within a + * Returns the end x-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The value. */ public double getEndXValue(int series, int item) { double result = Double.NaN; Number x = getEndX(series, item); if (x != null) { - result = x.doubleValue(); + result = x.doubleValue(); } - return result; + return result; } /** - * Returns the start y-value (as a double primitive) for an item within a + * Returns the start y-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The value. */ public double getStartYValue(int series, int item) { double result = Double.NaN; Number y = getStartY(series, item); if (y != null) { - result = y.doubleValue(); + result = y.doubleValue(); } - return result; + return result; } /** - * Returns the end y-value (as a double primitive) for an item within a + * Returns the end y-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The value. */ public double getEndYValue(int series, int item) { double result = Double.NaN; Number y = getEndY(series, item); if (y != null) { - result = y.doubleValue(); + result = y.doubleValue(); } - return result; + return result; } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2008-07-21 14:02:14 UTC (rev 1305) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2008-07-21 14:14:49 UTC (rev 1306) @@ -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.] * * ---------------------- * AbstractXYDataset.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): -; @@ -35,10 +35,10 @@ * Changes * ------- * 05-May-2004 : Version 1 (DG); - * 15-Jul-2004 : Switched getX() with getXValue() and getY() with + * 15-Jul-2004 : Switched getX() with getXValue() and getY() with * getYValue() (DG); * 18-Aug-2004 : Moved from org.jfree.data --> org.jfree.data.xy (DG); - * + * */ package org.jfree.data.xy; @@ -47,53 +47,53 @@ import org.jfree.data.general.AbstractSeriesDataset; /** - * An base class that you can use to create new implementations of the + * An base class that you can use to create new implementations of the * {@link XYDataset} interface. */ -public abstract class AbstractXYDataset extends AbstractSeriesDataset - implements XYDataset { +public abstract class AbstractXYDataset extends AbstractSeriesDataset + implements XYDataset { /** * Returns the order of the domain (X) values. - * + * * @return The domain order. */ public DomainOrder getDomainOrder() { return DomainOrder.NONE; } - + /** * Returns the x-value (as a double primitive) for an item within a series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The value. */ public double getXValue(int series, int item) { double result = Double.NaN; Number x = getX(series, item); if (x != null) { - result = x.doubleValue(); + result = x.doubleValue(); } - return result; + return result; } /** * Returns the y-value (as a double primitive) for an item within a series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The value. */ public double getYValue(int series, int item) { double result = Double.NaN; Number y = getY(series, item); if (y != null) { - result = y.doubleValue(); + result = y.doubleValue(); } - return result; + return result; } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2008-07-21 14:02:14 UTC (rev 1305) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2008-07-21 14:14:49 UTC (rev 1306) @@ -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.] * * ----------------------- * AbstractXYZDataset.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): -; @@ -42,27 +42,27 @@ package org.jfree.data.xy; /** - * An base class that you can use to create new implementations of the + * An base class that you can use to create new implementations of the * {@link XYZDataset} interface. */ -public abstract class AbstractXYZDataset extends AbstractXYDataset - implements XYZDataset { +public abstract class AbstractXYZDataset extends AbstractXYDataset + implements XYZDataset { /** * Returns the z-value (as a double primitive) for an item within a series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The z-value. */ public double getZValue(int series, int item) { double result = Double.NaN; Number z = getZ(series, item); if (z != null) { - result = z.doubleValue(); + result = z.doubleValue(); } - return result; + return result; } } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2008-07-21 14:02:14 UTC (rev 1305) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2008-07-21 14:14:49 UTC (rev 1306) @@ -326,6 +326,8 @@ * Returns an independent copy of this dataset. * * @return A clone. + * + * @throws CloneNotSupportedException */ public Object clone() throws CloneNotSupportedException { DefaultOHLCDataset clone = (DefaultOHLCDataset) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2008-07-21 14:02:14 UTC (rev 1305) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2008-07-21 14:14:49 UTC (rev 1306) @@ -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.] * * --------------------- * DefaultXYDataset.java * --------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2006-2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -54,10 +54,10 @@ /** * A default implementation of the {@link XYDataset} interface that stores * data values in arrays of double primitives. - * + * * @since 1.0.2 */ -public class DefaultXYDataset extends AbstractXYDataset +public class DefaultXYDataset extends AbstractXYDataset implements XYDataset, PublicCloneable { /** @@ -65,23 +65,23 @@ * seriesList. */ private List seriesKeys; - - /** + + /** * Storage for the series in the dataset. We use a list because the - * order of the series is significant. This list must be kept in sync + * order of the series is significant. This list must be kept in sync * with the seriesKeys list. - */ + */ private List seriesList; - + /** - * Creates a new <code>DefaultXYDataset</code> instance, initially + * Creates a new <code>DefaultXYDataset</code> instance, initially * containing no data. */ public DefaultXYDataset() { this.seriesKeys = new java.util.ArrayList(); - this.seriesList = new java.util.ArrayList(); + this.seriesList = new java.util.ArrayList(); } - + /** * Returns the number of series in the dataset. * @@ -92,14 +92,14 @@ } /** - * Returns the key for a series. + * Returns the key for a series. * - * @param series the series index (in the range <code>0</code> to + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</code>). * * @return The key for the series. - * - * @throws IllegalArgumentException if <code>series</code> is not in the + * + * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ public Comparable getSeriesKey(int series) { @@ -110,11 +110,11 @@ } /** - * Returns the index of the series with the specified key, or -1 if there + * Returns the index of the series with the specified key, or -1 if there * is no such series in the dataset. - * + * * @param seriesKey the series key (<code>null</code> permitted). - * + * * @return The index, or -1. */ public int indexOf(Comparable seriesKey) { @@ -123,9 +123,9 @@ /** * Returns the order of the domain (x-) values in the dataset. In this - * implementation, we cannot guarantee that the x-values are ordered, so + * implementation, we cannot guarantee that the x-values are ordered, so * this method returns <code>DomainOrder.NONE</code>. - * + * * @return <code>DomainOrder.NONE</code>. */ public DomainOrder getDomainOrder() { @@ -134,13 +134,13 @@ /** * Returns the number of items in the specified series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</code>). - * + * * @return The item count. - * - * @throws IllegalArgumentException if <code>series</code> is not in the + * + * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ public int getItemCount(int series) { @@ -153,19 +153,19 @@ /** * Returns the x-value for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The x-value. - * - * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not + * + * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not * within the specified range. - * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not + * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not * within the specified range. - * + * * @see #getX(int, int) */ public double getXValue(int series, int item) { @@ -175,19 +175,19 @@ /** * Returns the x-value for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The x-value. - * - * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not + * + * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not * within the specified range. - * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not + * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not * within the specified range. - * + * * @see #getXValue(int, int) */ public Number getX(int series, int item) { @@ -196,19 +196,19 @@ /** * Returns the y-value for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The y-value. - * - * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not + * + * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not * within the specified range. - * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not + * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not * within the specified range. - * + * * @see #getY(int, int) */ public double getYValue(int series, int item) { @@ -218,19 +218,19 @@ /** * Returns the y-value for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The y-value. - * - * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not + * + * @throws ArrayIndexOutOfBoundsException if <code>series</code> is not * within the specified range. - * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not + * @throws ArrayIndexOutOfBoundsException if <code>item</code> is not * within the specified range. - * + * * @see #getX(int, int) */ public Number getY(int series, int item) { @@ -239,13 +239,13 @@ /** * Adds a series or if a series with the same key already exists replaces - * the data for that series, then sends a {@link DatasetChangeEvent} to + * the data for that series, then sends a {@link DatasetChangeEvent} to * all registered listeners. - * + * * @param seriesKey the series key (<code>null</code> not permitted). - * @param data the data (must be an array with length 2, containing two + * @param data the data (must be an array with length 2, containing two * arrays of equal length, the first containing the x-values and the - * second containing the y-values). + * second containing the y-values). */ public void addSeries(Comparable seriesKey, double[][] data) { if (seriesKey == null) { @@ -276,11 +276,11 @@ } /** - * Removes a series from the dataset, then sends a + * Removes a series from the dataset, then sends a * {@link DatasetChangeEvent} to all registered listeners. - * + * * @param seriesKey the series key (<code>null</code> not permitted). - * + * */ public void removeSeries(Comparable seriesKey) { int seriesIndex = indexOf(seriesKey); @@ -290,20 +290,20 @@ notifyListeners(new DatasetChangeEvent(this, this)); } } - + /** * Tests this <code>DefaultXYDataset</code> instance for equality with an * arbitrary object. This method returns <code>true</code> if and only if: * <ul> * <li><code>obj</code> is not <code>null</code>;</li> - * <li><code>obj</code> is an instance of + * <li><code>obj</code> is an instance of * <code>DefaultXYDataset</code>;</li> - * <li>both datasets have the same number of series, each containing + * <li>both datasets have the same number of series, each containing * exactly the same values.</li> * </ul> - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { @@ -326,17 +326,17 @@ return false; } double[] d1y = d1[1]; - double[] d2y = d2[1]; + double[] d2y = d2[1]; if (!Arrays.equals(d1y, d2y)) { return false; } } return true; } - + /** * Returns a hash code for this instance. - * + * * @return A hash code. */ public int hashCode() { @@ -345,12 +345,12 @@ result = 29 * result + this.seriesList.hashCode(); return result; } - + /** * Creates an independent copy of this dataset. - * + * * @return The cloned dataset. - * + * * @throws CloneNotSupportedException if there is a problem cloning the * dataset (for instance, if a non-cloneable object is used for a * series key). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-07-21 14:33:23
|
Revision: 1309 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1309&view=rev Author: mungady Date: 2008-07-21 14:33:19 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * ----------------------- * XYIntervalDataItem.java * ----------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,7 +49,7 @@ */ public class XYIntervalDataItem extends ComparableObjectItem { - /** + /** * Creates a new instance of <code>XYIntervalItem</code>. * * @param x the x-value. @@ -59,11 +59,11 @@ * @param yLow the lower bound of the y-interval. * @param yHigh the upper bound of the y-interval. */ - public XYIntervalDataItem(double x, double xLow, double xHigh, double y, + public XYIntervalDataItem(double x, double xLow, double xHigh, double y, double yLow, double yHigh) { super(new Double(x), new XYInterval(xLow, xHigh, y, yLow, yHigh)); } - + /** * Returns the x-value. * @@ -72,7 +72,7 @@ public Double getX() { return (Double) getComparable(); } - + /** * Returns the y-value. * @@ -87,7 +87,7 @@ return Double.NaN; } } - + /** * Returns the lower bound of the x-interval. * @@ -102,7 +102,7 @@ return Double.NaN; } } - + /** * Returns the upper bound of the x-interval. * @@ -117,7 +117,7 @@ return Double.NaN; } } - + /** * Returns the lower bound of the y-interval. * @@ -132,7 +132,7 @@ return Double.NaN; } } - + /** * Returns the upper bound of the y-interval. * @@ -147,5 +147,5 @@ return Double.NaN; } } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * --------------------- * XYIntervalSeries.java * --------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -52,10 +52,10 @@ * @see XYIntervalSeriesCollection */ public class XYIntervalSeries extends ComparableObjectSeries { - + /** - * Creates a new empty series. By default, items added to the series will - * be sorted into ascending order by x-value, and duplicate x-values will + * Creates a new empty series. By default, items added to the series will + * be sorted into ascending order by x-value, and duplicate x-values will * be allowed (these defaults can be modified with another constructor). * * @param key the series key (<code>null</code> not permitted). @@ -63,22 +63,22 @@ public XYIntervalSeries(Comparable key) { this(key, true, true); } - + /** - * Constructs a new xy-series that contains no data. You can specify + * Constructs a new xy-series that contains no data. You can specify * whether or not duplicate x-values are allowed for the series. * * @param key the series key (<code>null</code> not permitted). - * @param autoSort a flag that controls whether or not the items in the + * @param autoSort a flag that controls whether or not the items in the * series are sorted. - * @param allowDuplicateXValues a flag that controls whether duplicate + * @param allowDuplicateXValues a flag that controls whether duplicate * x-values are allowed. */ - public XYIntervalSeries(Comparable key, boolean autoSort, + public XYIntervalSeries(Comparable key, boolean autoSort, boolean allowDuplicateXValues) { super(key, autoSort, allowDuplicateXValues); } - + /** * Adds a data item to the series. * @@ -89,11 +89,11 @@ * @param yLow the lower bound of the y-interval. * @param yHigh the upper bound of the y-interval. */ - public void add(double x, double xLow, double xHigh, double y, double yLow, + public void add(double x, double xLow, double xHigh, double y, double yLow, double yHigh) { super.add(new XYIntervalDataItem(x, xLow, xHigh, y, yLow, yHigh), true); } - + /** * Returns the x-value for the specified item. * @@ -105,30 +105,30 @@ XYIntervalDataItem item = (XYIntervalDataItem) getDataItem(index); return item.getX(); } - + /** * Returns the lower bound of the x-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The lower bound of the x-interval. - * + * * @since 1.0.5 */ public double getXLowValue(int index) { XYIntervalDataItem item = (XYIntervalDataItem) getDataItem(index); return item.getXLowValue(); } - + /** * Returns the upper bound of the x-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The upper bound of the x-interval. - * + * * @since 1.0.5 */ public double getXHighValue(int index) { @@ -147,30 +147,30 @@ XYIntervalDataItem item = (XYIntervalDataItem) getDataItem(index); return item.getYValue(); } - + /** * Returns the lower bound of the Y-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The lower bound of the Y-interval. - * + * * @since 1.0.5 */ public double getYLowValue(int index) { XYIntervalDataItem item = (XYIntervalDataItem) getDataItem(index); return item.getYLowValue(); } - + /** * Returns the upper bound of the y-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The upper bound of the y-interval. - * + * * @since 1.0.5 */ public double getYHighValue(int index) { @@ -180,13 +180,13 @@ /** * Returns the data item at the specified index. - * + * * @param index the item index. - * + * * @return The data item. */ public ComparableObjectItem getDataItem(int index) { return super.getDataItem(index); } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * --------------- * XYZDataset.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): -; @@ -40,9 +40,9 @@ * 18-Aug-2004 : Moved from org.jfree.data --> org.jfree.data.xy (DG); * */ + package org.jfree.data.xy; - /** * The interface through which JFreeChart obtains data in the form of (x, y, z) * items - used for XY and XYZ plots. @@ -58,13 +58,13 @@ * @return The z-value (possibly <code>null</code>). */ public Number getZ(int series, int item); - + /** * Returns the z-value (as a double primitive) for an item within a series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The z-value. */ public double getZValue(int series, int item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * -------------- * YInterval.java * -------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -43,35 +43,35 @@ import java.io.Serializable; /** - * A y-interval. This class is used internally by the + * A y-interval. This class is used internally by the * {@link YIntervalDataItem} class. * * @since 1.0.3 */ public class YInterval implements Serializable { - + /** The y-value. */ private double y; - + /** The lower bound of the y-interval. */ private double yLow; - + /** The upper bound of the y-interval. */ private double yHigh; - - /** + + /** * Creates a new instance of <code>YInterval</code>. * * @param y the y-value. * @param yLow the lower bound of the y-interval. - * @param yHigh the upper bound of the y-interval. + * @param yHigh the upper bound of the y-interval. */ public YInterval(double y, double yLow, double yHigh) { this.y = y; this.yLow = yLow; this.yHigh = yHigh; } - + /** * Returns the y-value. * @@ -80,7 +80,7 @@ public double getY() { return this.y; } - + /** * Returns the lower bound of the y-interval. * @@ -89,7 +89,7 @@ public double getYLow() { return this.yLow; } - + /** * Returns the upper bound of the y-interval. * @@ -98,7 +98,7 @@ public double getYHigh() { return this.yHigh; } - + /** * Tests this instance for equality with an arbitrary object. * @@ -125,5 +125,5 @@ } return true; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * ---------------------- * YIntervalDataItem.java * ---------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,7 +49,7 @@ */ public class YIntervalDataItem extends ComparableObjectItem { - /** + /** * Creates a new instance of <code>YIntervalItem</code>. * * @param x the x-value. @@ -60,7 +60,7 @@ public YIntervalDataItem(double x, double y, double yLow, double yHigh) { super(new Double(x), new YInterval(y, yLow, yHigh)); } - + /** * Returns the x-value. * @@ -69,7 +69,7 @@ public Double getX() { return (Double) getComparable(); } - + /** * Returns the y-value. * @@ -84,7 +84,7 @@ return Double.NaN; } } - + /** * Returns the lower bound of the y-interval. * @@ -99,7 +99,7 @@ return Double.NaN; } } - + /** * Returns the upper bound of the y-interval. * @@ -114,5 +114,5 @@ return Double.NaN; } } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * -------------------- * YIntervalSeries.java * -------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -52,10 +52,10 @@ * @see YIntervalSeriesCollection */ public class YIntervalSeries extends ComparableObjectSeries { - + /** - * Creates a new empty series. By default, items added to the series will - * be sorted into ascending order by x-value, and duplicate x-values will + * Creates a new empty series. By default, items added to the series will + * be sorted into ascending order by x-value, and duplicate x-values will * be allowed (these defaults can be modified with another constructor. * * @param key the series key (<code>null</code> not permitted). @@ -63,22 +63,22 @@ public YIntervalSeries(Comparable key) { this(key, true, true); } - + /** - * Constructs a new xy-series that contains no data. You can specify + * Constructs a new xy-series that contains no data. You can specify * whether or not duplicate x-values are allowed for the series. * * @param key the series key (<code>null</code> not permitted). - * @param autoSort a flag that controls whether or not the items in the + * @param autoSort a flag that controls whether or not the items in the * series are sorted. - * @param allowDuplicateXValues a flag that controls whether duplicate + * @param allowDuplicateXValues a flag that controls whether duplicate * x-values are allowed. */ - public YIntervalSeries(Comparable key, boolean autoSort, + public YIntervalSeries(Comparable key, boolean autoSort, boolean allowDuplicateXValues) { super(key, autoSort, allowDuplicateXValues); } - + /** * Adds a data item to the series. * @@ -90,7 +90,7 @@ public void add(double x, double y, double yLow, double yHigh) { super.add(new YIntervalDataItem(x, y, yLow, yHigh), true); } - + /** * Returns the x-value for the specified item. * @@ -102,7 +102,7 @@ YIntervalDataItem item = (YIntervalDataItem) getDataItem(index); return item.getX(); } - + /** * Returns the y-value for the specified item. * @@ -114,30 +114,30 @@ YIntervalDataItem item = (YIntervalDataItem) getDataItem(index); return item.getYValue(); } - + /** * Returns the lower bound of the Y-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The lower bound of the Y-interval. - * + * * @since 1.0.5 */ public double getYLowValue(int index) { YIntervalDataItem item = (YIntervalDataItem) getDataItem(index); return item.getYLowValue(); } - + /** * Returns the upper bound of the y-interval for the specified item in the * series. - * + * * @param index the item index. - * + * * @return The upper bound of the y-interval. - * + * * @since 1.0.5 */ public double getYHighValue(int index) { @@ -147,9 +147,9 @@ /** * Returns the data item at the specified index. - * + * * @param index the item index. - * + * * @return The data item. */ public ComparableObjectItem getDataItem(int index) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -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.] * * ------------------- * YWithXInterval.java * ------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -43,9 +43,9 @@ import java.io.Serializable; /** - * A y-value plus the bounds for the related x-interval. This curious + * A y-value plus the bounds for the related x-interval. This curious * combination exists as an implementation detail, to fit into the structure - * of the ComparableObjectSeries class. It would have been possible to + * of the ComparableObjectSeries class. It would have been possible to * simply reuse the {@link YInterval} class by assuming that the y-interval * in fact represents the x-interval, however I decided it was better to * duplicate some code in order to document the real intent. @@ -53,29 +53,29 @@ * @since 1.0.3 */ public class YWithXInterval implements Serializable { - + /** The y-value. */ private double y; - + /** The lower bound of the x-interval. */ private double xLow; - + /** The upper bound of the x-interval. */ private double xHigh; - - /** + + /** * Creates a new instance of <code>YWithXInterval</code>. * * @param y the y-value. * @param xLow the lower bound of the x-interval. - * @param xHigh the upper bound of the x-interval. + * @param xHigh the upper bound of the x-interval. */ public YWithXInterval(double y, double xLow, double xHigh) { this.y = y; this.xLow = xLow; this.xHigh = xHigh; } - + /** * Returns the y-value. * @@ -84,7 +84,7 @@ public double getY() { return this.y; } - + /** * Returns the lower bound of the x-interval. * @@ -93,7 +93,7 @@ public double getXLow() { return this.xLow; } - + /** * Returns the upper bound of the x-interval. * @@ -102,7 +102,7 @@ public double getXHigh() { return this.xHigh; } - + /** * Tests this instance for equality with an arbitrary object. * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java 2008-07-21 14:28:58 UTC (rev 1308) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java 2008-07-21 14:33:19 UTC (rev 1309) @@ -2,26 +2,26 @@ * 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.] * * ---------------- @@ -75,5 +75,5 @@ * @return The symbolic value. */ public String getYSymbolicValue(Integer val); - + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-07-21 14:20:44
|
Revision: 1307 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1307&view=rev Author: mungady Date: 2008-07-21 14:20:41 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ---------------------- * IntervalXYDataset.java * ---------------------- - * (C) Copyright 2001-2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2001-2008, by Object Refinery Limited and Contributors. * * Original Author: Mark Watson (www.markwatson.com); * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -42,11 +42,10 @@ package org.jfree.data.xy; - /** - * An extension of the {@link XYDataset} interface that allows a range of data - * to be defined for the X values, the Y values, or both the X and Y values. - * This interface is used to support (among other things) bar plots against + * An extension of the {@link XYDataset} interface that allows a range of data + * to be defined for the X values, the Y values, or both the X and Y values. + * This interface is used to support (among other things) bar plots against * numerical axes. */ public interface IntervalXYDataset extends XYDataset { @@ -62,12 +61,12 @@ public Number getStartX(int series, int item); /** - * Returns the start x-value (as a double primitive) for an item within a + * Returns the start x-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The start x-value. */ public double getStartXValue(int series, int item); @@ -83,12 +82,12 @@ public Number getEndX(int series, int item); /** - * Returns the end x-value (as a double primitive) for an item within a + * Returns the end x-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The end x-value. */ public double getEndXValue(int series, int item); @@ -104,12 +103,12 @@ public Number getStartY(int series, int item); /** - * Returns the start y-value (as a double primitive) for an item within a + * Returns the start y-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The start y-value. */ public double getStartYValue(int series, int item); @@ -125,12 +124,12 @@ public Number getEndY(int series, int item); /** - * Returns the end y-value (as a double primitive) for an item within a + * Returns the end y-value (as a double primitive) for an item within a * series. - * + * * @param series the series index (zero-based). * @param item the item index (zero-based). - * + * * @return The end y-value. */ public double getEndYValue(int series, int item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ----------------------- * IntervalXYDelegate.java * ----------------------- - * (C) Copyright 2004, 2005, 2007, by Andreas Schroeder and Contributors. + * (C) Copyright 2004-2008, by Andreas Schroeder and Contributors. * * Original Author: Andreas Schroeder; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -35,18 +35,18 @@ * Changes * ------- * 31-Mar-2004 : Version 1 (AS); - * 15-Jul-2004 : Switched getX() with getXValue() and getY() with + * 15-Jul-2004 : Switched getX() with getXValue() and getY() with * getYValue() (DG); * 18-Aug-2004 : Moved from org.jfree.data --> org.jfree.data.xy (DG); * 04-Nov-2004 : Added argument check for setIntervalWidth() method (DG); * 17-Nov-2004 : New methods to reflect changes in DomainInfo (DG); - * 11-Jan-2005 : Removed deprecated methods in preparation for the 1.0.0 + * 11-Jan-2005 : Removed deprecated methods in preparation for the 1.0.0 * release (DG); * 21-Feb-2005 : Made public and added equals() method (DG); - * 06-Oct-2005 : Implemented DatasetChangeListener to recalculate + * 06-Oct-2005 : Implemented DatasetChangeListener to recalculate * autoIntervalWidth (DG); * 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG); - * + * */ package org.jfree.data.xy; @@ -64,29 +64,29 @@ /** * A delegate that handles the specification or automatic calculation of the * interval surrounding the x-values in a dataset. This is used to extend - * a regular {@link XYDataset} to support the {@link IntervalXYDataset} + * a regular {@link XYDataset} to support the {@link IntervalXYDataset} * interface. - * <p> - * The decorator pattern was not used because of the several possibly - * implemented interfaces of the decorated instance (e.g. + * <p> + * The decorator pattern was not used because of the several possibly + * implemented interfaces of the decorated instance (e.g. * {@link TableXYDataset}, {@link RangeInfo}, {@link DomainInfo} etc.). * <p> * The width can be set manually or calculated automatically. The switch - * autoWidth allows to determine which behavior is used. The auto width + * autoWidth allows to determine which behavior is used. The auto width * calculation tries to find the smallest gap between two x-values in the - * dataset. If there is only one item in the series, the auto width - * calculation fails and falls back on the manually set interval width (which - * is itself defaulted to 1.0). + * dataset. If there is only one item in the series, the auto width + * calculation fails and falls back on the manually set interval width (which + * is itself defaulted to 1.0). */ public class IntervalXYDelegate implements DatasetChangeListener, - DomainInfo, Serializable, + DomainInfo, Serializable, Cloneable, PublicCloneable { - + /** For serialization. */ private static final long serialVersionUID = -685166711639592857L; - + /** - * The dataset to enhance. + * The dataset to enhance. */ private XYDataset dataset; @@ -94,37 +94,37 @@ * A flag to indicate whether the width should be calculated automatically. */ private boolean autoWidth; - + /** * A value between 0.0 and 1.0 that indicates the position of the x-value * within the interval. */ - private double intervalPositionFactor; - + private double intervalPositionFactor; + /** * The fixed interval width (defaults to 1.0). */ private double fixedIntervalWidth; - + /** * The automatically calculated interval width. */ private double autoIntervalWidth; - + /** * Creates a new delegate that. - * + * * @param dataset the underlying dataset (<code>null</code> not permitted). */ public IntervalXYDelegate(XYDataset dataset) { this(dataset, true); } - + /** * Creates a new delegate for the specified dataset. - * + * * @param dataset the underlying dataset (<code>null</code> not permitted). - * @param autoWidth a flag that controls whether the interval width is + * @param autoWidth a flag that controls whether the interval width is * calculated automatically. */ public IntervalXYDelegate(XYDataset dataset, boolean autoWidth) { @@ -134,20 +134,20 @@ this.dataset = dataset; this.autoWidth = autoWidth; this.intervalPositionFactor = 0.5; - this.autoIntervalWidth = Double.POSITIVE_INFINITY; + this.autoIntervalWidth = Double.POSITIVE_INFINITY; this.fixedIntervalWidth = 1.0; } - + /** - * Returns <code>true</code> if the interval width is automatically + * Returns <code>true</code> if the interval width is automatically * calculated, and <code>false</code> otherwise. - * + * * @return A boolean. */ public boolean isAutoWidth() { return this.autoWidth; } - + /** * Sets the flag that indicates whether the interval width is automatically * calculated. If the flag is set to <code>true</code>, the interval is @@ -156,7 +156,7 @@ * Note: recalculating the interval amounts to changing the data values * represented by the dataset. The calling dataset must fire an * appropriate {@link DatasetChangeEvent}. - * + * * @param b a boolean. */ public void setAutoWidth(boolean b) { @@ -165,10 +165,10 @@ this.autoIntervalWidth = recalculateInterval(); } } - + /** * Returns the interval position factor. - * + * * @return The interval position factor. */ public double getIntervalPositionFactor() { @@ -179,16 +179,16 @@ * Sets the interval position factor. This controls how the interval is * aligned to the x-value. For a value of 0.5, the interval is aligned * with the x-value in the center. For a value of 0.0, the interval is - * aligned with the x-value at the lower end of the interval, and for a + * aligned with the x-value at the lower end of the interval, and for a * value of 1.0, the interval is aligned with the x-value at the upper * end of the interval. - * - * Note that changing the interval position factor amounts to changing the - * data values represented by the dataset. Therefore, the dataset that is - * using this delegate is responsible for generating the - * appropriate {@link DatasetChangeEvent}. - * - * @param d the new interval position factor (in the range + * + * Note that changing the interval position factor amounts to changing the + * data values represented by the dataset. Therefore, the dataset that is + * using this delegate is responsible for generating the + * appropriate {@link DatasetChangeEvent}. + * + * @param d the new interval position factor (in the range * <code>0.0</code> to <code>1.0</code> inclusive). */ public void setIntervalPositionFactor(double d) { @@ -201,22 +201,22 @@ /** * Returns the fixed interval width. - * + * * @return The fixed interval width. */ public double getFixedIntervalWidth() { return this.fixedIntervalWidth; } - + /** * Sets the fixed interval width and, as a side effect, sets the - * <code>autoWidth</code> flag to <code>false</code>. - * - * Note that changing the interval width amounts to changing the data + * <code>autoWidth</code> flag to <code>false</code>. + * + * Note that changing the interval width amounts to changing the data * values represented by the dataset. Therefore, the dataset - * that is using this delegate is responsible for generating the + * that is using this delegate is responsible for generating the * appropriate {@link DatasetChangeEvent}. - * + * * @param w the width (negative values not permitted). */ public void setFixedIntervalWidth(double w) { @@ -226,17 +226,17 @@ this.fixedIntervalWidth = w; this.autoWidth = false; } - + /** - * Returns the interval width. This method will return either the + * Returns the interval width. This method will return either the * auto calculated interval width or the manually specified interval * width, depending on the {@link #isAutoWidth()} result. - * + * * @return The interval width to use. */ public double getIntervalWidth() { if (isAutoWidth() && !Double.isInfinite(this.autoIntervalWidth)) { - // everything is fine: autoWidth is on, and an autoIntervalWidth + // everything is fine: autoWidth is on, and an autoIntervalWidth // was set. return this.autoIntervalWidth; } @@ -248,80 +248,80 @@ /** * Returns the start value of the x-interval for an item within a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The start value of the x-interval (possibly <code>null</code>). - * + * * @see #getStartXValue(int, int) */ public Number getStartX(int series, int item) { Number startX = null; Number x = this.dataset.getX(series, item); if (x != null) { - startX = new Double(x.doubleValue() - - (getIntervalPositionFactor() * getIntervalWidth())); + startX = new Double(x.doubleValue() + - (getIntervalPositionFactor() * getIntervalWidth())); } return startX; } - + /** * Returns the start value of the x-interval for an item within a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The start value of the x-interval. - * + * * @see #getStartX(int, int) */ public double getStartXValue(int series, int item) { - return this.dataset.getXValue(series, item) + return this.dataset.getXValue(series, item) - getIntervalPositionFactor() * getIntervalWidth(); } - + /** * Returns the end value of the x-interval for an item within a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The end value of the x-interval (possibly <code>null</code>). - * + * * @see #getEndXValue(int, int) */ public Number getEndX(int series, int item) { Number endX = null; Number x = this.dataset.getX(series, item); if (x != null) { - endX = new Double(x.doubleValue() - + ((1.0 - getIntervalPositionFactor()) * getIntervalWidth())); + endX = new Double(x.doubleValue() + + ((1.0 - getIntervalPositionFactor()) * getIntervalWidth())); } return endX; } /** * Returns the end value of the x-interval for an item within a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The end value of the x-interval. - * + * * @see #getEndX(int, int) */ public double getEndXValue(int series, int item) { - return this.dataset.getXValue(series, item) + return this.dataset.getXValue(series, item) + (1.0 - getIntervalPositionFactor()) * getIntervalWidth(); } - + /** * Returns the minimum x-value in the dataset. * * @param includeInterval a flag that determines whether or not the * x-interval is taken into account. - * + * * @return The minimum value. */ public double getDomainLowerBound(boolean includeInterval) { @@ -338,7 +338,7 @@ * * @param includeInterval a flag that determines whether or not the * x-interval is taken into account. - * + * * @return The maximum value. */ public double getDomainUpperBound(boolean includeInterval) { @@ -354,9 +354,9 @@ * Returns the range of the values in the dataset's domain, including * or excluding the interval around each x-value as specified. * - * @param includeInterval a flag that determines whether or not the + * @param includeInterval a flag that determines whether or not the * x-interval should be taken into account. - * + * * @return The range. */ public Range getDomainBounds(boolean includeInterval) { @@ -366,18 +366,18 @@ if (includeInterval && range != null) { double lowerAdj = getIntervalWidth() * getIntervalPositionFactor(); double upperAdj = getIntervalWidth() - lowerAdj; - range = new Range(range.getLowerBound() - lowerAdj, + range = new Range(range.getLowerBound() - lowerAdj, range.getUpperBound() + upperAdj); } return range; } - + /** - * Handles events from the dataset by recalculating the interval if + * Handles events from the dataset by recalculating the interval if * necessary. - * + * * @param e the event. - */ + */ public void datasetChanged(DatasetChangeEvent e) { // TODO: by coding the event with some information about what changed // in the dataset, we could make the recalculation of the interval @@ -386,10 +386,10 @@ this.autoIntervalWidth = recalculateInterval(); } } - + /** * Recalculate the minimum width "from scratch". - * + * * @return The minimum width. */ private double recalculateInterval() { @@ -400,12 +400,12 @@ } return result; } - + /** * Calculates the interval width for a given series. - * + * * @param series the series index. - * + * * @return The interval width. */ private double calculateIntervalForSeries(int series) { @@ -421,41 +421,41 @@ } return result; } - + /** * Tests the delegate 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 IntervalXYDelegate)) { - return false; + return false; } IntervalXYDelegate that = (IntervalXYDelegate) obj; if (this.autoWidth != that.autoWidth) { - return false; + return false; } if (this.intervalPositionFactor != that.intervalPositionFactor) { - return false; + return false; } if (this.fixedIntervalWidth != that.fixedIntervalWidth) { - return false; + return false; } return true; } - + /** * @return A clone of this delegate. - * + * * @throws CloneNotSupportedException if the object cannot be cloned. */ public Object clone() throws CloneNotSupportedException { return super.clone(); } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ----------------------- * IntervalXYZDataset.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): -; @@ -40,9 +40,8 @@ package org.jfree.data.xy; - /** - * An extension of the {@link XYZDataset} interface that allows a range of data + * An extension of the {@link XYZDataset} interface that allows a range of data * to be defined for any of the X values, the Y values, and the Z values. */ public interface IntervalXYZDataset extends XYZDataset { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ----------------- * MatrixSeries.java * ----------------- - * (C) Copyright 2003-2007, by Barak Naveh and Contributors. + * (C) Copyright 2003-2008, by Barak Naveh and Contributors. * * Original Author: Barak Naveh; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -37,7 +37,7 @@ * ------- * 10-Jul-2003 : Version 1 contributed by Barak Naveh (DG); * 10-Feb-2004 : Fixed Checkstyle complaints (DG); - * 21-May-2004 : Fixed bug 940188 - problem in getItemColumn() and + * 21-May-2004 : Fixed bug 940188 - problem in getItemColumn() and * getItemRow() (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- * 27-Nov-2006 : Fixed bug in equals() method (DG); @@ -56,10 +56,10 @@ * value (default is 0). */ public class MatrixSeries extends Series implements Serializable { - + /** For serialization. */ - private static final long serialVersionUID = 7934188527308315704L; - + private static final long serialVersionUID = 7934188527308315704L; + /** Series matrix values */ protected double[][] data; @@ -96,7 +96,7 @@ * @param itemIndex item index. * * @return The matrix item at the specified index. - * + * * @see #get(int, int) */ public Number getItem(int itemIndex) { @@ -162,7 +162,7 @@ * @param j the column of the item. * * @return The value of the specified item in this matrix series. - * + * * @see #getItem(int) * @see #update(int, int, double) */ @@ -177,7 +177,7 @@ * @param i the row of the item. * @param j the column of the item. * @param mij the new value for the item. - * + * * @see #get(int, int) */ public void update(int i, int j, double mij) { @@ -187,8 +187,8 @@ /** - * Sets all matrix values to zero and sends a - * {@link org.jfree.data.general.SeriesChangeEvent} to all registered + * Sets all matrix values to zero and sends a + * {@link org.jfree.data.general.SeriesChangeEvent} to all registered * listeners. */ public void zeroAll() { @@ -202,17 +202,17 @@ } fireSeriesChanged(); } - + /** * Tests this object 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 MatrixSeries)) { return false; @@ -222,7 +222,7 @@ return false; } if (!(getColumnsCount() == that.getColumnsCount())) { - return false; + return false; } for (int r = 0; r < getRowCount(); r++) { for (int c = 0; c < getColumnsCount(); c++) { @@ -233,5 +233,5 @@ } return super.equals(obj); } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * --------------------------- * NormalizedMatrixSeries.java * --------------------------- - * (C) Copyright 2003-2007, by Barak Naveh and Contributors. + * (C) Copyright 2003-2008, by Barak Naveh and Contributors. * * Original Author: Barak Naveh; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -38,10 +38,9 @@ * 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG); * */ - + package org.jfree.data.xy; - /** * Represents a dense normalized matrix M[i,j] where each Mij item of the * matrix has a value (default is 0). When a matrix item is observed using @@ -49,12 +48,12 @@ * total sum of all items. It can be also be scaled by setting a scale factor. */ public class NormalizedMatrixSeries extends MatrixSeries { - + /** The default scale factor. */ public static final double DEFAULT_SCALE_FACTOR = 1.0; /** - * A factor that multiplies each item in this series when observed using + * A factor that multiplies each item in this series when observed using * getItem method. */ private double m_scaleFactor = DEFAULT_SCALE_FACTOR; @@ -83,11 +82,11 @@ /** * Returns an item. - * + * * @param itemIndex the index. - * + * * @return The value. - * + * * @see org.jfree.data.xy.MatrixSeries#getItem(int) */ public Number getItem(int itemIndex) { @@ -131,7 +130,7 @@ * @param i the row of the item. * @param j the column of the item. * @param mij the new value for the item. - * + * * @see #get(int, int) */ public void update(int i, int j, double mij) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ----------------- * OHLCDataItem.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,37 +45,37 @@ import java.util.Date; /** - * Represents a single (open-high-low-close) data item in - * an {@link DefaultOHLCDataset}. This data item is commonly used - * to summarise the trading activity of a financial commodity for + * Represents a single (open-high-low-close) data item in + * an {@link DefaultOHLCDataset}. This data item is commonly used + * to summarise the trading activity of a financial commodity for * a fixed period (most often one day). */ public class OHLCDataItem implements Comparable, Serializable { - + /** For serialization. */ private static final long serialVersionUID = 7753817154401169901L; - + /** The date. */ private Date date; - + /** The open value. */ private Number open; /** The high value. */ private Number high; - + /** The low value. */ private Number low; - + /** The close value. */ private Number close; - + /** The trading volume (number of shares, contracts or whatever). */ private Number volume; /** * Creates a new item. - * + * * @param date the date (<code>null</code> not permitted). * @param open the open value. * @param high the high value. @@ -83,10 +83,10 @@ * @param close the close value. * @param volume the volume. */ - public OHLCDataItem(Date date, - double open, - double high, - double low, + public OHLCDataItem(Date date, + double open, + double high, + double low, double close, double volume) { if (date == null) { @@ -99,102 +99,102 @@ this.close = new Double(close); this.volume = new Double(volume); } - + /** * Returns the date that the data item relates to. - * + * * @return The date (never <code>null</code>). */ public Date getDate() { return this.date; } - + /** * Returns the open value. - * + * * @return The open value. */ public Number getOpen() { return this.open; } - + /** * Returns the high value. - * + * * @return The high value. */ public Number getHigh() { return this.high; } - + /** * Returns the low value. - * + * * @return The low value. */ public Number getLow() { return this.low; } - + /** * Returns the close value. - * + * * @return The close value. */ public Number getClose() { return this.close; } - + /** * Returns the volume. - * + * * @return The volume. */ public Number getVolume() { return this.volume; } - + /** * Checks 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 OHLCDataItem)) { return false; } OHLCDataItem that = (OHLCDataItem) obj; if (!this.date.equals(that.date)) { - return false; + return false; } if (!this.high.equals(that.high)) { return false; } if (!this.low.equals(that.low)) { - return false; + return false; } if (!this.open.equals(that.open)) { - return false; + return false; } if (!this.close.equals(that.close)) { - return false; + return false; } return true; } - + /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less * than, equal to, or greater than the specified object. - * + * * @param object the object to compare to. - * - * @return A negative integer, zero, or a positive integer as this object + * + * @return A negative integer, zero, or a positive integer as this object * is less than, equal to, or greater than the specified object. */ public int compareTo(Object object) { @@ -206,5 +206,5 @@ throw new ClassCastException("OHLCDataItem.compareTo()."); } } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ---------------- * OHLCDataset.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): Sylvain Vieujot; @@ -37,19 +37,19 @@ * 18-Sep-2001 : Updated header info (DG); * 16-Oct-2001 : Moved to package com.jrefinery.data.* (DG); * 22-Oct-2001 : Renamed DataSource.java --> Dataset.java etc. (DG); - * 05-Feb-2002 : Added getVolumeValue() method, as requested by Sylvain + * 05-Feb-2002 : Added getVolumeValue() method, as requested by Sylvain * Vieujot (DG); * 05-May-2004 : Added methods that return double primitives (DG); - * 26-Jul-2004 : Switched names of methods that return Number vs + * 26-Jul-2004 : Switched names of methods that return Number vs * primitives (DG); * 06-Sep-2004 : Renamed HighLowDataset --> OHLCDataset (DG); - * + * */ package org.jfree.data.xy; /** - * An interface that defines data in the form of (x, high, low, open, close) + * An interface that defines data in the form of (x, high, low, open, close) * tuples. */ public interface OHLCDataset extends XYDataset { @@ -65,16 +65,16 @@ public Number getHigh(int series, int item); /** - * Returns the high-value (as a double primitive) for an item within a + * Returns the high-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The high-value. */ public double getHighValue(int series, int item); - + /** * Returns the low-value for the specified series and item. * @@ -86,16 +86,16 @@ public Number getLow(int series, int item); /** - * Returns the low-value (as a double primitive) for an item within a + * Returns the low-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The low-value. */ public double getLowValue(int series, int item); - + /** * Returns the open-value for the specified series and item. * @@ -107,16 +107,16 @@ public Number getOpen(int series, int item); /** - * Returns the open-value (as a double primitive) for an item within a + * Returns the open-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The open-value. */ public double getOpenValue(int series, int item); - + /** * Returns the y-value for the specified series and item. * @@ -128,16 +128,16 @@ public Number getClose(int series, int item); /** - * Returns the close-value (as a double primitive) for an item within a + * Returns the close-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The close-value. */ public double getCloseValue(int series, int item); - + /** * Returns the volume for the specified series and item. * @@ -147,16 +147,16 @@ * @return The value. */ public Number getVolume(int series, int item); - + /** - * Returns the volume-value (as a double primitive) for an item within a + * Returns the volume-value (as a double primitive) for an item within a * series. - * + * * @param series the series (zero-based index). * @param item the item (zero-based index). - * + * * @return The volume-value. */ public double getVolumeValue(int series, int item); - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -2,52 +2,52 @@ * 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.] * * ------------------- * TableXYDataset.java * ------------------- - * (C) Copyright 2000-2007, by Richard Atkinson and Contributors. + * (C) Copyright 2000-2008, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributor(s): David Gilbert (for Object Refinery Limited); * * Changes * ------- - * 22-Sep-2003 : Changed to be an interface. Previous functionality moved to + * 22-Sep-2003 : Changed to be an interface. Previous functionality moved to * DefaultTableXYDataset; * 16-Feb-2004 : Updated Javadocs (DG); - * + * */ package org.jfree.data.xy; /** - * A dataset containing one or more data series containing (x, y) data items, - * where all series in the dataset share the same set of x-values. This is a + * A dataset containing one or more data series containing (x, y) data items, + * where all series in the dataset share the same set of x-values. This is a * restricted form of the {@link XYDataset} interface (which allows independent - * x-values between series). This is used primarily by the + * x-values between series). This is used primarily by the * {@link org.jfree.chart.renderer.xy.StackedXYAreaRenderer}. */ public interface TableXYDataset extends XYDataset { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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.] * * ----------- * Vector.java * ----------- - * (C) Copyright 2007, by Object Refinery Limited. + * (C) Copyright 2007, 2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -35,7 +35,7 @@ * Changes * ------- * 30-Jan-2007 : Version 1 (DG); - * 24-May-2007 : Added getLength() and getAngle() methods, thanks to + * 24-May-2007 : Added getLength() and getAngle() methods, thanks to * matinh (DG); * 25-May-2007 : Moved from experimental to the main source tree (DG); * @@ -47,58 +47,58 @@ /** * A vector. - * + * * @since 1.0.6 */ public class Vector implements Serializable { - + /** The vector x. */ private double x; - + /** The vector y. */ private double y; - - /** + + /** * Creates a new instance of <code>Vector</code>. * * @param x the x-component. - * @param y the y-component. + * @param y the y-component. */ public Vector(double x, double y) { this.x = x; this.y = y; } - + /** * Returns the x-value. - * + * * @return The x-value. */ public double getX() { return this.x; } - + /** * Returns the y-value. - * + * * @return The y-value. */ public double getY() { return this.y; } - + /** * Returns the length of the vector. - * + * * @return The vector length. */ public double getLength() { return Math.sqrt((this.x * this.x) + (this.y * this.y)); } - + /** * Returns the angle of the vector. - * + * * @return The angle of the vector. */ public double getAngle() { @@ -107,9 +107,9 @@ /** * Tests this vector for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> not permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { @@ -131,7 +131,7 @@ /** * Returns a hash code for this instance. - * + * * @return A hash code. */ public int hashCode() { @@ -142,5 +142,5 @@ result = 37 * result + (int) (temp ^ (temp >>> 32)); return result; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java 2008-07-21 14:14:49 UTC (rev 1306) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java 2008-07-21 14:20:41 UTC (rev 1307) @@ -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. * - * ... [truncated message content] |
From: <mu...@us...> - 2008-07-21 14:29:06
|
Revision: 1308 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1308&view=rev Author: mungady Date: 2008-07-21 14:28:58 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Whitespace. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * -------------------- * VectorXYDataset.java * -------------------- - * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -44,46 +44,44 @@ package org.jfree.data.xy; - - /** * An extension of the {@link XYDataset} interface that allows a vector to be * defined at a specific (x, y) location. - * + * * @since 1.0.6 */ public interface VectorXYDataset extends XYDataset { /** * Returns the x-component of the vector for an item in a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The x-component of the vector. */ public double getVectorXValue(int series, int item); /** * Returns the y-component of the vector for an item in a series. - * + * * @param series the series index. * @param item the item index. - * + * * @return The y-component of the vector. */ public double getVectorYValue(int series, int item); - + /** * Returns the vector for an item in a series. Depending on the particular * dataset implementation, this may involve creating a new {@link Vector} * instance --- if you are just interested in the x and y components, - * use the {@link #getVectorXValue(int, int)} and + * use the {@link #getVectorXValue(int, int)} and * {@link #getVectorYValue(int, int)} methods instead. - * + * * @param series the series index. * @param item the item index. - * + * * @return The vector (possibly <code>null</code>). */ public Vector getVector(int series, int item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -2,39 +2,39 @@ * 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.] * * ---------------- * WindDataset.java * ---------------- - * (C) Copyright 2001-2007, by Achilleus Mantzios and Contributors. + * (C) Copyright 2001-2008, by Achilleus Mantzios and Contributors. * * Original Author: Achilleus Mantzios; * Contributor(s): David Gilbert (for Object Refinery Limited); * * Changes * ------- - * 06-Feb-2002 : Version 1, based on code contributed by Achilleus + * 06-Feb-2002 : Version 1, based on code contributed by Achilleus * Mantzios (DG); * */ @@ -48,14 +48,14 @@ public interface WindDataset extends XYDataset { /** - * Returns the wind direction (should be in the range 0 to 12, + * Returns the wind direction (should be in the range 0 to 12, * corresponding to the positions on an upside-down clock face). - * - * @param series the series (in the range <code>0</code> to + * + * @param series the series (in the range <code>0</code> to * <code>getSeriesCount() - 1</code>). - * @param item the item (in the range <code>0</code> to + * @param item the item (in the range <code>0</code> to * <code>getItemCount(series) - 1</code>). - * + * * @return The wind direction. */ public Number getWindDirection(int series, int item); @@ -64,12 +64,12 @@ * Returns the wind force on the Beaufort scale (0 to 12). See: * <p> * http://en.wikipedia.org/wiki/Beaufort_scale - * - * @param series the series (in the range <code>0</code> to + * + * @param series the series (in the range <code>0</code> to * <code>getSeriesCount() - 1</code>). - * @param item the item (in the range <code>0</code> to + * @param item the item (in the range <code>0</code> to * <code>getItemCount(series) - 1</code>). - * + * * @return The wind force. */ public Number getWindForce(int series, int item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * ---------------------- * XIntervalDataItem.java * ---------------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,7 +49,7 @@ */ public class XIntervalDataItem extends ComparableObjectItem { - /** + /** * Creates a new instance of <code>XIntervalDataItem</code>. * * @param x the x-value. @@ -60,7 +60,7 @@ public XIntervalDataItem(double x, double xLow, double xHigh, double y) { super(new Double(x), new YWithXInterval(y, xLow, xHigh)); } - + /** * Returns the x-value. * @@ -69,7 +69,7 @@ public Number getX() { return (Number) getComparable(); } - + /** * Returns the y-value. * @@ -84,7 +84,7 @@ return Double.NaN; } } - + /** * Returns the lower bound of the x-interval. * @@ -99,7 +99,7 @@ return Double.NaN; } } - + /** * Returns the upper bound of the x-interval. * @@ -114,5 +114,5 @@ return Double.NaN; } } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * ----------------- * XYCoordinate.java * ----------------- - * (C) Copyright 2007, by Object Refinery Limited and Contributors. + * (C) Copyright 2007, 2008, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -45,27 +45,27 @@ /** * Represents an (x, y) coordinate. - * + * * @since 1.0.6 */ public class XYCoordinate implements Comparable, Serializable { /** The x-coordinate. */ private double x; - + /** The y-coordinate. */ private double y; - + /** * Creates a new coordinate for the point (0.0, 0.0). */ public XYCoordinate() { this(0.0, 0.0); } - + /** * Creates a new coordinate for the point (x, y). - * + * * @param x the x-coordinate. * @param y the y-coordinate. */ @@ -73,19 +73,19 @@ this.x = x; this.y = y; } - + /** * Returns the x-coordinate. - * + * * @return The x-coordinate. */ public double getX() { return this.x; } - + /** * Returns the y-coordinate. - * + * * @return The y-coordinate. */ public double getY() { @@ -94,9 +94,9 @@ /** * Tests this coordinate for equality with an arbitrary object. - * + * * @param obj the object (<code>null</code> permitted). - * + * * @return A boolean. */ public boolean equals(Object obj) { @@ -118,7 +118,7 @@ /** * Returns a hash code for this instance. - * + * * @return A hash code. */ public int hashCode() { @@ -131,9 +131,9 @@ } /** - * Returns a string representation of this instance, primarily for + * Returns a string representation of this instance, primarily for * debugging purposes. - * + * * @return A string. */ public String toString() { @@ -141,10 +141,10 @@ } /** - * Compares this instance against an arbitrary object. - * + * Compares this instance against an arbitrary object. + * * @param obj the object (<code>null</code> not permitted). - * + * * @return An integer indicating the relative order of the items. */ public int compareTo(Object obj) { @@ -168,5 +168,5 @@ } return 0; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * --------------- * XYDataItem.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): -; @@ -38,9 +38,9 @@ * 03-Feb-2004 : Fixed bug in equals() method (DG); * 21-Feb-2005 : Added setY(double) method (DG); * ------------- JFREECHART 1.0.x --------------------------------------------- - * 30-Nov-2007 : Implemented getXValue() and getYValue(), plus toString() for + * 30-Nov-2007 : Implemented getXValue() and getYValue(), plus toString() for * debugging use (DG); - * + * */ package org.jfree.data.xy; @@ -56,7 +56,7 @@ /** For serialization. */ private static final long serialVersionUID = 2751513470325494890L; - + /** The x-value (<code>null</code> not permitted). */ private Number x; @@ -95,15 +95,15 @@ public Number getX() { return this.x; } - + /** * Returns the x-value as a double primitive. - * + * * @return The x-value. - * + * * @see #getX() * @see #getYValue() - * + * * @since 1.0.9 */ public double getXValue() { @@ -119,15 +119,15 @@ public Number getY() { return this.y; } - + /** * Returns the y-value as a double primitive. - * + * * @return The y-value. - * + * * @see #getY() * @see #getXValue() - * + * * @since 1.0.9 */ public double getYValue() { @@ -139,17 +139,17 @@ } /** - * Sets the y-value for this data item. Note that there is no + * Sets the y-value for this data item. Note that there is no * corresponding method to change the x-value. * * @param y the new y-value. */ public void setY(double y) { - setY(new Double(y)); + setY(new Double(y)); } - + /** - * Sets the y-value for this data item. Note that there is no + * Sets the y-value for this data item. Note that there is no * corresponding method to change the x-value. * * @param y the new y-value (<code>null</code> permitted). @@ -159,7 +159,7 @@ } /** - * Returns an integer indicating the order of this object relative to + * Returns an integer indicating the order of this object relative to * another object. * <P> * For the order we consider only the x-value: @@ -178,7 +178,7 @@ // ------------------------------------------------------- if (o1 instanceof XYDataItem) { XYDataItem dataItem = (XYDataItem) o1; - double compare = this.x.doubleValue() + double compare = this.x.doubleValue() - dataItem.getX().doubleValue(); if (compare > 0.0) { result = 1; @@ -208,14 +208,14 @@ * Returns a clone of this object. * * @return A clone. - * - * @throws CloneNotSupportedException not thrown by this class, but + * + * @throws CloneNotSupportedException not thrown by this class, but * subclasses may differ. */ public Object clone() throws CloneNotSupportedException { return super.clone(); } - + /** * Tests if this object is equal to another. * @@ -238,12 +238,12 @@ if (!ObjectUtilities.equal(this.y, that.y)) { return false; } - return true; + return true; } /** * Returns a hash code. - * + * * @return A hash code. */ public int hashCode() { @@ -252,15 +252,15 @@ result = 29 * result + (this.y != null ? this.y.hashCode() : 0); return result; } - + /** * Returns a string representing this instance, primarily for debugging * use. - * + * * @return A string. */ public String toString() { return "[" + getXValue() + ", " + getYValue() + "]"; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * -------------- * XYDataset.java * -------------- - * (C) Copyright 2000-2007, by Object Refinery Limited. + * (C) Copyright 2000-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -38,11 +38,11 @@ * 15-Oct-2001 : Moved to a new package (com.jrefinery.data.*) (DG); * 22-Oct-2001 : Renamed DataSource.java --> Dataset.java etc. (DG); * 17-Nov-2001 : Now extends SeriesDataset (DG); - * 15-Jul-2004 : Switched getX() with getXValue() and getY() with + * 15-Jul-2004 : Switched getX() with getXValue() and getY() with * getYValue() (DG); * 29-Jul-2004 : Added getDomainOrder() method (DG); * 18-Aug-2004 : Moved from org.jfree.data --> org.jfree.data.xy (DG); - * + * */ package org.jfree.data.xy; @@ -57,19 +57,19 @@ /** * Returns the order of the domain (or X) values returned by the dataset. - * + * * @return The order (never <code>null</code>). */ public DomainOrder getDomainOrder(); - + /** * Returns the number of items in a series. * <br><br> - * It is recommended that classes that implement this method should throw - * an <code>IllegalArgumentException</code> if the <code>series</code> - * argument is outside the specified range. + * It is recommended that classes that implement this method should throw + * an <code>IllegalArgumentException</code> if the <code>series</code> + * argument is outside the specified range. * - * @param series the series index (in the range <code>0</code> to + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</code>). * * @return The item count. @@ -77,13 +77,13 @@ public int getItemCount(int series); /** - * Returns the x-value for an item within a series. The x-values may or - * may not be returned in ascending order, that is up to the class + * Returns the x-value for an item within a series. The x-values may or + * may not be returned in ascending order, that is up to the class * implementing the interface. * - * @param series the series index (in the range <code>0</code> to + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). * * @return The x-value (never <code>null</code>). @@ -92,22 +92,22 @@ /** * Returns the x-value for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The x-value. */ public double getXValue(int series, int item); - + /** * Returns the y-value for an item within a series. * - * @param series the series index (in the range <code>0</code> to + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). * * @return The y-value (possibly <code>null</code>). @@ -116,14 +116,14 @@ /** * Returns the y-value (as a double primitive) for an item within a series. - * - * @param series the series index (in the range <code>0</code> to + * + * @param series the series index (in the range <code>0</code> to * <code>getSeriesCount() - 1</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(series)</code>). - * + * * @return The y-value. */ public double getYValue(int series, int item); - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * ------------------------ * XYDatasetTableModel.java * ------------------------ - * (C)opyright 2003-2007, by Bryan Scott and Contributors. + * (C)opyright 2003-2008, by Bryan Scott and Contributors. * * Original Author: Bryan Scott ; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -39,7 +39,7 @@ * assumes all series share the same x-values, and this is not * enforced by XYDataset. Also fixed bug 1191046, a problem * in the getValueAt() method (DG); - * + * */ package org.jfree.data.xy; @@ -63,7 +63,7 @@ * </ul> */ public class XYDatasetTableModel extends AbstractTableModel - implements TableModel, DatasetChangeListener { + implements TableModel, DatasetChangeListener { /** The dataset. */ TableXYDataset model = null; @@ -211,11 +211,11 @@ // // XYSeries s1 = new XYSeries("Series 1", true, false); // for (int i = 0; i < 10; i++) { -// s1.add(i, Math.random()); +// s1.add(i, Math.random()); // } // XYSeries s2 = new XYSeries("Series 2", true, false); // for (int i = 0; i < 15; i++) { -// s2.add(i, Math.random()); +// s2.add(i, Math.random()); // } // DefaultTableXYDataset dataset = new DefaultTableXYDataset(); // dataset.addSeries(s1); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -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.] * * --------------- * XYInterval.java * --------------- - * (C) Copyright 2006, 2007, by Object Refinery Limited. + * (C) Copyright 2006-2008, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -43,38 +43,38 @@ import java.io.Serializable; /** - * An xy-interval. This class is used internally by the + * An xy-interval. This class is used internally by the * {@link XYIntervalDataItem} class. * * @since 1.0.3 */ public class XYInterval implements Serializable { - + /** The lower bound of the x-interval. */ private double xLow; - + /** The upper bound of the y-interval. */ private double xHigh; - + /** The y-value. */ private double y; - + /** The lower bound of the y-interval. */ private double yLow; - + /** The upper bound of the y-interval. */ private double yHigh; - - /** + + /** * Creates a new instance of <code>XYInterval</code>. * * @param xLow the lower bound of the x-interval. * @param xHigh the upper bound of the y-interval. * @param y the y-value. * @param yLow the lower bound of the y-interval. - * @param yHigh the upper bound of the y-interval. + * @param yHigh the upper bound of the y-interval. */ - public XYInterval(double xLow, double xHigh, double y, double yLow, + public XYInterval(double xLow, double xHigh, double y, double yLow, double yHigh) { this.xLow = xLow; this.xHigh = xHigh; @@ -82,7 +82,7 @@ this.yLow = yLow; this.yHigh = yHigh; } - + /** * Returns the lower bound of the x-interval. * @@ -91,7 +91,7 @@ public double getXLow() { return this.xLow; } - + /** * Returns the upper bound of the x-interval. * @@ -109,7 +109,7 @@ public double getY() { return this.y; } - + /** * Returns the lower bound of the y-interval. * @@ -118,7 +118,7 @@ public double getYLow() { return this.yLow; } - + /** * Returns the upper bound of the y-interval. * @@ -127,7 +127,7 @@ public double getYHigh() { return this.yHigh; } - + /** * Tests this instance for equality with an arbitrary object. * @@ -160,5 +160,5 @@ } return true; } - + } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2008-07-21 14:20:41 UTC (rev 1307) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2008-07-21 14:28:58 UTC (rev 1308) @@ -2,26 +2,26 @@ * 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.] * * ---------------- @@ -74,5 +74,5 @@ * @return The symbolic value. */ public String getXSymbolicValue(Integer val); - + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2008-07-21 15:08:11
|
Revision: 1312 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1312&view=rev Author: mungady Date: 2008-07-21 15:08:08 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Updated source header. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2008-07-21 15:01:20 UTC (rev 1311) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2008-07-21 15:08:08 UTC (rev 1312) @@ -27,6 +27,7 @@ * ---------------- * XisSymbolic.java * ---------------- + * (C) Copyright 2006-2008, by Anthony Boulestreau and Contributors. * * Original Author: Anthony Boulestreau; * Contributor(s): David Gilbert (for Object Refinery Limited); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java 2008-07-21 15:01:20 UTC (rev 1311) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java 2008-07-21 15:08:08 UTC (rev 1312) @@ -27,6 +27,7 @@ * ---------------- * YisSymbolic.java * ---------------- + * (C) Copyright 2006-2008, by Anthony Boulestreau and Contributors. * * Original Author: Anthony Boulestreau; * Contributor(s): David Gilbert (for Object Refinery Limited); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2011-10-30 18:58:41
|
Revision: 2390 http://jfreechart.svn.sourceforge.net/jfreechart/?rev=2390&view=rev Author: mungady Date: 2011-10-30 18:58:33 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Update headers for Oracle trademarks. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDomainInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYRangeInfo.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YisSymbolic.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------ * AbstractIntervalXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * AbstractXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * AbstractXYZDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * CategoryTableXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------------- * DefaultHighLowDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------------- * DefaultIntervalXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * DefaultOHLCDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------------- * DefaultTableXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * DefaultWindDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * DefaultXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * DefaultXYZDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * IntervalXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * IntervalXYDelegate.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYZDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * IntervalXYZDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * MatrixSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * MatrixSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * NormalizedMatrixSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * OHLCDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * OHLCDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/TableXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * TableXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------- * Vector.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------- * VectorDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * VectorSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------------- * VectorSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorXYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * VectorXYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/WindDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * WindDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * XIntervalDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * XIntervalSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------ * XIntervalSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * XYBarDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * XYCoordinate.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * XYDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------- * XYDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------ * XYDatasetTableModel.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDomainInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDomainInfo.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDomainInfo.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------- * XYDomainInfo.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * XYInterval.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * XYIntervalDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------------- * XYIntervalSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------- * XYIntervalSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYRangeInfo.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYRangeInfo.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYRangeInfo.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2009, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * XYRangeInfo.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------- * XYSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ----------------------- * XYSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYZDataset.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * --------------- * XYZDataset.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XisSymbolic.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------- * XisSymbolic.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------- * YInterval.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalDataItem.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ---------------------- * YIntervalDataItem.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * -------------------- * YIntervalSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java 2011-10-30 18:53:01 UTC (rev 2389) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java 2011-10-30 18:58:33 UTC (rev 2390) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2011, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] + * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners.] * * ------------------------------ * YIntervalSeriesCollection.java Mod... [truncated message content] |
From: <mu...@us...> - 2013-11-22 20:17:26
|
Revision: 3046 http://sourceforge.net/p/jfreechart/code/3046 Author: mungady Date: 2013-11-22 20:17:23 +0000 (Fri, 22 Nov 2013) Log Message: ----------- Fixed NB warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YInterval.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeriesCollection.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YWithXInterval.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractIntervalXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -60,6 +60,7 @@ * * @return The value. */ + @Override public double getStartXValue(int series, int item) { double result = Double.NaN; Number x = getStartX(series, item); @@ -78,6 +79,7 @@ * * @return The value. */ + @Override public double getEndXValue(int series, int item) { double result = Double.NaN; Number x = getEndX(series, item); @@ -96,6 +98,7 @@ * * @return The value. */ + @Override public double getStartYValue(int series, int item) { double result = Double.NaN; Number y = getStartY(series, item); @@ -114,6 +117,7 @@ * * @return The value. */ + @Override public double getEndYValue(int series, int item) { double result = Double.NaN; Number y = getEndY(series, item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -58,6 +58,7 @@ * * @return The domain order. */ + @Override public DomainOrder getDomainOrder() { return DomainOrder.NONE; } @@ -70,6 +71,7 @@ * * @return The value. */ + @Override public double getXValue(int series, int item) { double result = Double.NaN; Number x = getX(series, item); @@ -87,6 +89,7 @@ * * @return The value. */ + @Override public double getYValue(int series, int item) { double result = Double.NaN; Number y = getY(series, item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/AbstractXYZDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -56,6 +56,7 @@ * * @return The z-value. */ + @Override public double getZValue(int series, int item) { double result = Double.NaN; Number z = getZ(series, item); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -158,6 +158,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.values.getColumnCount(); } @@ -169,6 +170,7 @@ * * @return The key for a series. */ + @Override public Comparable getSeriesKey(int series) { return this.values.getColumnKey(series); } @@ -178,6 +180,7 @@ * * @return The item count. */ + @Override public int getItemCount() { return this.values.getRowCount(); } @@ -190,6 +193,7 @@ * * @return The item count. */ + @Override public int getItemCount(int series) { return getItemCount(); // all series have the same number of items in // this dataset @@ -203,6 +207,7 @@ * * @return The value. */ + @Override public Number getX(int series, int item) { return (Number) this.values.getRowKey(item); } @@ -215,6 +220,7 @@ * * @return The starting X value. */ + @Override public Number getStartX(int series, int item) { return this.intervalDelegate.getStartX(series, item); } @@ -227,6 +233,7 @@ * * @return The ending X value. */ + @Override public Number getEndX(int series, int item) { return this.intervalDelegate.getEndX(series, item); } @@ -239,6 +246,7 @@ * * @return The y value (possibly <code>null</code>). */ + @Override public Number getY(int series, int item) { return this.values.getValue(item, series); } @@ -251,6 +259,7 @@ * * @return The starting Y value. */ + @Override public Number getStartY(int series, int item) { return getY(series, item); } @@ -263,6 +272,7 @@ * * @return The ending Y value. */ + @Override public Number getEndY(int series, int item) { return getY(series, item); } @@ -275,6 +285,7 @@ * * @return The minimum value. */ + @Override public double getDomainLowerBound(boolean includeInterval) { return this.intervalDelegate.getDomainLowerBound(includeInterval); } @@ -287,6 +298,7 @@ * * @return The maximum value. */ + @Override public double getDomainUpperBound(boolean includeInterval) { return this.intervalDelegate.getDomainUpperBound(includeInterval); } @@ -299,6 +311,7 @@ * * @return The range. */ + @Override public Range getDomainBounds(boolean includeInterval) { if (includeInterval) { return this.intervalDelegate.getDomainBounds(includeInterval); @@ -377,6 +390,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (!(obj instanceof CategoryTableXYDataset)) { return false; @@ -399,6 +413,7 @@ * @throws CloneNotSupportedException if there is some reason that cloning * cannot be performed. */ + @Override public Object clone() throws CloneNotSupportedException { CategoryTableXYDataset clone = (CategoryTableXYDataset) super.clone(); clone.values = (DefaultKeyedValues2D) this.values.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultHighLowDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -123,6 +123,7 @@ * * @return The series key (never <code>null</code>). */ + @Override public Comparable getSeriesKey(int series) { return this.seriesKey; } @@ -141,6 +142,7 @@ * @see #getXValue(int, int) * @see #getXDate(int, int) */ + @Override public Number getX(int series, int item) { return new Long(this.date[item].getTime()); } @@ -174,6 +176,7 @@ * * @see #getYValue(int, int) */ + @Override public Number getY(int series, int item) { return getClose(series, item); } @@ -188,6 +191,7 @@ * * @see #getHighValue(int, int) */ + @Override public Number getHigh(int series, int item) { return this.high[item]; } @@ -203,11 +207,12 @@ * * @see #getHigh(int, int) */ + @Override public double getHighValue(int series, int item) { double result = Double.NaN; - Number high = getHigh(series, item); - if (high != null) { - result = high.doubleValue(); + Number h = getHigh(series, item); + if (h != null) { + result = h.doubleValue(); } return result; } @@ -222,6 +227,7 @@ * * @see #getLowValue(int, int) */ + @Override public Number getLow(int series, int item) { return this.low[item]; } @@ -237,11 +243,12 @@ * * @see #getLow(int, int) */ + @Override public double getLowValue(int series, int item) { double result = Double.NaN; - Number low = getLow(series, item); - if (low != null) { - result = low.doubleValue(); + Number l = getLow(series, item); + if (l != null) { + result = l.doubleValue(); } return result; } @@ -256,6 +263,7 @@ * * @see #getOpenValue(int, int) */ + @Override public Number getOpen(int series, int item) { return this.open[item]; } @@ -271,6 +279,7 @@ * * @see #getOpen(int, int) */ + @Override public double getOpenValue(int series, int item) { double result = Double.NaN; Number open = getOpen(series, item); @@ -290,6 +299,7 @@ * * @see #getCloseValue(int, int) */ + @Override public Number getClose(int series, int item) { return this.close[item]; } @@ -305,11 +315,12 @@ * * @see #getClose(int, int) */ + @Override public double getCloseValue(int series, int item) { double result = Double.NaN; - Number close = getClose(series, item); - if (close != null) { - result = close.doubleValue(); + Number c = getClose(series, item); + if (c != null) { + result = c.doubleValue(); } return result; } @@ -324,6 +335,7 @@ * * @see #getVolumeValue(int, int) */ + @Override public Number getVolume(int series, int item) { return this.volume[item]; } @@ -339,11 +351,12 @@ * * @see #getVolume(int, int) */ + @Override public double getVolumeValue(int series, int item) { double result = Double.NaN; - Number volume = getVolume(series, item); - if (volume != null) { - result = volume.doubleValue(); + Number v = getVolume(series, item); + if (v != null) { + result = v.doubleValue(); } return result; } @@ -355,6 +368,7 @@ * * @return The number of series. */ + @Override public int getSeriesCount() { return 1; } @@ -366,6 +380,7 @@ * * @return The number of items in the specified series. */ + @Override public int getItemCount(int series) { return this.date.length; } @@ -377,6 +392,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultIntervalXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -92,6 +92,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.seriesList.size(); } @@ -107,6 +108,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public Comparable getSeriesKey(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -125,6 +127,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public int getItemCount(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -150,6 +153,7 @@ * * @see #getX(int, int) */ + @Override public double getXValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[0][item]; @@ -172,6 +176,7 @@ * * @see #getY(int, int) */ + @Override public double getYValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[3][item]; @@ -194,6 +199,7 @@ * * @see #getStartX(int, int) */ + @Override public double getStartXValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[1][item]; @@ -216,6 +222,7 @@ * * @see #getEndX(int, int) */ + @Override public double getEndXValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[2][item]; @@ -238,6 +245,7 @@ * * @see #getStartY(int, int) */ + @Override public double getStartYValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[4][item]; @@ -260,6 +268,7 @@ * * @see #getEndY(int, int) */ + @Override public double getEndYValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[5][item]; @@ -282,6 +291,7 @@ * * @see #getEndXValue(int, int) */ + @Override public Number getEndX(int series, int item) { return new Double(getEndXValue(series, item)); } @@ -303,6 +313,7 @@ * * @see #getEndYValue(int, int) */ + @Override public Number getEndY(int series, int item) { return new Double(getEndYValue(series, item)); } @@ -324,6 +335,7 @@ * * @see #getStartXValue(int, int) */ + @Override public Number getStartX(int series, int item) { return new Double(getStartXValue(series, item)); } @@ -345,6 +357,7 @@ * * @see #getStartYValue(int, int) */ + @Override public Number getStartY(int series, int item) { return new Double(getStartYValue(series, item)); } @@ -366,6 +379,7 @@ * * @see #getXValue(int, int) */ + @Override public Number getX(int series, int item) { return new Double(getXValue(series, item)); } @@ -387,6 +401,7 @@ * * @see #getYValue(int, int) */ + @Override public Number getY(int series, int item) { return new Double(getYValue(series, item)); } @@ -449,6 +464,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -502,6 +518,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = this.seriesKeys.hashCode(); @@ -517,6 +534,7 @@ * @throws CloneNotSupportedException if the dataset contains a series with * a key that cannot be cloned. */ + @Override public Object clone() throws CloneNotSupportedException { DefaultIntervalXYDataset clone = (DefaultIntervalXYDataset) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -81,6 +81,7 @@ * * @return The series key. */ + @Override public Comparable getSeriesKey(int series) { return this.key; } @@ -93,6 +94,7 @@ * * @return The x-value. */ + @Override public Number getX(int series, int item) { return new Long(this.data[item].getDate().getTime()); } @@ -117,6 +119,7 @@ * * @return The y value. */ + @Override public Number getY(int series, int item) { return getClose(series, item); } @@ -129,6 +132,7 @@ * * @return The high value. */ + @Override public Number getHigh(int series, int item) { return this.data[item].getHigh(); } @@ -142,6 +146,7 @@ * * @return The high-value. */ + @Override public double getHighValue(int series, int item) { double result = Double.NaN; Number high = getHigh(series, item); @@ -159,6 +164,7 @@ * * @return The low value. */ + @Override public Number getLow(int series, int item) { return this.data[item].getLow(); } @@ -172,6 +178,7 @@ * * @return The low-value. */ + @Override public double getLowValue(int series, int item) { double result = Double.NaN; Number low = getLow(series, item); @@ -189,6 +196,7 @@ * * @return The open value. */ + @Override public Number getOpen(int series, int item) { return this.data[item].getOpen(); } @@ -202,6 +210,7 @@ * * @return The open-value. */ + @Override public double getOpenValue(int series, int item) { double result = Double.NaN; Number open = getOpen(series, item); @@ -219,6 +228,7 @@ * * @return The close value. */ + @Override public Number getClose(int series, int item) { return this.data[item].getClose(); } @@ -232,6 +242,7 @@ * * @return The close-value. */ + @Override public double getCloseValue(int series, int item) { double result = Double.NaN; Number close = getClose(series, item); @@ -249,6 +260,7 @@ * * @return The trading volume. */ + @Override public Number getVolume(int series, int item) { return this.data[item].getVolume(); } @@ -262,6 +274,7 @@ * * @return The volume-value. */ + @Override public double getVolumeValue(int series, int item) { double result = Double.NaN; Number volume = getVolume(series, item); @@ -276,6 +289,7 @@ * * @return 1. */ + @Override public int getSeriesCount() { return 1; } @@ -287,6 +301,7 @@ * * @return The item count. */ + @Override public int getItemCount(int series) { return this.data.length; } @@ -305,6 +320,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -329,6 +345,7 @@ * * @throws CloneNotSupportedException */ + @Override public Object clone() throws CloneNotSupportedException { DefaultOHLCDataset clone = (DefaultOHLCDataset) super.clone(); clone.data = new OHLCDataItem[this.data.length]; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -210,6 +210,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.data.size(); } @@ -219,6 +220,7 @@ * * @return The number of x values in the dataset. */ + @Override public int getItemCount() { if (this.xPoints == null) { return 0; @@ -249,6 +251,7 @@ * * @return The key for a series. */ + @Override public Comparable getSeriesKey(int series) { // check arguments...delegated return getSeries(series).getKey(); @@ -261,6 +264,7 @@ * * @return The number of items in the specified series. */ + @Override public int getItemCount(int series) { // check arguments...delegated return getSeries(series).getItemCount(); @@ -274,6 +278,7 @@ * * @return The x-value for the specified series and item. */ + @Override public Number getX(int series, int item) { XYSeries s = (XYSeries) this.data.get(series); return s.getX(item); @@ -288,6 +293,7 @@ * * @return The starting X value. */ + @Override public Number getStartX(int series, int item) { return this.intervalDelegate.getStartX(series, item); } @@ -300,6 +306,7 @@ * * @return The ending X value. */ + @Override public Number getEndX(int series, int item) { return this.intervalDelegate.getEndX(series, item); } @@ -313,6 +320,7 @@ * @return The y-value for the specified series and item (possibly * <code>null</code>). */ + @Override public Number getY(int series, int index) { XYSeries s = (XYSeries) this.data.get(series); return s.getY(index); @@ -326,6 +334,7 @@ * * @return The starting Y value. */ + @Override public Number getStartY(int series, int item) { return getY(series, item); } @@ -338,6 +347,7 @@ * * @return The ending Y value. */ + @Override public Number getEndY(int series, int item) { return getY(series, item); } @@ -463,6 +473,7 @@ * * @param event information about the change. */ + @Override public void seriesChanged(SeriesChangeEvent event) { if (this.propagateEvents) { updateXPoints(); @@ -477,6 +488,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -505,6 +517,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = (this.data != null ? this.data.hashCode() : 0); @@ -523,6 +536,7 @@ * @throws CloneNotSupportedException if there is some reason that cloning * cannot be performed. */ + @Override public Object clone() throws CloneNotSupportedException { DefaultTableXYDataset clone = (DefaultTableXYDataset) super.clone(); int seriesCount = this.data.size(); @@ -550,6 +564,7 @@ * * @return The minimum value. */ + @Override public double getDomainLowerBound(boolean includeInterval) { return this.intervalDelegate.getDomainLowerBound(includeInterval); } @@ -562,6 +577,7 @@ * * @return The maximum value. */ + @Override public double getDomainUpperBound(boolean includeInterval) { return this.intervalDelegate.getDomainUpperBound(includeInterval); } @@ -574,6 +590,7 @@ * * @return The range. */ + @Override public Range getDomainBounds(boolean includeInterval) { if (includeInterval) { return this.intervalDelegate.getDomainBounds(includeInterval); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -173,6 +173,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.allSeriesData.size(); } @@ -184,6 +185,7 @@ * * @return The item count. */ + @Override public int getItemCount(int series) { if (series < 0 || series >= getSeriesCount()) { throw new IllegalArgumentException("Invalid series index: " @@ -200,6 +202,7 @@ * * @return The series key. */ + @Override public Comparable getSeriesKey(int series) { if (series < 0 || series >= getSeriesCount()) { throw new IllegalArgumentException("Invalid series index: " @@ -218,6 +221,7 @@ * * @return The x-value for the item within the series. */ + @Override public Number getX(int series, int item) { List oneSeriesData = (List) this.allSeriesData.get(series); WindDataItem windItem = (WindDataItem) oneSeriesData.get(item); @@ -234,6 +238,7 @@ * * @return The y-value for the item within the series. */ + @Override public Number getY(int series, int item) { return getWindForce(series, item); } @@ -247,6 +252,7 @@ * * @return The wind direction for the item within the series. */ + @Override public Number getWindDirection(int series, int item) { List oneSeriesData = (List) this.allSeriesData.get(series); WindDataItem windItem = (WindDataItem) oneSeriesData.get(item); @@ -262,6 +268,7 @@ * * @return The wind force for the item within the series. */ + @Override public Number getWindForce(int series, int item) { List oneSeriesData = (List) this.allSeriesData.get(series); WindDataItem windItem = (WindDataItem) oneSeriesData.get(item); @@ -278,14 +285,12 @@ * @throws NullPointerException if <code>data</code> is <code>null</code>. */ public static List seriesNameListFromDataArray(Object[][] data) { - int seriesCount = data.length; List seriesNameList = new java.util.ArrayList(seriesCount); for (int i = 0; i < seriesCount; i++) { seriesNameList.add("Series " + (i + 1)); } return seriesNameList; - } /** @@ -303,6 +308,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -383,6 +389,7 @@ * * @return An int that indicates the relative comparison. */ + @Override public int compareTo(Object object) { if (object instanceof WindDataItem) { WindDataItem item = (WindDataItem) object; @@ -409,6 +416,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (this == obj) { return false; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -87,6 +87,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.seriesList.size(); } @@ -102,6 +103,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public Comparable getSeriesKey(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -117,6 +119,7 @@ * * @return The index, or -1. */ + @Override public int indexOf(Comparable seriesKey) { return this.seriesKeys.indexOf(seriesKey); } @@ -128,6 +131,7 @@ * * @return <code>DomainOrder.NONE</code>. */ + @Override public DomainOrder getDomainOrder() { return DomainOrder.NONE; } @@ -143,6 +147,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public int getItemCount(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -168,6 +173,7 @@ * * @see #getX(int, int) */ + @Override public double getXValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[0][item]; @@ -190,6 +196,7 @@ * * @see #getXValue(int, int) */ + @Override public Number getX(int series, int item) { return new Double(getXValue(series, item)); } @@ -211,6 +218,7 @@ * * @see #getY(int, int) */ + @Override public double getYValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[1][item]; @@ -233,6 +241,7 @@ * * @see #getX(int, int) */ + @Override public Number getY(int series, int item) { return new Double(getYValue(series, item)); } @@ -306,6 +315,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -339,6 +349,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = this.seriesKeys.hashCode(); @@ -355,6 +366,7 @@ * dataset (for instance, if a non-cloneable object is used for a * series key). */ + @Override public Object clone() throws CloneNotSupportedException { DefaultXYDataset clone = (DefaultXYDataset) super.clone(); clone.seriesKeys = new java.util.ArrayList(this.seriesKeys); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultXYZDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -88,6 +88,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.seriesList.size(); } @@ -103,6 +104,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public Comparable getSeriesKey(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -118,6 +120,7 @@ * * @return The index, or -1. */ + @Override public int indexOf(Comparable seriesKey) { return this.seriesKeys.indexOf(seriesKey); } @@ -129,6 +132,7 @@ * * @return <code>DomainOrder.NONE</code>. */ + @Override public DomainOrder getDomainOrder() { return DomainOrder.NONE; } @@ -144,6 +148,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public int getItemCount(int series) { if ((series < 0) || (series >= getSeriesCount())) { throw new IllegalArgumentException("Series index out of bounds"); @@ -169,6 +174,7 @@ * * @see #getX(int, int) */ + @Override public double getXValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[0][item]; @@ -191,6 +197,7 @@ * * @see #getXValue(int, int) */ + @Override public Number getX(int series, int item) { return new Double(getXValue(series, item)); } @@ -212,6 +219,7 @@ * * @see #getY(int, int) */ + @Override public double getYValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[1][item]; @@ -234,6 +242,7 @@ * * @see #getX(int, int) */ + @Override public Number getY(int series, int item) { return new Double(getYValue(series, item)); } @@ -255,6 +264,7 @@ * * @see #getZ(int, int) */ + @Override public double getZValue(int series, int item) { double[][] seriesData = (double[][]) this.seriesList.get(series); return seriesData[2][item]; @@ -277,6 +287,7 @@ * * @see #getZ(int, int) */ + @Override public Number getZ(int series, int item) { return new Double(getZValue(series, item)); } @@ -352,6 +363,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -390,6 +402,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = this.seriesKeys.hashCode(); @@ -406,6 +419,7 @@ * dataset (for instance, if a non-cloneable object is used for a * series key). */ + @Override public Object clone() throws CloneNotSupportedException { DefaultXYZDataset clone = (DefaultXYZDataset) super.clone(); clone.seriesKeys = new java.util.ArrayList(this.seriesKeys); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/IntervalXYDelegate.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -325,6 +325,7 @@ * * @return The minimum value. */ + @Override public double getDomainLowerBound(boolean includeInterval) { double result = Double.NaN; Range r = getDomainBounds(includeInterval); @@ -342,6 +343,7 @@ * * @return The maximum value. */ + @Override public double getDomainUpperBound(boolean includeInterval) { double result = Double.NaN; Range r = getDomainBounds(includeInterval); @@ -360,6 +362,7 @@ * * @return The range. */ + @Override public Range getDomainBounds(boolean includeInterval) { // first get the range without the interval, then expand it for the // interval width @@ -379,6 +382,7 @@ * * @param e the event. */ + @Override public void datasetChanged(DatasetChangeEvent e) { // TODO: by coding the event with some information about what changed // in the dataset, we could make the recalculation of the interval @@ -436,6 +440,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -461,6 +466,7 @@ * * @throws CloneNotSupportedException if the object cannot be cloned. */ + @Override public Object clone() throws CloneNotSupportedException { return super.clone(); } @@ -470,6 +476,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int hash = 5; hash = HashUtilities.hashCode(hash, this.autoWidth); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeries.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -127,6 +127,7 @@ * * @return The item count. */ + @Override public int getItemCount() { return getRowCount() * getColumnsCount(); } @@ -210,6 +211,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -96,6 +96,7 @@ * * @return The number of items in the specified series. */ + @Override public int getItemCount(int seriesIndex) { return getSeries(seriesIndex).getItemCount(); } @@ -124,6 +125,7 @@ * * @return The number of series in the collection. */ + @Override public int getSeriesCount() { return this.seriesList.size(); } @@ -136,6 +138,7 @@ * * @return The key for a series. */ + @Override public Comparable getSeriesKey(int seriesIndex) { return getSeries(seriesIndex).getKey(); } @@ -152,6 +155,7 @@ * * @see org.jfree.data.xy.XYDataset#getXValue(int, int) */ + @Override public Number getX(int seriesIndex, int itemIndex) { MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex); int x = series.getItemColumn(itemIndex); @@ -171,6 +175,7 @@ * * @see org.jfree.data.xy.XYDataset#getYValue(int, int) */ + @Override public Number getY(int seriesIndex, int itemIndex) { MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex); int y = series.getItemRow(itemIndex); @@ -190,6 +195,7 @@ * * @see org.jfree.data.xy.XYZDataset#getZValue(int, int) */ + @Override public Number getZ(int seriesIndex, int itemIndex) { MatrixSeries series = (MatrixSeries) this.seriesList.get(seriesIndex); Number z = series.getItem(itemIndex); @@ -223,6 +229,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == null) { return false; @@ -246,6 +253,7 @@ * * @return A hash code. */ + @Override public int hashCode() { return (this.seriesList != null ? this.seriesList.hashCode() : 0); } @@ -257,6 +265,7 @@ * * @throws CloneNotSupportedException if there is a problem. */ + @Override public Object clone() throws CloneNotSupportedException { MatrixSeriesCollection clone = (MatrixSeriesCollection) super.clone(); clone.seriesList = (List) ObjectUtilities.deepClone(this.seriesList); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/NormalizedMatrixSeries.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -89,6 +89,7 @@ * * @see org.jfree.data.xy.MatrixSeries#getItem(int) */ + @Override public Number getItem(int itemIndex) { int i = getItemRow(itemIndex); int j = getItemColumn(itemIndex); @@ -133,6 +134,7 @@ * * @see #get(int, int) */ + @Override public void update(int i, int j, double mij) { this.m_totalSum -= get(i, j); this.m_totalSum += mij; @@ -143,6 +145,7 @@ /** * @see org.jfree.data.xy.MatrixSeries#zeroAll() */ + @Override public void zeroAll() { this.m_totalSum = 0; super.zeroAll(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/OHLCDataItem.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -157,6 +157,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -193,6 +194,7 @@ * @return A negative integer, zero, or a positive integer as this object * is less than, equal to, or greater than the specified object. */ + @Override public int compareTo(Object object) { if (object instanceof OHLCDataItem) { OHLCDataItem item = (OHLCDataItem) object; Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/Vector.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -112,6 +112,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -134,6 +135,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result = 193; long temp = Double.doubleToLongBits(this.x); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -102,6 +102,7 @@ * * @return The item removed. */ + @Override public ComparableObjectItem remove(int index) { VectorDataItem result = (VectorDataItem) this.data.remove(index); fireSeriesChanged(); @@ -163,6 +164,7 @@ * * @return The data item. */ + @Override public ComparableObjectItem getDataItem(int index) { // overridden to make public return super.getDataItem(index); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -127,6 +127,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.data.size(); } @@ -159,6 +160,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public Comparable getSeriesKey(int series) { // defer argument checking return getSeries(series).getKey(); @@ -187,6 +189,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * range <code>0</code> to <code>getSeriesCount() - 1</code>. */ + @Override public int getItemCount(int series) { // defer argument checking return getSeries(series).getItemCount(); @@ -200,6 +203,7 @@ * * @return The x-value. */ + @Override public double getXValue(int series, int item) { VectorSeries s = (VectorSeries) this.data.get(series); VectorDataItem di = (VectorDataItem) s.getDataItem(item); @@ -216,6 +220,7 @@ * * @return The x-value. */ + @Override public Number getX(int series, int item) { return new Double(getXValue(series, item)); } @@ -228,6 +233,7 @@ * * @return The y-value. */ + @Override public double getYValue(int series, int item) { VectorSeries s = (VectorSeries) this.data.get(series); VectorDataItem di = (VectorDataItem) s.getDataItem(item); @@ -244,6 +250,7 @@ * * @return The y-value. */ + @Override public Number getY(int series, int item) { return new Double(getYValue(series, item)); } @@ -256,6 +263,7 @@ * * @return The vector (possibly <code>null</code>). */ + @Override public Vector getVector(int series, int item) { VectorSeries s = (VectorSeries) this.data.get(series); VectorDataItem di = (VectorDataItem) s.getDataItem(item); @@ -270,6 +278,7 @@ * * @return The x-component of the vector. */ + @Override public double getVectorXValue(int series, int item) { VectorSeries s = (VectorSeries) this.data.get(series); VectorDataItem di = (VectorDataItem) s.getDataItem(item); @@ -284,6 +293,7 @@ * * @return The y-component of the vector. */ + @Override public double getVectorYValue(int series, int item) { VectorSeries s = (VectorSeries) this.data.get(series); VectorDataItem di = (VectorDataItem) s.getDataItem(item); @@ -297,6 +307,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -315,6 +326,7 @@ * * @throws CloneNotSupportedException if there is a problem. */ + @Override public Object clone() throws CloneNotSupportedException { VectorSeriesCollection clone = (VectorSeriesCollection) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -150,6 +150,7 @@ * * @return The data item. */ + @Override public ComparableObjectItem getDataItem(int index) { return super.getDataItem(index); } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeriesCollection.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -90,6 +90,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.data.size(); } @@ -122,6 +123,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * specified range. */ + @Override public Comparable getSeriesKey(int series) { // defer argument checking return getSeries(series).getKey(); @@ -137,6 +139,7 @@ * @throws IllegalArgumentException if <code>series</code> is not in the * range <code>0</code> to <code>getSeriesCount() - 1</code>. */ + @Override public int getItemCount(int series) { // defer argument checking return getSeries(series).getItemCount(); @@ -150,6 +153,7 @@ * * @return The x-value. */ + @Override public Number getX(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item); @@ -165,6 +169,7 @@ * * @return The value. */ + @Override public double getStartXValue(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); return s.getXLowValue(item); @@ -179,6 +184,7 @@ * * @return The value. */ + @Override public double getEndXValue(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); return s.getXHighValue(item); @@ -193,6 +199,7 @@ * * @return The value. */ + @Override public double getYValue(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); return s.getYValue(item); @@ -206,6 +213,7 @@ * * @return The y-value. */ + @Override public Number getY(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item); @@ -220,6 +228,7 @@ * * @return The x-value. */ + @Override public Number getStartX(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item); @@ -234,6 +243,7 @@ * * @return The x-value. */ + @Override public Number getEndX(int series, int item) { XIntervalSeries s = (XIntervalSeries) this.data.get(series); XIntervalDataItem di = (XIntervalDataItem) s.getDataItem(item); @@ -249,6 +259,7 @@ * * @return The start y-value. */ + @Override public Number getStartY(int series, int item) { return getY(series, item); } @@ -262,6 +273,7 @@ * * @return The end y-value. */ + @Override public Number getEndY(int series, int item) { return getY(series, item); } @@ -325,6 +337,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -343,6 +356,7 @@ * * @throws CloneNotSupportedException if there is a problem. */ + @Override public Object clone() throws CloneNotSupportedException { XIntervalSeriesCollection clone = (XIntervalSeriesCollection) super.clone(); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYBarDataset.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -121,6 +121,7 @@ * * @return The series count. */ + @Override public int getSeriesCount() { return this.underlying.getSeriesCount(); } @@ -133,6 +134,7 @@ * * @return The series key. */ + @Override public Comparable getSeriesKey(int series) { return this.underlying.getSeriesKey(series); } @@ -144,6 +146,7 @@ * * @return The item count. */ + @Override public int getItemCount(int series) { return this.underlying.getItemCount(series); } @@ -158,6 +161,7 @@ * * @see #getXValue(int, int) */ + @Override public Number getX(int series, int item) { return this.underlying.getX(series, item); } @@ -172,6 +176,7 @@ * * @see #getX(int, int) */ + @Override public double getXValue(int series, int item) { return this.underlying.getXValue(series, item); } @@ -186,6 +191,7 @@ * * @see #getYValue(int, int) */ + @Override public Number getY(int series, int item) { return this.underlying.getY(series, item); } @@ -200,6 +206,7 @@ * * @see #getY(int, int) */ + @Override public double getYValue(int series, int item) { return this.underlying.getYValue(series, item); } @@ -212,6 +219,7 @@ * * @return The value. */ + @Override public Number getStartX(int series, int item) { Number result = null; Number xnum = this.underlying.getX(series, item); @@ -232,6 +240,7 @@ * * @see #getXValue(int, int) */ + @Override public double getStartXValue(int series, int item) { return getXValue(series, item) - this.barWidth / 2.0; } @@ -244,6 +253,7 @@ * * @return The value. */ + @Override public Number getEndX(int series, int item) { Number result = null; Number xnum = this.underlying.getX(series, item); @@ -264,6 +274,7 @@ * * @see #getXValue(int, int) */ + @Override public double getEndXValue(int series, int item) { return getXValue(series, item) + this.barWidth / 2.0; } @@ -276,6 +287,7 @@ * * @return The value. */ + @Override public Number getStartY(int series, int item) { return this.underlying.getY(series, item); } @@ -291,6 +303,7 @@ * * @see #getYValue(int, int) */ + @Override public double getStartYValue(int series, int item) { return getYValue(series, item); } @@ -303,6 +316,7 @@ * * @return The value. */ + @Override public Number getEndY(int series, int item) { return this.underlying.getY(series, item); } @@ -318,6 +332,7 @@ * * @see #getYValue(int, int) */ + @Override public double getEndYValue(int series, int item) { return getYValue(series, item); } @@ -327,6 +342,7 @@ * * @param event information about the event. */ + @Override public void datasetChanged(DatasetChangeEvent event) { notifyListeners(event); } @@ -338,6 +354,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -369,6 +386,7 @@ * @throws CloneNotSupportedException if the dataset cannot be cloned for * any reason. */ + @Override public Object clone() throws CloneNotSupportedException { XYBarDataset clone = (XYBarDataset) super.clone(); if (this.underlying instanceof PublicCloneable) { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYCoordinate.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -99,6 +99,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -121,6 +122,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result = 193; long temp = Double.doubleToLongBits(this.x); @@ -136,6 +138,7 @@ * * @return A string. */ + @Override public String toString() { return "(" + this.x + ", " + this.y + ")"; } @@ -147,6 +150,7 @@ * * @return An integer indicating the relative order of the items. */ + @Override public int compareTo(Object obj) { if (!(obj instanceof XYCoordinate)) { throw new IllegalArgumentException("Incomparable object."); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDataItem.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -172,6 +172,7 @@ * @return An integer indicating the order of this data pair object * relative to another object. */ + @Override public int compareTo(Object o1) { int result; @@ -211,6 +212,7 @@ * * @return A clone. */ + @Override public Object clone() { Object clone = null; try { @@ -230,6 +232,7 @@ * * @return A boolean. */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -252,6 +255,7 @@ * * @return A hash code. */ + @Override public int hashCode() { int result; result = this.x.hashCode(); @@ -265,6 +269,7 @@ * * @return A string. */ + @Override public String toString() { return "[" + getXValue() + ", " + getYValue() + "]"; } Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2013-11-22 20:06:28 UTC (rev 3045) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYDatasetTableModel.java 2013-11-22 20:17:23 UTC (rev 3046) @@ -102,6 +102,7 @@ * * @return The row count. */ + @Override public int getRowCount() { if (this.model == null) { return 0; @@ -114,6 +115,7 @@ ... [truncated message content] |
From: <mu...@us...> - 2014-01-09 11:33:29
|
Revision: 3074 http://sourceforge.net/p/jfreechart/code/3074 Author: mungady Date: 2014-01-09 11:33:25 +0000 (Thu, 09 Jan 2014) Log Message: ----------- 2014-01-09 David Gilbert <dav...@ob...> * org/jfree/data/xy/VectorSeries.java (add(VectorDataItem, boolean)): New method, * org/jfree/data/xy/XIntervalSeries.java (add(XIntervalDataItem, boolean)): New method, * org/jfree/data/xy/XYIntervalSeries.java (add(XYIntervalDataItem, boolean)): New method, * org/jfree/data/xy/YIntervalSeries.java (add(YIntervalDataItem, boolean)): New method. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2013-12-06 08:40:35 UTC (rev 3073) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/VectorSeries.java 2014-01-09 11:33:25 UTC (rev 3074) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------- * VectorSeries.java * ----------------- - * (C) Copyright 2007, 2008, by Object Refinery Limited. + * (C) Copyright 2007-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -40,6 +40,7 @@ * 25-May-2007 : Added remove(int) and clear() methods, and moved from the * experimental to the main source tree (DG); * 27-Nov-2007 : Removed redundant clear() method (DG); + * 09-Jan-2014 : Added add(VectorDataItem, boolean) method (DG); * */ @@ -47,7 +48,6 @@ import org.jfree.data.ComparableObjectItem; import org.jfree.data.ComparableObjectSeries; -import org.jfree.data.general.SeriesChangeEvent; /** * A list of (x,y, deltaX, deltaY) data items. @@ -91,8 +91,21 @@ * @param deltaY the vector y. */ public void add(double x, double y, double deltaX, double deltaY) { - super.add(new VectorDataItem(x, y, deltaX, deltaY), true); + add(new VectorDataItem(x, y, deltaX, deltaY), true); } + + /** + * Adds a data item to the series and, if requested, sends a + * {@link SeriesChangeEvent} to all registered listeners. + * + * @param item the data item (<code>null</code> not permitted). + * @param notify notify listeners? + * + * @since 1.0.18 + */ + public void add(VectorDataItem item, boolean notify) { + super.add(item, notify); + } /** * Removes the item at the specified index and sends a Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2013-12-06 08:40:35 UTC (rev 3073) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XIntervalSeries.java 2014-01-09 11:33:25 UTC (rev 3074) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * -------------------- * XIntervalSeries.java * -------------------- - * (C) Copyright 2006-2008, by Object Refinery Limited. + * (C) Copyright 2006-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -36,6 +36,7 @@ * ------- * 20-Oct-2006 : Version 1 (DG); * 11-Apr-2008 : Added getXLowValue() and getXHighValue() methods (DG); + * 09-Jan-2014 : Added add(XIntervalDataItem, boolean) method (DG); * */ @@ -80,7 +81,8 @@ } /** - * Adds a data item to the series. + * Adds a data item to the series and sends a {@link SeriesChangeEvent} to + * all registered listeners. * * @param x the x-value. * @param y the y-value. @@ -88,10 +90,23 @@ * @param xHigh the upper bound of the y-interval. */ public void add(double x, double xLow, double xHigh, double y) { - super.add(new XIntervalDataItem(x, xLow, xHigh, y), true); + add(new XIntervalDataItem(x, xLow, xHigh, y), true); } /** + * Adds a data item to the series and, if requested, sends a + * {@link SeriesChangeEvent} to all registered listeners. + * + * @param item the data item (<code>null</code> not permitted). + * @param notify notify listeners? + * + * @since 1.0.18 + */ + public void add(XIntervalDataItem item, boolean notify) { + super.add(item, notify); + } + + /** * Returns the x-value for the specified item. * * @param index the item index. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2013-12-06 08:40:35 UTC (rev 3073) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/XYIntervalSeries.java 2014-01-09 11:33:25 UTC (rev 3074) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------- * XYIntervalSeries.java * --------------------- - * (C) Copyright 2006-2008, by Object Refinery Limited. + * (C) Copyright 2006-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -36,6 +36,7 @@ * ------- * 20-Oct-2006 : Version 1 (DG); * 13-Feb-2007 : Added several new accessor methods (DG); + * 09-Jan-2014 : Added add(XYIntervalDataItem, boolean) method (DG); * */ @@ -80,7 +81,8 @@ } /** - * Adds a data item to the series. + * Adds a data item to the series and sends a {@link SeriesChangeEvent} to + * all registered listeners. * * @param x the x-value. * @param xLow the lower bound of the x-interval. @@ -91,8 +93,21 @@ */ public void add(double x, double xLow, double xHigh, double y, double yLow, double yHigh) { - super.add(new XYIntervalDataItem(x, xLow, xHigh, y, yLow, yHigh), true); + add(new XYIntervalDataItem(x, xLow, xHigh, y, yLow, yHigh), true); } + + /** + * Adds a data item to the series and, if requested, sends a + * {@link SeriesChangeEvent} to all registered listeners. + * + * @param item the data item (<code>null</code> not permitted). + * @param notify notify listeners? + * + * @since 1.0.18 + */ + public void add(XYIntervalDataItem item, boolean notify) { + super.add(item, notify); + } /** * Returns the x-value for the specified item. Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2013-12-06 08:40:35 UTC (rev 3073) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/YIntervalSeries.java 2014-01-09 11:33:25 UTC (rev 3074) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * -------------------- * YIntervalSeries.java * -------------------- - * (C) Copyright 2006-2008, by Object Refinery Limited. + * (C) Copyright 2006-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -36,6 +36,7 @@ * ------- * 20-Oct-2006 : Version 1 (DG); * 20-Feb-2007 : Added getYHighValue() and getYLowValue() methods (DG); + * 09-Jan-2014 : Added add(YIntervalDataItem, boolean) method (DG); * */ @@ -80,7 +81,8 @@ } /** - * Adds a data item to the series. + * Adds a data item to the series and sends a {@link SeriesChangeEvent} to + * all registered listeners. * * @param x the x-value. * @param y the y-value. @@ -88,8 +90,21 @@ * @param yHigh the upper bound of the y-interval. */ public void add(double x, double y, double yLow, double yHigh) { - super.add(new YIntervalDataItem(x, y, yLow, yHigh), true); + add(new YIntervalDataItem(x, y, yLow, yHigh), true); } + + /** + * Adds a data item to the series and, if requested, sends a + * {@link SeriesChangeEvent} to all registered listeners. + * + * @param item the data item (<code>null</code> not permitted). + * @param notify notify listeners? + * + * @since 1.0.18 + */ + public void add(YIntervalDataItem item, boolean notify) { + super.add(item, notify); + } /** * Returns the x-value for the specified item. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mu...@us...> - 2014-07-01 07:28:15
|
Revision: 3163 http://sourceforge.net/p/jfreechart/code/3163 Author: mungady Date: 2014-07-01 07:28:08 +0000 (Tue, 01 Jul 2014) Log Message: ----------- Fix Javadoc warnings. Modified Paths: -------------- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2014-07-01 07:22:49 UTC (rev 3162) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/CategoryTableXYDataset.java 2014-07-01 07:28:08 UTC (rev 3163) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------------- * CategoryTableXYDataset.java * --------------------------- - * (C) Copyright 2004-2011, by Andreas Schroeder and Contributors. + * (C) Copyright 2004-2014, by Andreas Schroeder and Contributors. * * Original Author: Andreas Schroeder; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -356,7 +356,7 @@ * Sets the interval width to a fixed value, and sends a * {@link DatasetChangeEvent} to all registered listeners. * - * @param d the new interval width (must be > 0). + * @param d the new interval width (must be > 0). */ public void setIntervalWidth(double d) { this.intervalDelegate.setFixedIntervalWidth(d); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2014-07-01 07:22:49 UTC (rev 3162) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultOHLCDataset.java 2014-07-01 07:28:08 UTC (rev 3163) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------- * DefaultOHLCDataset.java * ----------------------- - * (C) Copyright 2003-2008, by Object Refinery Limited. + * (C) Copyright 2003-2014, by Object Refinery Limited. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -343,7 +343,7 @@ * * @return A clone. * - * @throws CloneNotSupportedException + * @throws CloneNotSupportedException if there is a cloning problem. */ @Override public Object clone() throws CloneNotSupportedException { Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2014-07-01 07:22:49 UTC (rev 3162) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultTableXYDataset.java 2014-07-01 07:28:08 UTC (rev 3163) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * -------------------------- * DefaultTableXYDataset.java * -------------------------- - * (C) Copyright 2003-2013, by Richard Atkinson and Contributors. + * (C) Copyright 2003-2014, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; * Contributor(s): Jody Brownell; @@ -635,7 +635,7 @@ * Sets the interval width to a fixed value, and sends a * {@link DatasetChangeEvent} to all registered listeners. * - * @param d the new interval width (must be > 0). + * @param d the new interval width (must be > 0). */ public void setIntervalWidth(double d) { this.intervalDelegate.setFixedIntervalWidth(d); Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2014-07-01 07:22:49 UTC (rev 3162) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/DefaultWindDataset.java 2014-07-01 07:28:08 UTC (rev 3163) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ----------------------- * DefaultWindDataset.java * ----------------------- - * (C) Copyright 2001-2013, by Achilleus Mantzios and Contributors. + * (C) Copyright 2001-2014, by Achilleus Mantzios and Contributors. * * Original Author: Achilleus Mantzios; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -302,7 +302,7 @@ * <code>DefaultWindDataset</code>;</li> * <li>both datasets have the same number of series containing identical * values.</li> - * <ul> + * </ul> * * @param obj the object (<code>null</code> permitted). * Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java =================================================================== --- branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2014-07-01 07:22:49 UTC (rev 3162) +++ branches/jfreechart-1.0.x-branch/source/org/jfree/data/xy/MatrixSeriesCollection.java 2014-07-01 07:28:08 UTC (rev 3163) @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2013, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2014, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * --------------------------- * MatrixSeriesCollection.java * --------------------------- - * (C) Copyright 2003-2013, by Barak Naveh and Contributors. + * (C) Copyright 2003-2014, by Barak Naveh and Contributors. * * Original Author: Barak Naveh; * Contributor(s): David Gilbert (for Object Refinery Limited); @@ -108,8 +108,6 @@ * @param seriesIndex zero-based series index. * * @return The series. - * - * @throws IllegalArgumentException */ public MatrixSeries getSeries(int seriesIndex) { if ((seriesIndex < 0) || (seriesIndex > getSeriesCount())) { @@ -316,8 +314,6 @@ * Notifies all registered listeners that the dataset has changed. * * @param seriesIndex the series (zero based index). - * - * @throws IllegalArgumentException */ public void removeSeries(int seriesIndex) { // check arguments... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |