Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [1161] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/renderer
|
From: <mu...@us...> - 2008-06-16 20:25:55
|
Revision: 1161
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1161&view=rev
Author: mungady
Date: 2008-06-16 13:25:29 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2008-06-16 20:24:12 UTC (rev 1160)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/Outlier.java 2008-06-16 20:25:29 UTC (rev 1161)
@@ -2,34 +2,34 @@
* 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.]
*
* ------------
* Outlier.java
* ------------
- * (C) Copyright 2003-2007, by David Browning and Contributors.
+ * (C) Copyright 2003-2008, by David Browning and Contributors.
*
- * Original Author: David Browning (for Australian Institute of Marine
+ * Original Author: David Browning (for Australian Institute of Marine
* Science);
* Contributor(s): David Gilbert (for Object Refinery Limited);
*
@@ -54,8 +54,8 @@
*/
public class Outlier implements Comparable {
- /**
- * The xy coordinates of the bounding box containing the outlier ellipse.
+ /**
+ * The xy coordinates of the bounding box containing the outlier ellipse.
*/
private Point2D point;
@@ -63,7 +63,7 @@
private double radius;
/**
- * Constructs an outlier item consisting of a point and the radius of the
+ * Constructs an outlier item consisting of a point and the radius of the
* outlier ellipse
*
* @param xCoord the x coordinate of the point.
@@ -76,7 +76,7 @@
}
/**
- * Returns the xy coordinates of the bounding box containing the outlier
+ * Returns the xy coordinates of the bounding box containing the outlier
* ellipse.
*
* @return The location of the outlier ellipse.
@@ -86,7 +86,7 @@
}
/**
- * Sets the xy coordinates of the bounding box containing the outlier
+ * Sets the xy coordinates of the bounding box containing the outlier
* ellipse.
*
* @param point the location.
@@ -96,7 +96,7 @@
}
/**
- * Returns the x coordinate of the bounding box containing the outlier
+ * Returns the x coordinate of the bounding box containing the outlier
* ellipse.
*
* @return The x coordinate.
@@ -106,7 +106,7 @@
}
/**
- * Returns the y coordinate of the bounding box containing the outlier
+ * Returns the y coordinate of the bounding box containing the outlier
* ellipse.
*
* @return The y coordinate.
@@ -148,13 +148,13 @@
Point2D p2 = outlier.getPoint();
if (p1.equals(p2)) {
return 0;
- }
+ }
else if ((p1.getX() < p2.getX()) || (p1.getY() < p2.getY())) {
return -1;
- }
+ }
else {
return 1;
- }
+ }
}
/**
@@ -163,22 +163,22 @@
* a small margin.
*
* @param other the other outlier.
- *
- * @return A <code>boolean</code> indicating whether or not an overlap has
+ *
+ * @return A <code>boolean</code> indicating whether or not an overlap has
* occurred.
*/
public boolean overlaps(Outlier other) {
- return ((other.getX() >= getX() - (this.radius * 1.1))
- && (other.getX() <= getX() + (this.radius * 1.1))
- && (other.getY() >= getY() - (this.radius * 1.1))
+ return ((other.getX() >= getX() - (this.radius * 1.1))
+ && (other.getX() <= getX() + (this.radius * 1.1))
+ && (other.getY() >= getY() - (this.radius * 1.1))
&& (other.getY() <= getY() + (this.radius * 1.1)));
}
/**
* Tests this outlier for equality with an arbitrary object.
- *
+ *
* @param obj the object (<code>null</code> permitted).
- *
+ *
* @return A boolean.
*/
public boolean equals(Object obj) {
@@ -197,7 +197,7 @@
}
return true;
}
-
+
/**
* Returns a textual representation of the outlier.
*
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java 2008-06-16 20:24:12 UTC (rev 1160)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierList.java 2008-06-16 20:25:29 UTC (rev 1161)
@@ -2,34 +2,34 @@
* 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.]
*
* ----------------
* OutlierList.java
* ----------------
- * (C) Copyright 2003, 2004, 2007, by David Browning and Contributors.
+ * (C) Copyright 2003-2008, by David Browning and Contributors.
*
- * Original Author: David Browning (for Australian Institute of Marine
+ * Original Author: David Browning (for Australian Institute of Marine
* Science);
* Contributor(s): David Gilbert (for Object Refinery Limited);
*
@@ -41,6 +41,7 @@
* 02-Feb-2007 : Removed author tags from all over JFreeChart sources (DG);
*
*/
+
package org.jfree.chart.renderer;
import java.awt.geom.Point2D;
@@ -66,19 +67,19 @@
/** Storage for the outliers. */
private List outliers;
-
+
/** The averaged outlier. */
private Outlier averagedOutlier;
-
- /**
- * A flag that indicates whether or not there are multiple outliers in the
- * list.
+
+ /**
+ * A flag that indicates whether or not there are multiple outliers in the
+ * list.
*/
private boolean multiple = false;
/**
* Creates a new list containing a single outlier.
- *
+ *
* @param outlier the outlier.
*/
public OutlierList(Outlier outlier) {
@@ -88,27 +89,27 @@
/**
* Adds an outlier to the list.
- *
+ *
* @param outlier the outlier.
- *
+ *
* @return A boolean.
*/
public boolean add(Outlier outlier) {
- return this.outliers.add(outlier);
+ return this.outliers.add(outlier);
}
-
+
/**
* Returns the number of outliers in the list.
- *
+ *
* @return The item count.
*/
public int getItemCount() {
return this.outliers.size();
}
-
+
/**
- * Returns the averaged outlier.
- *
+ * Returns the averaged outlier.
+ *
* @return The averaged outlier.
*/
public Outlier getAveragedOutlier() {
@@ -117,7 +118,7 @@
/**
* Sets the averaged outlier.
- *
+ *
* @param averagedOutlier the averaged outlier.
*/
public void setAveragedOutlier(Outlier averagedOutlier) {
@@ -125,9 +126,9 @@
}
/**
- * Returns <code>true</code> if the list contains multiple outliers, and
+ * Returns <code>true</code> if the list contains multiple outliers, and
* <code>false</code> otherwise.
- *
+ *
* @return A boolean.
*/
public boolean isMultiple() {
@@ -135,9 +136,9 @@
}
/**
- * Sets the flag that indicates whether or not this list represents
+ * Sets the flag that indicates whether or not this list represents
* multiple outliers.
- *
+ *
* @param multiple the flag.
*/
public void setMultiple(boolean multiple) {
@@ -145,11 +146,11 @@
}
/**
- * Returns <code>true</code> if the outlier overlaps, and
+ * Returns <code>true</code> if the outlier overlaps, and
* <code>false</code> otherwise.
- *
+ *
* @param other the outlier.
- *
+ *
* @return A boolean.
*/
public boolean isOverlapped(Outlier other) {
@@ -157,10 +158,10 @@
if (other == null) {
return false;
}
-
+
boolean result = other.overlaps(getAveragedOutlier());
return result;
-
+
}
/**
@@ -171,15 +172,14 @@
double totalXCoords = 0.0;
double totalYCoords = 0.0;
int size = getItemCount();
- for (Iterator iterator = this.outliers.iterator();
- iterator.hasNext();) {
+ for (Iterator iterator = this.outliers.iterator();
+ iterator.hasNext();) {
Outlier o = (Outlier) iterator.next();
totalXCoords += o.getX();
totalYCoords += o.getY();
}
getAveragedOutlier().getPoint().setLocation(
- new Point2D.Double(totalXCoords / size, totalYCoords / size)
- );
+ new Point2D.Double(totalXCoords / size, totalYCoords / size));
}
}
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java 2008-06-16 20:24:12 UTC (rev 1160)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/OutlierListCollection.java 2008-06-16 20:25:29 UTC (rev 1161)
@@ -2,34 +2,34 @@
* 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.]
*
* --------------------------
* OutlierListCollection.java
* --------------------------
- * (C) Copyright 2003, 2004, 2007, by David Browning and Contributors.
+ * (C) Copyright 2003-2008, by David Browning and Contributors.
*
- * Original Author: David Browning (for Australian Institute of Marine
+ * Original Author: David Browning (for Australian Institute of Marine
* Science);
* Contributor(s): -;
*
@@ -62,28 +62,28 @@
/** Storage for the outlier lists. */
private List outlierLists;
-
- /**
+
+ /**
* Unbelievably, outliers which are more than 2 * interquartile range are
* called far outs... See Tukey EDA (a classic one of a kind...)
*/
private boolean highFarOut = false;
/**
- * A flag that indicates whether or not the collection contains low far
+ * A flag that indicates whether or not the collection contains low far
* out values.
*/
private boolean lowFarOut = false;
-
+
/**
* Creates a new empty collection.
*/
public OutlierListCollection() {
this.outlierLists = new ArrayList();
}
-
+
/**
- * A flag to indicate the presence of one or more far out values at the
+ * A flag to indicate the presence of one or more far out values at the
* top end of the range.
*
* @return A <code>boolean</code>.
@@ -93,7 +93,7 @@
}
/**
- * Sets the flag that indicates the presence of one or more far out values
+ * Sets the flag that indicates the presence of one or more far out values
* at the top end of the range.
*
* @param farOut the flag.
@@ -103,7 +103,7 @@
}
/**
- * A flag to indicate the presence of one or more far out values at the
+ * A flag to indicate the presence of one or more far out values at the
* bottom end of the range.
*
* @return A <code>boolean</code>.
@@ -113,7 +113,7 @@
}
/**
- * Sets the flag that indicates the presence of one or more far out values
+ * Sets the flag that indicates the presence of one or more far out values
* at the bottom end of the range.
*
* @param farOut the flag.
@@ -129,17 +129,17 @@
* and that list is updated.
*
* @param outlier element to be appended to this list.
- *
+ *
* @return <tt>true</tt> (as per the general contract of Collection.add).
*/
public boolean add(Outlier outlier) {
if (this.outlierLists.isEmpty()) {
return this.outlierLists.add(new OutlierList(outlier));
- }
+ }
else {
boolean updated = false;
- for (Iterator iterator = this.outlierLists.iterator();
+ for (Iterator iterator = this.outlierLists.iterator();
iterator.hasNext();) {
OutlierList list = (OutlierList) iterator.next();
if (list.isOverlapped(outlier)) {
@@ -157,17 +157,17 @@
/**
* Returns an iterator for the outlier lists.
- *
+ *
* @return An iterator.
*/
public Iterator iterator() {
- return this.outlierLists.iterator();
+ return this.outlierLists.iterator();
}
-
-
- /**
+
+
+ /**
* Updates the outlier list by adding the outlier to the end of the list and
- * setting the averaged outlier to the average x and y coordinnate values
+ * setting the averaged outlier to the average x and y coordinnate values
* of the outliers in the list.
*
* @param list the outlier list to be updated.
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java 2008-06-16 20:24:12 UTC (rev 1160)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/PaintScale.java 2008-06-16 20:25:29 UTC (rev 1161)
@@ -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.]
*
* ---------------
* PaintScale.java
* ---------------
- * (C) Copyright 2006, 2007, by Object Refinery Limited.
+ * (C) Copyright 2006-2008, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -36,7 +36,7 @@
* -------
* 05-Jul-2006 : Version 1 (DG);
* 31-Jan-2007 : Added getLowerBound() and getUpperBound() methods (DG);
- *
+ *
*/
package org.jfree.chart.renderer;
@@ -46,43 +46,43 @@
import org.jfree.chart.renderer.xy.XYBlockRenderer;
/**
- * A source for <code>Paint</code> instances, used by the
- * {@link XYBlockRenderer}.
+ * A source for <code>Paint</code> instances, used by the
+ * {@link XYBlockRenderer}.
* <br><br>
- * NOTE: Classes that implement this interface should also implement
- * <code>PublicCloneable</code> and <code>Serializable</code>, so
- * that any renderer (or other object instance) that references an instance of
+ * NOTE: Classes that implement this interface should also implement
+ * <code>PublicCloneable</code> and <code>Serializable</code>, so
+ * that any renderer (or other object instance) that references an instance of
* this interface can still be cloned or serialized.
- *
+ *
* @since 1.0.4
*/
public interface PaintScale {
-
+
/**
* Returns the lower bound for the scale.
- *
+ *
* @return The lower bound.
- *
+ *
* @see #getUpperBound()
*/
public double getLowerBound();
-
+
/**
* Returns the upper bound for the scale.
- *
+ *
* @return The upper bound.
- *
+ *
* @see #getLowerBound()
*/
public double getUpperBound();
-
+
/**
* Returns a <code>Paint</code> instance for the specified value.
- *
+ *
* @param value the value.
- *
+ *
* @return A <code>Paint</code> instance (never <code>null</code>).
*/
public Paint getPaint(double value);
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|