JFreeChart

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.

Revision: 1318
          http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1318&view=rev
Author:   mungady
Date:     2008-07-22 08:12:36 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
Whitespace.

Modified Paths:
--------------
    trunk/source/org/jfree/data/general/Series.java
    trunk/source/org/jfree/data/general/SeriesChangeEvent.java
    trunk/source/org/jfree/data/general/SeriesChangeListener.java
    trunk/source/org/jfree/data/general/SeriesDataset.java
    trunk/source/org/jfree/data/general/SeriesException.java
    trunk/source/org/jfree/data/general/SubSeriesDataset.java
    trunk/source/org/jfree/data/general/ValueDataset.java
    trunk/source/org/jfree/data/general/WaferMapDataset.java

Modified: trunk/source/org/jfree/data/general/Series.java
===================================================================
--- trunk/source/org/jfree/data/general/Series.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/Series.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -2,32 +2,32 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Lesser General Public License as published by 
- * the Free Software Foundation; either version 2.1 of the License, or 
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public 
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
  * License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 
- * USA.  
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
  *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  *
  * -----------
  * Series.java
  * -----------
- * (C) Copyright 2001-2007, by Object Refinery Limited.
+ * (C) Copyright 2001-2008, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -36,21 +36,21 @@
  * -------
  * 15-Nov-2001 : Version 1 (DG);
  * 29-Nov-2001 : Added cloning and property change support (DG);
- * 30-Jan-2002 : Added a description attribute and changed the constructors to 
+ * 30-Jan-2002 : Added a description attribute and changed the constructors to
  *               protected (DG);
  * 07-Oct-2002 : Fixed errors reported by Checkstyle (DG);
  * 13-Mar-2003 : Implemented Serializable (DG);
  * 01-May-2003 : Added equals() method (DG);
- * 26-Jun-2003 : Changed listener list to use EventListenerList - see bug 
+ * 26-Jun-2003 : Changed listener list to use EventListenerList - see bug
  *               757027 (DG);
- * 15-Oct-2003 : Added a flag to control whether or not change events are sent 
+ * 15-Oct-2003 : Added a flag to control whether or not change events are sent
  *               to registered listeners (DG);
  * 19-May-2005 : Made abstract (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 04-May-2006 : Updated API docs (DG);
  * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 26-Sep-2007 : Added isEmpty() and getItemCount() methods (DG);
- * 
+ *
  */
 
 package org.jfree.data.general;
@@ -70,14 +70,14 @@
  * The series has two properties ("Key" and "Description") for which you can
  * register a <code>PropertyChangeListener</code>.
  * <P>
- * You can also register a {@link SeriesChangeListener} to receive notification 
+ * You can also register a {@link SeriesChangeListener} to receive notification
  * of changes to the series data.
  */
 public abstract class Series implements Cloneable, Serializable {
 
     /** For serialization. */
     private static final long serialVersionUID = -6906561437538683581L;
-    
+
     /** The key for the series. */
     private Comparable key;
 
@@ -94,7 +94,7 @@
     private boolean notify;
 
     /**
-     * Creates a new series with the specified key.  
+     * Creates a new series with the specified key.
      *
      * @param key  the series key (<code>null</code> not permitted).
      */
@@ -116,14 +116,14 @@
         this.description = description;
         this.listeners = new EventListenerList();
         this.propertyChangeSupport = new PropertyChangeSupport(this);
-        this.notify = true;   
+        this.notify = true;
     }
 
     /**
      * Returns the key for the series.
      *
      * @return The series key (never <code>null</code>).
-     * 
+     *
      * @see #setKey(Comparable)
      */
     public Comparable getKey() {
@@ -131,11 +131,11 @@
     }
 
     /**
-     * Sets the key for the series and sends a <code>PropertyChangeEvent</code> 
+     * Sets the key for the series and sends a <code>PropertyChangeEvent</code>
      * (with the property name "Key") to all registered listeners.
      *
      * @param key  the key (<code>null</code> not permitted).
-     * 
+     *
      * @see #getKey()
      */
     public void setKey(Comparable key) {
@@ -151,7 +151,7 @@
      * Returns a description of the series.
      *
      * @return The series description (possibly <code>null</code>).
-     * 
+     *
      * @see #setDescription(String)
      */
     public String getDescription() {
@@ -159,38 +159,38 @@
     }
 
     /**
-     * Sets the description of the series and sends a 
+     * Sets the description of the series and sends a
      * <code>PropertyChangeEvent</code> to all registered listeners.
      *
      * @param description  the description (<code>null</code> permitted).
-     * 
+     *
      * @see #getDescription()
      */
     public void setDescription(String description) {
         String old = this.description;
         this.description = description;
-        this.propertyChangeSupport.firePropertyChange("Description", old, 
+        this.propertyChangeSupport.firePropertyChange("Description", old,
                 description);
     }
 
     /**
-     * Returns the flag that controls whether or not change events are sent to 
+     * Returns the flag that controls whether or not change events are sent to
      * registered listeners.
-     * 
+     *
      * @return A boolean.
-     * 
+     *
      * @see #setNotify(boolean)
      */
     public boolean getNotify() {
         return this.notify;
     }
-    
+
     /**
-     * Sets the flag that controls whether or not change events are sent to 
+     * Sets the flag that controls whether or not change events are sent to
      * registered listeners.
-     * 
+     *
      * @param notify  the new value of the flag.
-     * 
+     *
      * @see #getNotify()
      */
     public void setNotify(boolean notify) {
@@ -199,41 +199,41 @@
             fireSeriesChanged();
         }
     }
-    
+
     /**
      * Returns <code>true</code> if the series contains no data items, and
      * <code>false</code> otherwise.
-     * 
+     *
      * @return A boolean.
-     * 
+     *
      * @since 1.0.7
      */
     public boolean isEmpty() {
         return (getItemCount() == 0);
     }
-    
+
     /**
      * Returns the number of data items in the series.
-     * 
+     *
      * @return The number of data items in the series.
      */
     public abstract int getItemCount();
-    
+
     /**
      * Returns a clone of the series.
      * <P>
      * Notes:
      * <ul>
-     * <li>No need to clone the name or description, since String object is 
+     * <li>No need to clone the name or description, since String object is
      * immutable.</li>
-     * <li>We set the listener list to empty, since the listeners did not 
+     * <li>We set the listener list to empty, since the listeners did not
      * register with the clone.</li>
      * <li>Same applies to the PropertyChangeSupport instance.</li>
      * </ul>
      *
      * @return A clone of the series.
-     * 
-     * @throws CloneNotSupportedException  not thrown by this class, but 
+     *
+     * @throws CloneNotSupportedException  not thrown by this class, but
      *         subclasses may differ.
      */
     public Object clone() throws CloneNotSupportedException {
@@ -271,22 +271,22 @@
 
     /**
      * Returns a hash code.
-     * 
+     *
      * @return A hash code.
      */
     public int hashCode() {
         int result;
         result = this.key.hashCode();
-        result = 29 * result + (this.description != null 
+        result = 29 * result + (this.description != null
                 ? this.description.hashCode() : 0);
         return result;
     }
 
     /**
-     * Registers an object with this series, to receive notification whenever 
+     * Registers an object with this series, to receive notification whenever
      * the series changes.
      * <P>
-     * Objects being registered must implement the {@link SeriesChangeListener} 
+     * Objects being registered must implement the {@link SeriesChangeListener}
      * interface.
      *
      * @param listener  the listener to register.
@@ -296,7 +296,7 @@
     }
 
     /**
-     * Deregisters an object, so that it not longer receives notification 
+     * Deregisters an object, so that it not longer receives notification
      * whenever the series changes.
      *
      * @param listener  the listener to deregister.
@@ -318,7 +318,7 @@
     /**
      * Sends a change event to all registered listeners.
      *
-     * @param event  contains information about the event that triggered the 
+     * @param event  contains information about the event that triggered the
      *               notification.
      */
     protected void notifyListeners(SeriesChangeEvent event) {
@@ -358,9 +358,9 @@
      * @param oldValue  the old value.
      * @param newValue  the new value.
      */
-    protected void firePropertyChange(String property, Object oldValue, 
+    protected void firePropertyChange(String property, Object oldValue,
             Object newValue) {
-        this.propertyChangeSupport.firePropertyChange(property, oldValue, 
+        this.propertyChangeSupport.firePropertyChange(property, oldValue,
                 newValue);
     }
 

Modified: trunk/source/org/jfree/data/general/SeriesChangeEvent.java
===================================================================
--- trunk/source/org/jfree/data/general/SeriesChangeEvent.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/SeriesChangeEvent.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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.]
  *
  * ----------------------
  * SeriesChangeEvent.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):   -;
@@ -51,7 +51,7 @@
 
     /** For serialization. */
     private static final long serialVersionUID = 1593866085210089052L;
-    
+
     /**
      * Constructs a new event.
      *

Modified: trunk/source/org/jfree/data/general/SeriesChangeListener.java
===================================================================
--- trunk/source/org/jfree/data/general/SeriesChangeListener.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/SeriesChangeListener.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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.]
  *
  * -------------------------
  * SeriesChangeListener.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):   -;
@@ -35,7 +35,7 @@
  * Changes
  * -------
  * 15-Nov-2001 : Version 1 (DG);
- * 26-Jun-2003 : Now extends EventListener so we can use the EventListenerList 
+ * 26-Jun-2003 : Now extends EventListener so we can use the EventListenerList
  *               mechanism (DG);
  *
  */

Modified: trunk/source/org/jfree/data/general/SeriesDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/SeriesDataset.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/SeriesDataset.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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.]
  *
  * ------------------
  * SeriesDataset.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,7 +38,7 @@
  * 07-Oct-2002 : Fixed errors reported by Checkstyle (DG);
  * 19-May-2005 : Changed getSeriesName() --> getSeriesKey() and added indexOf()
  *               method (DG);
- * 
+ *
  */
 
 package org.jfree.data.general;
@@ -70,7 +70,7 @@
     /**
      * 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.
@@ -78,13 +78,13 @@
     public Comparable getSeriesKey(int series);
 
     /**
-     * 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);
-    
+
 }

Modified: trunk/source/org/jfree/data/general/SeriesException.java
===================================================================
--- trunk/source/org/jfree/data/general/SeriesException.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/SeriesException.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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.]
  *
  * --------------------
  * SeriesException.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):   -;
@@ -51,7 +51,7 @@
 
     /** For serialization. */
     private static final long serialVersionUID = -3667048387550852940L;
-    
+
     /**
      * Constructs a new series exception.
      *

Modified: trunk/source/org/jfree/data/general/SubSeriesDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/SubSeriesDataset.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/SubSeriesDataset.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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,13 +36,13 @@
  * Changes
  * -------
  * 06-Dec-2001 : Version 1 (BK);
- * 05-Feb-2002 : Added SignalsDataset (and small change to HighLowDataset 
+ * 05-Feb-2002 : Added SignalsDataset (and small change to HighLowDataset
  *               interface) as requested by Sylvain Vieujot (DG);
- * 28-Feb-2002 : Fixed bug: missing map[series] in IntervalXYDataset and 
+ * 28-Feb-2002 : Fixed bug: missing map[series] in IntervalXYDataset and
  *               SignalsDataset methods (BK);
  * 07-Oct-2002 : Fixed errors reported by Checkstyle (DG);
  * 06-May-2004 : Now extends AbstractIntervalXYDataset (DG);
- * 15-Jul-2004 : Switched getX() with getXValue() and getY() with 
+ * 15-Jul-2004 : Switched getX() with getXValue() and getY() with
  *               getYValue() (DG);
  * 29-Nov-2005 : Removed SignalsDataset (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
@@ -59,12 +59,10 @@
 
 /**
  * This class will create a dataset with one or more series from another
- * {@link SeriesDataset}. 
+ * {@link SeriesDataset}.
  */
 public class SubSeriesDataset extends AbstractIntervalXYDataset
-                              implements OHLCDataset,
-                                         IntervalXYDataset,
-                                         CombinationDataset {
+        implements OHLCDataset, IntervalXYDataset, CombinationDataset {
 
     /** The parent dataset. */
     private SeriesDataset parent = null;
@@ -73,7 +71,7 @@
     private int[] map;  // maps our series into our parent's
 
     /**
-     * Creates a SubSeriesDataset using one or more series from 
+     * Creates a SubSeriesDataset using one or more series from
      * <code>parent</code>.  The series to use are passed as an array of int.
      *
      * @param parent  underlying dataset
@@ -102,7 +100,7 @@
     /**
      * Returns the high-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link OHLCDataset}.
      *
      * @param series  the index of the series of interest (zero-based).
@@ -115,27 +113,27 @@
     }
 
     /**
-     * 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;
     }
 
     /**
      * Returns the low-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link OHLCDataset}.
      *
      * @param series  the index of the series of interest (zero-based).
@@ -148,27 +146,27 @@
     }
 
     /**
-     * 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;
     }
 
     /**
      * Returns the open-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link OHLCDataset}.
      *
      * @param series  the index of the series of interest (zero-based).
@@ -181,27 +179,27 @@
     }
 
     /**
-     * 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;
     }
 
     /**
      * Returns the close-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link OHLCDataset}.
      *
      * @param series  the index of the series of interest (zero-based).
@@ -214,27 +212,27 @@
     }
 
     /**
-     * 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;
     }
 
     /**
      * Returns the volume.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link OHLCDataset}.
      *
      * @param series  the series (zero based index).
@@ -247,21 +245,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;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -271,7 +269,7 @@
     /**
      * Returns the X-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link XYDataset}.
      *
      * @param series  the index of the series of interest (zero-based);
@@ -286,7 +284,7 @@
     /**
      * Returns the Y-value for the specified series and item.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link XYDataset}.
      *
      * @param series  the index of the series of interest (zero-based).
@@ -301,7 +299,7 @@
     /**
      * Returns the number of items in a series.
      * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a 
+     * Note: throws <code>ClassCastException</code> if the series if not from a
      * {@link XYDataset}.
      *
      * @param series  the index of the series of interest (zero-based).

Modified: trunk/source/org/jfree/data/general/ValueDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/ValueDataset.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/ValueDataset.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -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.]
  *
  * -----------------
  * ValueDataset.java
  * -----------------
- * (C) Copyright 2003-2007, by Object Refinery Limited.
+ * (C) Copyright 2003-2008, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;

Modified: trunk/source/org/jfree/data/general/WaferMapDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/WaferMapDataset.java	2008-07-22 08:06:41 UTC (rev 1317)
+++ trunk/source/org/jfree/data/general/WaferMapDataset.java	2008-07-22 08:12:36 UTC (rev 1318)
@@ -2,43 +2,43 @@
  * 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.]
  *
  * --------------------
  * WaferMapDataset.java
  * --------------------
- * (C)opyright 2003-2007, by Robert Redburn and Contributors.
+ * (C)opyright 2003-2008, by Robert Redburn and Contributors.
  *
  * Original Author:  Robert Redburn;
  * Contributor(s):   David Gilbert (for Object Refinery Limited);
  *
  * Changes
  * -------
- * 25-Nov-2003 : Version 1 contributed by Robert Redburn (with some 
+ * 25-Nov-2003 : Version 1 contributed by Robert Redburn (with some
  *               modifications to match style conventions) (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG);
- * 
+ *
  */
 
 package org.jfree.data.general;
@@ -54,57 +54,57 @@
  */
 public class WaferMapDataset extends AbstractDataset {
 
-    /** 
-     * Storage structure for the data values (row key is chipx, column is 
+    /**
+     * Storage structure for the data values (row key is chipx, column is
      * chipy)
      */
     private DefaultKeyedValues2D data;
-    
+
     /** wafer x dimension */
     private int maxChipX;
-    
+
     /** wafer y dimension */
     private int maxChipY;
-    
+
     /** space to draw between chips */
     private double chipSpace;
-    
+
     /** maximum value in this dataset */
     private Double maxValue;
-    
+
     /** minimum value in this dataset */
     private Double minValue;
-    
+
     /** default chip spacing */
     private static final double DEFAULT_CHIP_SPACE = 1d;
-    
+
     /**
      * Creates a new dataset using the default chipspace.
-     * 
+     *
      * @param maxChipX  the wafer x-dimension.
      * @param maxChipY  the wafer y-dimension.
      */
     public WaferMapDataset(int maxChipX, int maxChipY) {
         this(maxChipX, maxChipY, null);
     }
-    
+
     /**
      * Creates a new dataset.
-     * 
-     * @param maxChipX  the wafer x-dimension. 
+     *
+     * @param maxChipX  the wafer x-dimension.
      * @param maxChipY  the wafer y-dimension.
      * @param chipSpace  the space between chips.
      */
     public WaferMapDataset(int maxChipX, int maxChipY, Number chipSpace) {
-        
+
         this.maxValue = new Double(Double.NEGATIVE_INFINITY);
         this.minValue = new Double(Double.POSITIVE_INFINITY);
         this.data = new DefaultKeyedValues2D();
-        
+
         this.maxChipX = maxChipX;
         this.maxChipY = maxChipY;
         if (chipSpace == null) {
-            this.chipSpace = DEFAULT_CHIP_SPACE; 
+            this.chipSpace = DEFAULT_CHIP_SPACE;
         }
         else {
             this.chipSpace = chipSpace.doubleValue();
@@ -114,7 +114,7 @@
 
     /**
      * Sets a value in the dataset.
-     * 
+     *
      * @param value  the value.
      * @param chipx  the x-index for the chip.
      * @param chipy  the y-index for the chip.
@@ -122,10 +122,10 @@
     public void addValue(Number value, Comparable chipx, Comparable chipy) {
         setValue(value, chipx, chipy);
     }
-    
+
     /**
      * Adds a value to the dataset.
-     * 
+     *
      * @param v  the value.
      * @param x  the x-index.
      * @param y  the y-index.
@@ -133,10 +133,10 @@
     public void addValue(int v, int x, int y) {
         setValue(new Double(v), new Integer(x), new Integer(y));
     }
-    
+
     /**
      * Sets a value in the dataset and updates min and max value entries.
-     * 
+     *
      * @param value  the value.
      * @param chipx  the x-index.
      * @param chipy  the y-index.
@@ -153,7 +153,7 @@
 
     /**
      * Returns the number of unique values.
-     * 
+     *
      * @return The number of unique values.
      */
     public int getUniqueValueCount() {
@@ -162,7 +162,7 @@
 
     /**
      * Returns the set of unique values.
-     * 
+     *
      * @return The set of unique values.
      */
     public Set getUniqueValues() {
@@ -181,10 +181,10 @@
 
     /**
      * Returns the data value for a chip.
-     * 
+     *
      * @param chipx  the x-index.
      * @param chipy  the y-index.
-     * 
+     *
      * @return The data value.
      */
     public Number getChipValue(int chipx, int chipy) {
@@ -193,10 +193,10 @@
 
     /**
      * Returns the value for a given chip x and y or null.
-     * 
+     *
      * @param chipx  the x-index.
      * @param chipy  the y-index.
-     * 
+     *
      * @return The data value.
      */
     public Number getChipValue(Comparable chipx, Comparable chipy) {
@@ -213,9 +213,9 @@
 
     /**
      * Tests to see if the passed value is larger than the stored maxvalue.
-     * 
+     *
      * @param check  the number to check.
-     * 
+     *
      * @return A boolean.
      */
     public boolean isMaxValue(Number check) {
@@ -227,9 +227,9 @@
 
     /**
      * Tests to see if the passed value is smaller than the stored minvalue.
-     * 
+     *
      * @param check  the number to check.
-     * 
+     *
      * @return A boolean.
      */
     public boolean isMinValue(Number check) {
@@ -238,28 +238,28 @@
         }
         return false;
     }
-    
-    /** 
+
+    /**
      * Returns the maximum value stored in the dataset.
-     * 
+     *
      * @return The maximum value.
      */
     public Number getMaxValue() {
-        return this.maxValue;   
+        return this.maxValue;
     }
-    
-    /** 
+
+    /**
      * Returns the minimum value stored in the dataset.
-     * 
+     *
      * @return The minimum value.
      */
     public Number getMinValue() {
-        return this.minValue;   
+        return this.minValue;
     }
 
     /**
      * Returns the wafer x-dimension.
-     * 
+     *
      * @return The number of chips in the x-dimension.
      */
     public int getMaxChipX() {
@@ -268,7 +268,7 @@
 
     /**
      * Sets wafer x dimension.
-     * 
+     *
      * @param maxChipX  the number of chips in the x-dimension.
      */
     public void setMaxChipX(int maxChipX) {
@@ -277,7 +277,7 @@
 
     /**
      * Returns the number of chips in the y-dimension.
-     * 
+     *
      * @return The number of chips.
      */
     public int getMaxChipY() {
@@ -286,7 +286,7 @@
 
     /**
      * Sets the number of chips in the y-dimension.
-     * 
+     *
      * @param maxChipY  the number of chips.
      */
     public void setMaxChipY(int maxChipY) {
@@ -295,7 +295,7 @@
 
     /**
      * Returns the space to draw between chips.
-     * 
+     *
      * @return The space.
      */
     public double getChipSpace() {
@@ -304,11 +304,11 @@
 
     /**
      * Sets the space to draw between chips.
-     * 
+     *
      * @param space  the space.
      */
     public void setChipSpace(double space) {
         this.chipSpace = space;
     }
-    
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1324
          http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1324&view=rev
Author:   mungady
Date:     2008-07-22 09:01:37 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
Synchronised with 1.0.x branch.

Modified Paths:
--------------
    trunk/source/org/jfree/data/general/CombinedDataset.java
    trunk/source/org/jfree/data/general/DatasetUtilities.java

Modified: trunk/source/org/jfree/data/general/CombinedDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/CombinedDataset.java	2008-07-22 08:58:19 UTC (rev 1323)
+++ trunk/source/org/jfree/data/general/CombinedDataset.java	2008-07-22 09:01:37 UTC (rev 1324)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * --------------------
  * CombinedDataset.java
  * --------------------
- * (C) Copyright 2001-2007, by Bill Kelemen and Contributors.
+ * (C) Copyright 2001-2008, by Bill Kelemen and Contributors.
  *
  * Original Author:  Bill Kelemen;
  * Contributor(s):   David Gilbert (for Object Refinery Limited);

Modified: trunk/source/org/jfree/data/general/DatasetUtilities.java
===================================================================
--- trunk/source/org/jfree/data/general/DatasetUtilities.java	2008-07-22 08:58:19 UTC (rev 1323)
+++ trunk/source/org/jfree/data/general/DatasetUtilities.java	2008-07-22 09:01:37 UTC (rev 1324)
@@ -762,7 +762,8 @@
 
     /**
      * Returns the range of values in the range for the dataset.  This method
-     * is the partner for the {@link #findDomainBounds(XYDataset)} method.
+     * is the partner for the {@link #findDomainBounds(XYDataset, boolean)}
+     * method.
      *
      * @param dataset  the dataset (<code>null</code> not permitted).
      * @param includeInterval  a flag that determines whether or not the
@@ -842,7 +843,7 @@
                 for (int column = 0; column < columnCount; column++) {
                     Number value = dataset.getValue(row, column);
                     if (value != null) {
-                    	double v = value.doubleValue();
+                        double v = value.doubleValue();
                         minimum = Math.min(minimum, v);
                         maximum = Math.max(maximum, v);
                     }
@@ -885,7 +886,7 @@
      * @since 1.0.10
      */
     public static Range iterateRangeBounds(XYDataset dataset,
-    		boolean includeInterval) {
+            boolean includeInterval) {
         double minimum = Double.POSITIVE_INFINITY;
         double maximum = Double.NEGATIVE_INFINITY;
         int seriesCount = dataset.getSeriesCount();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1960
          http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1960&view=rev
Author:   mungady
Date:     2009-04-07 18:58:46 +0000 (Tue, 07 Apr 2009)

Log Message:
-----------
Synchronised with 1.0.x branch.

Removed Paths:
-------------
    trunk/source/org/jfree/data/general/CombinationDataset.java
    trunk/source/org/jfree/data/general/CombinedDataset.java
    trunk/source/org/jfree/data/general/SubSeriesDataset.java

Deleted: trunk/source/org/jfree/data/general/CombinationDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/CombinationDataset.java	2009-04-07 18:33:52 UTC (rev 1959)
+++ trunk/source/org/jfree/data/general/CombinationDataset.java	2009-04-07 18:58:46 UTC (rev 1960)
@@ -1,72 +0,0 @@
-/* ===========================================================
- * JFreeChart : a free chart library for the Java(tm) platform
- * ===========================================================
- *
- * (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
- * (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
- * 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.
- *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
- * in the United States and other countries.]
- *
- * -----------------------
- * CombinationDataset.java
- * -----------------------
- * (C) Copyright 2001-2008, by Bill Kelemen.
- *
- * Original Author:  Bill Kelemen;
- * Contributor(s):   -;
- *
- * Changes
- * -------
- * 06-Dec-2001 : Version 1 (BK);
- * ------------- JFREECHART 1.0.x ---------------------------------------------
- * 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG);
- *
- */
-
-package org.jfree.data.general;
-
-/**
- * Interface that describes the new methods that any combined dataset needs to
- * implement. A combined dataset object will combine one or more datasets and
- * expose a sub-set or union of the combined datasets.
- */
-public interface CombinationDataset {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // New methods from CombinationDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the parent Dataset of this combination. If there is more than
-     * one parent, or a child is found that is not a combination, then returns
-     * <code>null</code>.
-     *
-     * @return The parent Dataset of this combination.
-     */
-    public SeriesDataset getParent();
-
-    /**
-     * Returns a map or indirect indexing form our series into parent's series.
-     *
-     * @return A map or indirect indexing form our series into parent's series.
-     */
-    public int[] getMap();
-
-}

Deleted: trunk/source/org/jfree/data/general/CombinedDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/CombinedDataset.java	2009-04-07 18:33:52 UTC (rev 1959)
+++ trunk/source/org/jfree/data/general/CombinedDataset.java	2009-04-07 18:58:46 UTC (rev 1960)
@@ -1,627 +0,0 @@
-/* ===========================================================
- * JFreeChart : a free chart library for the Java(tm) platform
- * ===========================================================
- *
- * (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
- * (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
- * 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.
- *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
- * in the United States and other countries.]
- *
- * --------------------
- * CombinedDataset.java
- * --------------------
- * (C) Copyright 2001-2008, by Bill Kelemen and Contributors.
- *
- * Original Author:  Bill Kelemen;
- * Contributor(s):   David Gilbert (for Object Refinery Limited);
- *
- * Changes
- * -------
- * 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
- *               CombinePlot (BK);
- * 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
- *               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
- *               that return double primitives (DG);
- * 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);
- *
- */
-
-package org.jfree.data.general;
-
-import java.util.List;
-
-import org.jfree.data.xy.AbstractIntervalXYDataset;
-import org.jfree.data.xy.IntervalXYDataset;
-import org.jfree.data.xy.OHLCDataset;
-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.
- */
-public class CombinedDataset extends AbstractIntervalXYDataset
-        implements XYDataset, OHLCDataset, IntervalXYDataset,
-        CombinationDataset {
-
-    /** Storage for the datasets we combine. */
-    private List datasetInfo = new java.util.ArrayList();
-
-    /**
-     * Default constructor for an empty combination.
-     */
-    public CombinedDataset() {
-        super();
-    }
-
-    /**
-     * Creates a CombinedDataset initialized with an array of SeriesDatasets.
-     *
-     * @param data  array of SeriesDataset that contains the SeriesDatasets to
-     *              combine.
-     */
-    public CombinedDataset(SeriesDataset[] data) {
-        add(data);
-    }
-
-    /**
-     * Adds one SeriesDataset to the combination. Listeners are notified of the
-     * change.
-     *
-     * @param data  the SeriesDataset to add.
-     */
-    public void add(SeriesDataset data) {
-        fastAdd(data);
-        DatasetChangeEvent event = new DatasetChangeEvent(this, this);
-        notifyListeners(event);
-    }
-
-    /**
-     * Adds an array of SeriesDataset's to the combination. Listeners are
-     * notified of the change.
-     *
-     * @param data  array of SeriesDataset to add
-     */
-    public void add(SeriesDataset[] data) {
-
-        for (int i = 0; i < data.length; i++) {
-            fastAdd(data[i]);
-        }
-        DatasetChangeEvent event = new DatasetChangeEvent(this, this);
-        notifyListeners(event);
-
-    }
-
-    /**
-     * Adds one series from a SeriesDataset to the combination. Listeners are
-     * notified of the change.
-     *
-     * @param data  the SeriesDataset where series is contained
-     * @param series  series to add
-     */
-    public void add(SeriesDataset data, int series) {
-        add(new SubSeriesDataset(data, series));
-    }
-
-    /**
-     * Fast add of a SeriesDataset. Does not notify listeners of the change.
-     *
-     * @param data  SeriesDataset to add
-     */
-    private void fastAdd(SeriesDataset data) {
-        for (int i = 0; i < data.getSeriesCount(); i++) {
-            this.datasetInfo.add(new DatasetInfo(data, i));
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From SeriesDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the number of series in the dataset.
-     *
-     * @return The number of series in the dataset.
-     */
-    public int getSeriesCount() {
-        return this.datasetInfo.size();
-    }
-
-    /**
-     * Returns the key for a series.
-     *
-     * @param series  the series (zero-based index).
-     *
-     * @return The key for a series.
-     */
-    public Comparable getSeriesKey(int series) {
-        DatasetInfo di = getDatasetInfo(series);
-        return di.data.getSeriesKey(di.series);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From XYDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the X-value for the specified series and item.
-     * <P>
-     * 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).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The X-value for the specified series and item.
-     */
-    public Number getX(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((XYDataset) di.data).getX(di.series, item);
-    }
-
-    /**
-     * Returns the Y-value for the specified series and item.
-     * <P>
-     * 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).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The Y-value for the specified series and item.
-     */
-    public Number getY(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((XYDataset) di.data).getY(di.series, item);
-    }
-
-    /**
-     * Returns the number of items in a series.
-     * <P>
-     * 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).
-     *
-     * @return The number of items in a series.
-     */
-    public int getItemCount(int series) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((XYDataset) di.data).getItemCount(di.series);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From HighLowDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the high-value for the specified series and item.
-     * <P>
-     * Note:  throws <code>ClassCastException</code> if the series is not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The high-value for the specified series and item.
-     */
-    public Number getHigh(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((OHLCDataset) di.data).getHigh(di.series, item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the low-value for the specified series and item.
-     * <P>
-     * Note:  throws <code>ClassCastException</code> if the series is not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The low-value for the specified series and item.
-     */
-    public Number getLow(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((OHLCDataset) di.data).getLow(di.series, item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the open-value for the specified series and item.
-     * <P>
-     * Note:  throws <code>ClassCastException</code> if the series is not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The open-value for the specified series and item.
-     */
-    public Number getOpen(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((OHLCDataset) di.data).getOpen(di.series, item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the close-value for the specified series and item.
-     * <P>
-     * Note:  throws <code>ClassCastException</code> if the series is not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The close-value for the specified series and item.
-     */
-    public Number getClose(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((OHLCDataset) di.data).getClose(di.series, item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the volume value for the specified series and item.
-     * <P>
-     * Note:  throws <code>ClassCastException</code> if the series is not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The volume value for the specified series and item.
-     */
-    public Number getVolume(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        return ((OHLCDataset) di.data).getVolume(di.series, item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From IntervalXYDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the starting X value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The value.
-     */
-    public Number getStartX(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        if (di.data instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) di.data).getStartX(di.series, item);
-        }
-        else {
-            return getX(series, item);
-        }
-    }
-
-    /**
-     * Returns the ending X value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The value.
-     */
-    public Number getEndX(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        if (di.data instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) di.data).getEndX(di.series, item);
-        }
-        else {
-            return getX(series, item);
-        }
-    }
-
-    /**
-     * Returns the starting Y value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The starting Y value for the specified series and item.
-     */
-    public Number getStartY(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        if (di.data instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) di.data).getStartY(di.series, item);
-        }
-        else {
-            return getY(series, item);
-        }
-    }
-
-    /**
-     * Returns the ending Y value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The ending Y value for the specified series and item.
-     */
-    public Number getEndY(int series, int item) {
-        DatasetInfo di = getDatasetInfo(series);
-        if (di.data instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) di.data).getEndY(di.series, item);
-        }
-        else {
-            return getY(series, item);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // New methods from CombinationDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the parent Dataset of this combination. If there is more than
-     * one parent, or a child is found that is not a CombinationDataset, then
-     * returns <code>null</code>.
-     *
-     * @return The parent Dataset of this combination or <code>null</code>.
-     */
-    public SeriesDataset getParent() {
-
-        SeriesDataset parent = null;
-        for (int i = 0; i < this.datasetInfo.size(); i++) {
-            SeriesDataset child = getDatasetInfo(i).data;
-            if (child instanceof CombinationDataset) {
-                SeriesDataset childParent
-                    = ((CombinationDataset) child).getParent();
-                if (parent == null) {
-                    parent = childParent;
-                }
-                else if (parent != childParent) {
-                    return null;
-                }
-            }
-            else {
-                return null;
-            }
-        }
-        return parent;
-
-    }
-
-    /**
-     * Returns a map or indirect indexing form our series into parent's series.
-     * Prior to calling this method, the client should check getParent() to make
-     * sure the CombinationDataset uses the same parent. If not, the map
-     * returned by this method will be invalid or null.
-     *
-     * @return A map or indirect indexing form our series into parent's series.
-     *
-     * @see #getParent()
-     */
-    public int[] getMap() {
-
-        int[] map = null;
-        for (int i = 0; i < this.datasetInfo.size(); i++) {
-            SeriesDataset child = getDatasetInfo(i).data;
-            if (child instanceof CombinationDataset) {
-                int[] childMap = ((CombinationDataset) child).getMap();
-                if (childMap == null) {
-                    return null;
-                }
-                map = joinMap(map, childMap);
-            }
-            else {
-                return null;
-            }
-        }
-        return map;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // New Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the child position.
-     *
-     * @param child  the child dataset.
-     *
-     * @return The position.
-     */
-    public int getChildPosition(Dataset child) {
-
-        int n = 0;
-        for (int i = 0; i < this.datasetInfo.size(); i++) {
-            SeriesDataset childDataset = getDatasetInfo(i).data;
-            if (childDataset instanceof CombinedDataset) {
-                int m = ((CombinedDataset) childDataset)
-                    .getChildPosition(child);
-                if (m >= 0) {
-                    return n + m;
-                }
-                n++;
-            }
-            else {
-                if (child == childDataset) {
-                    return n;
-                }
-                n++;
-            }
-        }
-        return -1;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Private
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the DatasetInfo object associated with the series.
-     *
-     * @param series  the index of the series.
-     *
-     * @return The DatasetInfo object associated with the series.
-     */
-    private DatasetInfo getDatasetInfo(int series) {
-        return (DatasetInfo) this.datasetInfo.get(series);
-    }
-
-    /**
-     * Joins two map arrays (int[]) together.
-     *
-     * @param a  the first array.
-     * @param b  the second array.
-     *
-     * @return A copy of { a[], b[] }.
-     */
-    private int[] joinMap(int[] a, int[] b) {
-        if (a == null) {
-            return b;
-        }
-        if (b == null) {
-            return a;
-        }
-        int[] result = new int[a.length + b.length];
-        System.arraycopy(a, 0, result, 0, a.length);
-        System.arraycopy(b, 0, result, a.length, b.length);
-        return result;
-    }
-
-    /**
-     * Private class to store as pairs (SeriesDataset, series) for all combined
-     * series.
-     */
-    private class DatasetInfo {
-
-        /** The dataset. */
-        private SeriesDataset data;
-
-        /** The series. */
-        private int series;
-
-        /**
-         * Creates a new dataset info record.
-         *
-         * @param data  the dataset.
-         * @param series  the series.
-         */
-        DatasetInfo(SeriesDataset data, int series) {
-            this.data = data;
-            this.series = series;
-        }
-    }
-
-}

Deleted: trunk/source/org/jfree/data/general/SubSeriesDataset.java
===================================================================
--- trunk/source/org/jfree/data/general/SubSeriesDataset.java	2009-04-07 18:33:52 UTC (rev 1959)
+++ trunk/source/org/jfree/data/general/SubSeriesDataset.java	2009-04-07 18:58:46 UTC (rev 1960)
@@ -1,439 +0,0 @@
-/* ===========================================================
- * JFreeChart : a free chart library for the Java(tm) platform
- * ===========================================================
- *
- * (C) Copyright 2000-2007, 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
- * (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
- * 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.
- *
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
- * in the United States and other countries.]
- *
- * ---------------------
- * SubseriesDataset.java
- * ---------------------
- * (C) Copyright 2001-2007, by Bill Kelemen and Contributors.
- *
- * Original Author:  Bill Kelemen;
- * Contributor(s):   Sylvain Vieujot;
- *                   David Gilbert (for Object Refinery Limited);
- *
- * Changes
- * -------
- * 06-Dec-2001 : Version 1 (BK);
- * 05-Feb-2002 : Added SignalsDataset (and small change to HighLowDataset
- *               interface) as requested by Sylvain Vieujot (DG);
- * 28-Feb-2002 : Fixed bug: missing map[series] in IntervalXYDataset and
- *               SignalsDataset methods (BK);
- * 07-Oct-2002 : Fixed errors reported by Checkstyle (DG);
- * 06-May-2004 : Now extends AbstractIntervalXYDataset (DG);
- * 15-Jul-2004 : Switched getX() with getXValue() and getY() with
- *               getYValue() (DG);
- * 29-Nov-2005 : Removed SignalsDataset (DG);
- * ------------- JFREECHART 1.0.x ---------------------------------------------
- * 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG);
- *
- */
-
-package org.jfree.data.general;
-
-import org.jfree.data.xy.AbstractIntervalXYDataset;
-import org.jfree.data.xy.OHLCDataset;
-import org.jfree.data.xy.IntervalXYDataset;
-import org.jfree.data.xy.XYDataset;
-
-/**
- * This class will create a dataset with one or more series from another
- * {@link SeriesDataset}.
- */
-public class SubSeriesDataset extends AbstractIntervalXYDataset
-        implements OHLCDataset, IntervalXYDataset, CombinationDataset {
-
-    /** The parent dataset. */
-    private SeriesDataset parent = null;
-
-    /** Storage for map. */
-    private int[] map;  // maps our series into our parent's
-
-    /**
-     * Creates a SubSeriesDataset using one or more series from
-     * <code>parent</code>.  The series to use are passed as an array of int.
-     *
-     * @param parent  underlying dataset
-     * @param map  int[] of series from parent to include in this Dataset
-     */
-    public SubSeriesDataset(SeriesDataset parent, int[] map) {
-        this.parent = parent;
-        this.map = map;
-    }
-
-    /**
-     * Creates a SubSeriesDataset using one series from <code>parent</code>.
-     * The series to is passed as an int.
-     *
-     * @param parent  underlying dataset
-     * @param series  series from parent to include in this Dataset
-     */
-    public SubSeriesDataset(SeriesDataset parent, int series) {
-        this(parent, new int[] {series});
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From HighLowDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the high-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The high-value for the specified series and item.
-     */
-    public Number getHigh(int series, int item) {
-        return ((OHLCDataset) this.parent).getHigh(this.map[series], item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the low-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The low-value for the specified series and item.
-     */
-    public Number getLow(int series, int item) {
-        return ((OHLCDataset) this.parent).getLow(this.map[series], item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the open-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The open-value for the specified series and item.
-     */
-    public Number getOpen(int series, int item) {
-        return ((OHLCDataset) this.parent).getOpen(this.map[series], item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the close-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The close-value for the specified series and item.
-     */
-    public Number getClose(int series, int item) {
-        return ((OHLCDataset) this.parent).getClose(this.map[series], item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    /**
-     * Returns the volume.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link OHLCDataset}.
-     *
-     * @param series  the series (zero based index).
-     * @param item  the item (zero based index).
-     *
-     * @return The volume.
-     */
-    public Number getVolume(int series, int item) {
-        return ((OHLCDataset) this.parent).getVolume(this.map[series], item);
-    }
-
-    /**
-     * 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();
-        }
-        return result;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From XYDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the X-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link XYDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based);
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The X-value for the specified series and item.
-     */
-    public Number getX(int series, int item) {
-        return ((XYDataset) this.parent).getX(this.map[series], item);
-    }
-
-    /**
-     * Returns the Y-value for the specified series and item.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link XYDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The Y-value for the specified series and item.
-     */
-    public Number getY(int series, int item) {
-        return ((XYDataset) this.parent).getY(this.map[series], item);
-    }
-
-    /**
-     * Returns the number of items in a series.
-     * <p>
-     * Note: throws <code>ClassCastException</code> if the series if not from a
-     * {@link XYDataset}.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     *
-     * @return The number of items in a series.
-     */
-    public int getItemCount(int series) {
-        return ((XYDataset) this.parent).getItemCount(this.map[series]);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From SeriesDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the number of series in the dataset.
-     *
-     * @return The number of series in the dataset.
-     */
-    public int getSeriesCount() {
-        return this.map.length;
-    }
-
-    /**
-     * Returns the key for a series.
-     *
-     * @param series  the series (zero-based index).
-     *
-     * @return The name of a series.
-     */
-    public Comparable getSeriesKey(int series) {
-        return this.parent.getSeriesKey(this.map[series]);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // From IntervalXYDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the starting X value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The starting X value for the specified series and item.
-     */
-    public Number getStartX(int series, int item) {
-        if (this.parent instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) this.parent).getStartX(
-                this.map[series], item
-            );
-        }
-        else {
-            return getX(series, item);
-        }
-    }
-
-    /**
-     * Returns the ending X value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The ending X value for the specified series and item.
-     */
-    public Number getEndX(int series, int item) {
-        if (this.parent instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) this.parent).getEndX(
-                this.map[series], item
-            );
-        }
-        else {
-            return getX(series, item);
-        }
-    }
-
-    /**
-     * Returns the starting Y value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The starting Y value for the specified series and item.
-     */
-    public Number getStartY(int series, int item) {
-        if (this.parent instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) this.parent).getStartY(
-                this.map[series], item
-            );
-        }
-        else {
-            return getY(series, item);
-        }
-    }
-
-    /**
-     * Returns the ending Y value for the specified series and item.
-     *
-     * @param series  the index of the series of interest (zero-based).
-     * @param item  the index of the item of interest (zero-based).
-     *
-     * @return The ending Y value for the specified series and item.
-     */
-    public Number getEndY(int series,  int item) {
-        if (this.parent instanceof IntervalXYDataset) {
-            return ((IntervalXYDataset) this.parent).getEndY(
-                this.map[series], item
-            );
-        }
-        else {
-            return getY(series, item);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // New methods from CombinationDataset
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the parent Dataset of this combination.
-     *
-     * @return The parent Dataset of this combination.
-     */
-    public SeriesDataset getParent() {
-        return this.parent;
-    }
-
-    /**
-     * Returns a map or indirect indexing form our series into parent's series.
-     *
-     * @return A map or indirect indexing form our series into parent's series.
-     */
-    public int[] getMap() {
-        return (int[]) this.map.clone();
-    }
-
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.