Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[1316] trunk/source/org/jfree/data/general
|
From: <mu...@us...> - 2008-07-22 08:01:53
|
Revision: 1316
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1316&view=rev
Author: mungady
Date: 2008-07-22 08:01:48 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/source/org/jfree/data/general/AbstractDataset.java
trunk/source/org/jfree/data/general/AbstractSeriesDataset.java
trunk/source/org/jfree/data/general/CombinationDataset.java
trunk/source/org/jfree/data/general/CombinedDataset.java
trunk/source/org/jfree/data/general/Dataset.java
trunk/source/org/jfree/data/general/DatasetChangeEvent.java
trunk/source/org/jfree/data/general/DatasetChangeListener.java
trunk/source/org/jfree/data/general/DatasetGroup.java
Modified: trunk/source/org/jfree/data/general/AbstractDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/AbstractDataset.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/AbstractDataset.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -2,35 +2,35 @@
* 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.]
*
* --------------------
* AbstractDataset.java
* --------------------
- * (C)opyright 2000-2007, by Object Refinery Limited.
+ * (C)opyright 2000-2008, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
- * Contributor(s): Nicolas Brodu (for Astrium and EADS Corporate Research
+ * Contributor(s): Nicolas Brodu (for Astrium and EADS Corporate Research
* Center);
*
* Changes (from 21-Aug-2001)
@@ -39,12 +39,12 @@
* 18-Sep-2001 : Updated e-mail address in header (DG);
* 15-Oct-2001 : Moved to new package (com.jrefinery.data.*) (DG);
* 22-Oct-2001 : Renamed DataSource.java --> Dataset.java etc. (DG);
- * 17-Nov-2001 : Changed constructor from public to protected, created new
- * AbstractSeriesDataset class and transferred series-related
+ * 17-Nov-2001 : Changed constructor from public to protected, created new
+ * AbstractSeriesDataset class and transferred series-related
* methods, updated Javadoc comments (DG);
* 04-Mar-2002 : Updated import statements (DG);
* 11-Jun-2002 : Updated for change in the event constructor (DG);
- * 07-Aug-2002 : Changed listener list to use
+ * 07-Aug-2002 : Changed listener list to use
* javax.swing.event.EventListenerList (DG);
* 04-Oct-2002 : Fixed errors reported by Checkstyle (DG);
* 27-Mar-2003 : Implemented Serializable (DG);
@@ -52,7 +52,7 @@
* 08-Sep-2003 : Serialization fixes (NB);
* 11-Sep-2003 : Cloning Fixes (NB);
* 01-Jun-2005 : Added hasListener() method for unit testing (DG);
- *
+ *
*/
package org.jfree.data.general;
@@ -70,17 +70,15 @@
import javax.swing.event.EventListenerList;
/**
- * An abstract implementation of the {@link Dataset} interface, containing a
+ * An abstract implementation of the {@link Dataset} interface, containing a
* mechanism for registering change listeners.
*/
-public abstract class AbstractDataset implements Dataset,
- Cloneable,
- Serializable,
- ObjectInputValidation {
+public abstract class AbstractDataset implements Dataset, Cloneable,
+ Serializable, ObjectInputValidation {
/** For serialization. */
private static final long serialVersionUID = 1918768939869230744L;
-
+
/** The group that the dataset belongs to. */
private DatasetGroup group;
@@ -88,7 +86,7 @@
private transient EventListenerList listenerList;
/**
- * Constructs a dataset. By default, the dataset is assigned to its own
+ * Constructs a dataset. By default, the dataset is assigned to its own
* group.
*/
protected AbstractDataset() {
@@ -100,7 +98,7 @@
* Returns the dataset group for the dataset.
*
* @return The group (never <code>null</code>).
- *
+ *
* @see #setGroup(DatasetGroup)
*/
public DatasetGroup getGroup() {
@@ -111,7 +109,7 @@
* Sets the dataset group for the dataset.
*
* @param group the group (<code>null</code> not permitted).
- *
+ *
* @see #getGroup()
*/
public void setGroup(DatasetGroup group) {
@@ -125,7 +123,7 @@
* Registers an object to receive notification of changes to the dataset.
*
* @param listener the object to register.
- *
+ *
* @see #removeChangeListener(DatasetChangeListener)
*/
public void addChangeListener(DatasetChangeListener listener) {
@@ -133,11 +131,11 @@
}
/**
- * Deregisters an object so that it no longer receives notification of
+ * Deregisters an object so that it no longer receives notification of
* changes to the dataset.
*
* @param listener the object to deregister.
- *
+ *
* @see #addChangeListener(DatasetChangeListener)
*/
public void removeChangeListener(DatasetChangeListener listener) {
@@ -146,13 +144,13 @@
/**
* Returns <code>true</code> if the specified object is registered with
- * the dataset as a listener. Most applications won't need to call this
+ * the dataset as a listener. Most applications won't need to call this
* method, it exists mainly for use by unit testing code.
- *
+ *
* @param listener the listener.
- *
+ *
* @return A boolean.
- *
+ *
* @see #addChangeListener(DatasetChangeListener)
* @see #removeChangeListener(DatasetChangeListener)
*/
@@ -160,10 +158,10 @@
List list = Arrays.asList(this.listenerList.getListenerList());
return list.contains(listener);
}
-
+
/**
* Notifies all registered listeners that the dataset has changed.
- *
+ *
* @see #addChangeListener(DatasetChangeListener)
*/
protected void fireDatasetChanged() {
@@ -173,9 +171,9 @@
/**
* Notifies all registered listeners that the dataset has changed.
*
- * @param event contains information about the event that triggered the
+ * @param event contains information about the event that triggered the
* notification.
- *
+ *
* @see #addChangeListener(DatasetChangeListener)
* @see #removeChangeListener(DatasetChangeListener)
*/
@@ -192,21 +190,21 @@
}
/**
- * Returns a clone of the dataset. The cloned dataset will NOT include the
- * {@link DatasetChangeListener} references that have been registered with
+ * Returns a clone of the dataset. The cloned dataset will NOT include the
+ * {@link DatasetChangeListener} references that have been registered with
* this dataset.
- *
+ *
* @return A clone.
- *
- * @throws CloneNotSupportedException if the dataset does not support
+ *
+ * @throws CloneNotSupportedException if the dataset does not support
* cloning.
*/
public Object clone() throws CloneNotSupportedException {
AbstractDataset clone = (AbstractDataset) super.clone();
clone.listenerList = new EventListenerList();
- return clone;
+ return clone;
}
-
+
/**
* Handles serialization.
*
@@ -226,33 +224,33 @@
* @throws IOException if there is an I/O problem.
* @throws ClassNotFoundException if there is a problem loading a class.
*/
- private void readObject(ObjectInputStream stream)
+ private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
stream.defaultReadObject();
this.listenerList = new EventListenerList();
stream.registerValidation(this, 10); // see comments about priority of
- // 10 in validateObject()
+ // 10 in validateObject()
}
-
+
/**
- * Validates the object. We use this opportunity to call listeners who have
- * registered during the deserialization process, as listeners are not
- * serialized. This method is called by the serialization system after the
+ * Validates the object. We use this opportunity to call listeners who have
+ * registered during the deserialization process, as listeners are not
+ * serialized. This method is called by the serialization system after the
* entire graph is read.
- *
- * This object has registered itself to the system with a priority of 10.
- * Other callbacks may register with a higher priority number to be called
- * before this object, or with a lower priority number to be called after
+ *
+ * This object has registered itself to the system with a priority of 10.
+ * Other callbacks may register with a higher priority number to be called
+ * before this object, or with a lower priority number to be called after
* the listeners were notified.
- *
- * All listeners are supposed to have register by now, either in their
- * readObject or validateObject methods. Notify them that this dataset has
- * changed.
*
+ * All listeners are supposed to have register by now, either in their
+ * readObject or validateObject methods. Notify them that this dataset has
+ * changed.
+ *
* @exception InvalidObjectException If the object cannot validate itself.
*/
public void validateObject() throws InvalidObjectException {
fireDatasetChanged();
}
-
+
}
Modified: trunk/source/org/jfree/data/general/AbstractSeriesDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/AbstractSeriesDataset.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/AbstractSeriesDataset.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -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.]
*
* --------------------------
* AbstractSeriesDataset.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): -;
@@ -47,17 +47,15 @@
import java.io.Serializable;
/**
- * An abstract implementation of the {@link SeriesDataset} interface,
+ * An abstract implementation of the {@link SeriesDataset} interface,
* containing a mechanism for registering change listeners.
*/
public abstract class AbstractSeriesDataset extends AbstractDataset
- implements SeriesDataset,
- SeriesChangeListener,
- Serializable {
+ implements SeriesDataset, SeriesChangeListener, Serializable {
/** For serialization. */
private static final long serialVersionUID = -6074996219705033171L;
-
+
/**
* Creates a new dataset.
*/
@@ -73,24 +71,24 @@
public abstract int getSeriesCount();
/**
- * Returns the key for a series.
+ * Returns the key for a series.
* <p>
- * If <code>series</code> is not within the specified range, the
- * implementing method should throw an {@link IndexOutOfBoundsException}
+ * If <code>series</code> is not within the specified range, the
+ * implementing method should throw an {@link IndexOutOfBoundsException}
* (preferred) or an {@link IllegalArgumentException}.
*
- * @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 series key.
*/
public abstract Comparable getSeriesKey(int series);
-
+
/**
* Returns the index of the named series, or -1.
- *
+ *
* @param seriesKey the series key (<code>null</code> permitted).
- *
+ *
* @return The index.
*/
public int indexOf(Comparable seriesKey) {
@@ -102,7 +100,7 @@
}
return -1;
}
-
+
/**
* Called when a series belonging to the dataset changes.
*
Modified: trunk/source/org/jfree/data/general/CombinationDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/CombinationDataset.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/CombinationDataset.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -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.]
*
* -----------------------
* CombinationDataset.java
* -----------------------
- * (C) Copyright 2001-2007, by Bill Kelemen.
+ * (C) Copyright 2001-2008, by Bill Kelemen.
*
* Original Author: Bill Kelemen;
* Contributor(s): -;
Modified: trunk/source/org/jfree/data/general/CombinedDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/CombinedDataset.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/CombinedDataset.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -6,22 +6,22 @@
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* --------------------
@@ -36,17 +36,17 @@
* -------
* 06-Dec-2001 : Version 1 (BK);
* 27-Dec-2001 : Fixed bug in getChildPosition method (BK);
- * 29-Dec-2001 : Fixed bug in getChildPosition method with complex
+ * 29-Dec-2001 : Fixed bug in getChildPosition method with complex
* CombinePlot (BK);
- * 05-Feb-2002 : Small addition to the interface HighLowDataset, as requested
+ * 05-Feb-2002 : Small addition to the interface HighLowDataset, as requested
* by Sylvain Vieujot (DG);
- * 14-Feb-2002 : Added bug fix for IntervalXYDataset methods, submitted by
+ * 14-Feb-2002 : Added bug fix for IntervalXYDataset methods, submitted by
* Gyula Kun-Szabo (DG);
* 11-Jun-2002 : Updated for change in event constructor (DG);
* 04-Oct-2002 : Fixed errors reported by Checkstyle (DG);
- * 06-May-2004 : Now extends AbstractIntervalXYDataset and added other methods
+ * 06-May-2004 : Now extends AbstractIntervalXYDataset and added other methods
* that return double primitives (DG);
- * 15-Jul-2004 : Switched getX() with getXValue() and getY() with
+ * 15-Jul-2004 : Switched getX() with getXValue() and getY() with
* getYValue() (DG);
* ------------- JFREECHART 1.0.x ---------------------------------------------
* 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG);
@@ -63,15 +63,13 @@
import org.jfree.data.xy.XYDataset;
/**
- * This class can combine instances of {@link XYDataset}, {@link OHLCDataset}
- * and {@link IntervalXYDataset} together exposing the union of all the series
- * under one dataset.
+ * This class can combine instances of {@link XYDataset}, {@link OHLCDataset}
+ * and {@link IntervalXYDataset} together exposing the union of all the series
+ * under one dataset.
*/
public class CombinedDataset extends AbstractIntervalXYDataset
- implements XYDataset,
- OHLCDataset,
- IntervalXYDataset,
- CombinationDataset {
+ implements XYDataset, OHLCDataset, IntervalXYDataset,
+ CombinationDataset {
/** Storage for the datasets we combine. */
private List datasetInfo = new java.util.ArrayList();
@@ -86,7 +84,7 @@
/**
* Creates a CombinedDataset initialized with an array of SeriesDatasets.
*
- * @param data array of SeriesDataset that contains the SeriesDatasets to
+ * @param data array of SeriesDataset that contains the SeriesDatasets to
* combine.
*/
public CombinedDataset(SeriesDataset[] data) {
@@ -175,7 +173,7 @@
/**
* Returns the X-value for the specified series and item.
* <P>
- * Note: throws <code>ClassCastException</code> if the series is not from
+ * Note: throws <code>ClassCastException</code> if the series is not from
* a {@link XYDataset}.
*
* @param series the index of the series of interest (zero-based).
@@ -191,7 +189,7 @@
/**
* Returns the Y-value for the specified series and item.
* <P>
- * Note: throws <code>ClassCastException</code> if the series is not from
+ * Note: throws <code>ClassCastException</code> if the series is not from
* a {@link XYDataset}.
*
* @param series the index of the series of interest (zero-based).
@@ -207,7 +205,7 @@
/**
* Returns the number of items in a series.
* <P>
- * Note: throws <code>ClassCastException</code> if the series is not from
+ * Note: throws <code>ClassCastException</code> if the series is not from
* a {@link XYDataset}.
*
* @param series the index of the series of interest (zero-based).
@@ -240,21 +238,21 @@
}
/**
- * 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) {
double result = Double.NaN;
Number high = getHigh(series, item);
if (high != null) {
- result = high.doubleValue();
+ result = high.doubleValue();
}
- return result;
+ return result;
}
/**
@@ -274,21 +272,21 @@
}
/**
- * 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) {
double result = Double.NaN;
Number low = getLow(series, item);
if (low != null) {
- result = low.doubleValue();
+ result = low.doubleValue();
}
- return result;
+ return result;
}
/**
@@ -308,21 +306,21 @@
}
/**
- * 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) {
double result = Double.NaN;
Number open = getOpen(series, item);
if (open != null) {
- result = open.doubleValue();
+ result = open.doubleValue();
}
- return result;
+ return result;
}
/**
@@ -342,21 +340,21 @@
}
/**
- * 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) {
double result = Double.NaN;
Number close = getClose(series, item);
if (close != null) {
- result = close.doubleValue();
+ result = close.doubleValue();
}
- return result;
+ return result;
}
/**
@@ -376,21 +374,21 @@
}
/**
- * 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) {
double result = Double.NaN;
Number volume = getVolume(series, item);
if (volume != null) {
- result = volume.doubleValue();
+ result = volume.doubleValue();
}
- return result;
+ return result;
}
///////////////////////////////////////////////////////////////////////////
@@ -486,7 +484,7 @@
for (int i = 0; i < this.datasetInfo.size(); i++) {
SeriesDataset child = getDatasetInfo(i).data;
if (child instanceof CombinationDataset) {
- SeriesDataset childParent
+ SeriesDataset childParent
= ((CombinationDataset) child).getParent();
if (parent == null) {
parent = childParent;
Modified: trunk/source/org/jfree/data/general/Dataset.java
===================================================================
--- trunk/source/org/jfree/data/general/Dataset.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/Dataset.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -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.]
*
* ------------
* Dataset.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): -;
@@ -37,10 +37,10 @@
* 18-Sep-2001 : Added standard header and fixed DOS encoding problem (DG);
* 15-Oct-2001 : Moved to a new package (com.jrefinery.data.*) (DG);
* 22-Oct-2001 : Changed name to Dataset.java (DG);
- * 17-Nov-2001 : Added getLegendItemCount() and getLegendItemLabels() methods,
+ * 17-Nov-2001 : Added getLegendItemCount() and getLegendItemLabels() methods,
* created SeriesDataset interface and transferred series related
* methods out (DG);
- * 22-Jan-2002 : Reconsidered (and removed) the getLegendItemCount() and
+ * 22-Jan-2002 : Reconsidered (and removed) the getLegendItemCount() and
* getLegendItemLabels() methods...leave this to client code (DG);
* 27-Sep-2002 : Added get/setDatasetGroup() methods (DG);
* 10-Jan-2003 : Updated Javadocs (DG);
@@ -52,12 +52,12 @@
/**
* The base interface for data sets.
* <P>
- * All datasets are required to support the {@link DatasetChangeEvent}
- * mechanism by allowing listeners to register and receive notification of any
+ * All datasets are required to support the {@link DatasetChangeEvent}
+ * mechanism by allowing listeners to register and receive notification of any
* changes to the dataset.
* <P>
- * In addition, all datasets must belong to one (and only one)
- * {@link DatasetGroup}. The group object maintains a reader-writer lock
+ * In addition, all datasets must belong to one (and only one)
+ * {@link DatasetGroup}. The group object maintains a reader-writer lock
* which provides synchronised access to the datasets in multi-threaded code.
*/
public interface Dataset {
Modified: trunk/source/org/jfree/data/general/DatasetChangeEvent.java
===================================================================
--- trunk/source/org/jfree/data/general/DatasetChangeEvent.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/DatasetChangeEvent.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -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.]
*
* -----------------------
* DatasetChangeEvent.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): -;
@@ -37,8 +37,8 @@
* 24-Aug-2001 : Added standard source header. Fixed DOS encoding problem (DG);
* 15-Oct-2001 : Move to new package (com.jrefinery.data.*) (DG);
* 22-Oct-2001 : Renamed DataSource.java --> Dataset.java etc. (DG);
- * 11-Jun-2002 : Separated the event source from the dataset to cover the case
- * where the dataset is changed to null in the Plot class.
+ * 11-Jun-2002 : Separated the event source from the dataset to cover the case
+ * where the dataset is changed to null in the Plot class.
* Updated Javadocs (DG);
* 04-Oct-2002 : Fixed errors reported by Checkstyle (DG);
* 05-Oct-2004 : Minor Javadoc updates (DG);
@@ -58,9 +58,9 @@
private Dataset dataset;
/**
- * Constructs a new event. The source is either the dataset or the
- * {@link org.jfree.chart.plot.Plot} class. The dataset can be
- * <code>null</code> (in this case the source will be the
+ * Constructs a new event. The source is either the dataset or the
+ * {@link org.jfree.chart.plot.Plot} class. The dataset can be
+ * <code>null</code> (in this case the source will be the
* {@link org.jfree.chart.plot.Plot} class).
*
* @param source the source of the event.
@@ -74,7 +74,7 @@
/**
* Returns the dataset that generated the event. Note that the dataset
- * may be <code>null</code> since adding a <code>null</code> dataset to a
+ * may be <code>null</code> since adding a <code>null</code> dataset to a
* plot will generated a change event.
*
* @return The dataset (possibly <code>null</code>).
Modified: trunk/source/org/jfree/data/general/DatasetChangeListener.java
===================================================================
--- trunk/source/org/jfree/data/general/DatasetChangeListener.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/DatasetChangeListener.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -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.]
*
* --------------------------
* DatasetChangeListener.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): -;
Modified: trunk/source/org/jfree/data/general/DatasetGroup.java
===================================================================
--- trunk/source/org/jfree/data/general/DatasetGroup.java 2008-07-21 15:14:29 UTC (rev 1315)
+++ trunk/source/org/jfree/data/general/DatasetGroup.java 2008-07-22 08:01:48 UTC (rev 1316)
@@ -2,32 +2,32 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* -----------------
* DatasetGroup.java
* -----------------
- * (C) Copyright 2002-2007, by Object Refinery Limited.
+ * (C) Copyright 2002-2008, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -49,13 +49,13 @@
* purpose).
*/
public class DatasetGroup implements Cloneable, Serializable {
-
+
/** For serialization. */
private static final long serialVersionUID = -3640642179674185688L;
-
+
/** The group id. */
private String id;
-
+
/**
* Constructs a new group.
*/
@@ -66,55 +66,55 @@
/**
* Creates a new group with the specified id.
- *
+ *
* @param id the identification for the group.
*/
public DatasetGroup(String id) {
if (id == null) {
- throw new IllegalArgumentException("Null 'id' argument.");
+ throw new IllegalArgumentException("Null 'id' argument.");
}
- this.id = id;
+ this.id = id;
}
-
+
/**
* Returns the identification string for this group.
- *
+ *
* @return The identification string.
*/
public String getID() {
- return this.id;
+ return this.id;
}
-
+
/**
* Clones the group.
- *
+ *
* @return A clone.
- *
+ *
* @throws CloneNotSupportedException not by this class.
*/
public Object clone() throws CloneNotSupportedException {
- return super.clone();
+ return super.clone();
}
-
+
/**
* Tests this instance for equality with an arbitrary object.
- *
+ *
* @param obj the object (<code>null</code> permitted).
- *
+ *
* @return A boolean.
*/
public boolean equals(Object obj) {
if (obj == this) {
- return true;
+ return true;
}
if (!(obj instanceof DatasetGroup)) {
- return false;
+ return false;
}
DatasetGroup that = (DatasetGroup) obj;
if (!this.id.equals(that.id)) {
- return false;
+ return false;
}
return true;
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|