Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [420] trunk/experimental/org/jfree/experimental/ chart/plot/dial
|
From: <mu...@us...> - 2007-10-24 16:30:46
|
Revision: 420
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=420&view=rev
Author: mungady
Date: 2007-10-24 09:30:42 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Renamed StandardDialFrame --> ArcDialFrame.
Modified Paths:
--------------
trunk/experimental/org/jfree/experimental/chart/plot/dial/DialFrame.java
trunk/experimental/org/jfree/experimental/chart/plot/dial/DialPlot.java
trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPackageTests.java
trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPlotTests.java
Added Paths:
-----------
trunk/experimental/org/jfree/experimental/chart/plot/dial/ArcDialFrame.java
trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/ArcDialFrameTests.java
Removed Paths:
-------------
trunk/experimental/org/jfree/experimental/chart/plot/dial/StandardDialFrame.java
trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/StandardDialFrameTests.java
Copied: trunk/experimental/org/jfree/experimental/chart/plot/dial/ArcDialFrame.java (from rev 415, trunk/experimental/org/jfree/experimental/chart/plot/dial/StandardDialFrame.java)
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/ArcDialFrame.java (rev 0)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/ArcDialFrame.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -0,0 +1,516 @@
+/* ===========================================================
+ * 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.]
+ *
+ * ----------------------
+ * ArcDialFrame.java
+ * ----------------------
+ * (C) Copyright 2006, 2007, by Object Refinery Limited.
+ *
+ * Original Author: David Gilbert (for Object Refinery Limited);
+ * Contributor(s): -;
+ *
+ * Changes
+ * -------
+ * 03-Nov-2006 : Version 1 (DG);
+ * 08-Mar-2007 : Fix in hashCode() (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
+ * 17-Oct-2007 : Updated equals() (DG);
+ * 24-Oct-2007 : Added argument checks and API docs (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.plot.dial;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.Arc2D;
+import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import org.jfree.chart.HashUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
+
+/**
+ * A standard frame for the {@link DialPlot} class.
+ */
+public class ArcDialFrame extends AbstractDialLayer implements DialFrame,
+ Cloneable, PublicCloneable, Serializable {
+
+ /**
+ * The color used for the front of the panel. This field is transient
+ * because it requires special handling for serialization.
+ */
+ private transient Paint backgroundPaint;
+
+ /**
+ * The color used for the border around the window. This field is transient
+ * because it requires special handling for serialization.
+ */
+ private transient Paint foregroundPaint;
+
+ /**
+ * The stroke for drawing the frame outline. This field is transient
+ * because it requires special handling for serialization.
+ */
+ private transient Stroke stroke;
+
+ /**
+ * The start angle.
+ */
+ private double startAngle;
+
+ /**
+ * The end angle.
+ */
+ private double extent;
+
+ /** The inner radius, relative to the framing rectangle. */
+ private double innerRadius;
+
+ /** The outer radius, relative to the framing rectangle. */
+ private double outerRadius;
+
+ /**
+ * Creates a new instance of <code>ArcDialFrame</code> that spans
+ * 180 degrees.
+ */
+ public ArcDialFrame() {
+ this(0, 180);
+ }
+
+ /**
+ * Creates a new instance of <code>ArcDialFrame</code> that spans
+ * the arc specified.
+ *
+ * @param startAngle the startAngle (in degrees).
+ * @param extent the extent of the arc (in degrees, counter-clockwise).
+ */
+ public ArcDialFrame(double startAngle, double extent) {
+ this.backgroundPaint = Color.gray;
+ this.foregroundPaint = new Color(100, 100, 150);
+ this.stroke = new BasicStroke(2.0f);
+ this.innerRadius = 0.25;
+ this.outerRadius = 0.75;
+ this.startAngle = startAngle;
+ this.extent = extent;
+ }
+
+ /**
+ * Returns the background paint (never <code>null</code>).
+ *
+ * @return The background paint.
+ *
+ * @see #setBackgroundPaint(Paint)
+ */
+ public Paint getBackgroundPaint() {
+ return this.backgroundPaint;
+ }
+
+ /**
+ * Sets the background paint and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param paint the paint (<code>null</code> not permitted).
+ *
+ * @see #getBackgroundPaint()
+ */
+ public void setBackgroundPaint(Paint paint) {
+ if (paint == null) {
+ throw new IllegalArgumentException("Null 'paint' argument.");
+ }
+ this.backgroundPaint = paint;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the foreground paint.
+ *
+ * @return The foreground paint (never <code>null</code>).
+ *
+ * @see #setForegroundPaint(Paint)
+ */
+ public Paint getForegroundPaint() {
+ return this.foregroundPaint;
+ }
+
+ /**
+ * Sets the foreground paint and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param paint the paint (<code>null</code> not permitted).
+ *
+ * @see #getForegroundPaint()
+ */
+ public void setForegroundPaint(Paint paint) {
+ if (paint == null) {
+ throw new IllegalArgumentException("Null 'paint' argument.");
+ }
+ this.foregroundPaint = paint;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the stroke.
+ *
+ * @return The stroke (never <code>null</code>).
+ *
+ * @see #setStroke(Stroke)
+ */
+ public Stroke getStroke() {
+ return this.stroke;
+ }
+
+ /**
+ * Sets the stroke and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param stroke the stroke (<code>null</code> not permitted).
+ *
+ * @see #getStroke()
+ */
+ public void setStroke(Stroke stroke) {
+ if (stroke == null) {
+ throw new IllegalArgumentException("Null 'stroke' argument.");
+ }
+ this.stroke = stroke;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the inner radius, relative to the framing rectangle.
+ *
+ * @return The inner radius.
+ *
+ * @see #setInnerRadius(double)
+ */
+ public double getInnerRadius() {
+ return this.innerRadius;
+ }
+
+ /**
+ * Sets the inner radius and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param radius the inner radius.
+ *
+ * @see #getInnerRadius()
+ */
+ public void setInnerRadius(double radius) {
+ if (radius < 0.0) {
+ throw new IllegalArgumentException("Negative 'radius' argument.");
+ }
+ this.innerRadius = radius;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the outer radius, relative to the framing rectangle.
+ *
+ * @return The outer radius.
+ *
+ * @see #setOuterRadius(double)
+ */
+ public double getOuterRadius() {
+ return this.outerRadius;
+ }
+
+ /**
+ * Sets the outer radius and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param radius the outer radius.
+ *
+ * @see #getOuterRadius()
+ */
+ public void setOuterRadius(double radius) {
+ if (radius < 0.0) {
+ throw new IllegalArgumentException("Negative 'radius' argument.");
+ }
+ this.outerRadius = radius;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the start angle.
+ *
+ * @return The start angle.
+ *
+ * @see #setStartAngle(double)
+ */
+ public double getStartAngle() {
+ return this.startAngle;
+ }
+
+ /**
+ * Sets the start angle and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param angle the angle.
+ *
+ * @see #getStartAngle()
+ */
+ public void setStartAngle(double angle) {
+ this.startAngle = angle;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the extent.
+ *
+ * @return The extent.
+ *
+ * @see #setExtent(double)
+ */
+ public double getExtent() {
+ return this.extent;
+ }
+
+ /**
+ * Sets the extent and sends a {@link DialLayerChangeEvent} to
+ * all registered listeners.
+ *
+ * @param extent the extent.
+ *
+ * @see #getExtent()
+ */
+ public void setExtent(double extent) {
+ this.extent = extent;
+ notifyListeners(new DialLayerChangeEvent(this));
+ }
+
+ /**
+ * Returns the shape for the window for this dial. Some dial layers will
+ * request that their drawing be clipped within this window.
+ *
+ * @param frame the reference frame (<code>null</code> not permitted).
+ *
+ * @return The shape of the dial's window.
+ */
+ public Shape getWindow(Rectangle2D frame) {
+
+ Rectangle2D innerFrame = DialPlot.rectangleByRadius(frame,
+ this.innerRadius, this.innerRadius);
+ Rectangle2D outerFrame = DialPlot.rectangleByRadius(frame,
+ this.outerRadius, this.outerRadius);
+ Arc2D inner = new Arc2D.Double(innerFrame, this.startAngle, this.extent,
+ Arc2D.OPEN);
+ Arc2D outer = new Arc2D.Double(outerFrame, this.startAngle
+ + this.extent, - this.extent, Arc2D.OPEN);
+ GeneralPath p = new GeneralPath();
+ Point2D point1 = inner.getStartPoint();
+ p.moveTo((float) point1.getX(), (float) point1.getY());
+ p.append(inner, true);
+ p.append(outer, true);
+ p.closePath();
+ return p;
+
+ }
+
+ /**
+ * Returns the outer window.
+ *
+ * @param frame the frame.
+ *
+ * @return The outer window.
+ */
+ protected Shape getOuterWindow(Rectangle2D frame) {
+ double radiusMargin = 0.02;
+ double angleMargin = 1.5;
+ Rectangle2D innerFrame = DialPlot.rectangleByRadius(frame,
+ this.innerRadius - radiusMargin, this.innerRadius
+ - radiusMargin);
+ Rectangle2D outerFrame = DialPlot.rectangleByRadius(frame,
+ this.outerRadius + radiusMargin, this.outerRadius
+ + radiusMargin);
+ Arc2D inner = new Arc2D.Double(innerFrame, this.startAngle
+ - angleMargin, this.extent + 2 * angleMargin, Arc2D.OPEN);
+ Arc2D outer = new Arc2D.Double(outerFrame, this.startAngle
+ + angleMargin + this.extent, - this.extent - 2 * angleMargin,
+ Arc2D.OPEN);
+ GeneralPath p = new GeneralPath();
+ Point2D point1 = inner.getStartPoint();
+ p.moveTo((float) point1.getX(), (float) point1.getY());
+ p.append(inner, true);
+ p.append(outer, true);
+ p.closePath();
+ return p;
+ }
+
+ /**
+ * Draws the frame.
+ *
+ * @param g2 the graphics target.
+ * @param plot the plot.
+ * @param frame the dial's reference frame.
+ * @param view the dial's view rectangle.
+ */
+ public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
+ Rectangle2D view) {
+
+ Shape window = getWindow(frame);
+ Shape outerWindow = getOuterWindow(frame);
+
+ Area area1 = new Area(outerWindow);
+ Area area2 = new Area(window);
+ area1.subtract(area2);
+ g2.setPaint(Color.lightGray);
+ g2.fill(area1);
+
+ g2.setStroke(this.stroke);
+ g2.setPaint(this.foregroundPaint);
+ g2.draw(window);
+ g2.draw(outerWindow);
+
+
+ }
+
+ /**
+ * Returns <code>false</code> to indicate that this dial layer is not
+ * clipped to the dial window.
+ *
+ * @return <code>false</code>.
+ */
+ public boolean isClippedToWindow() {
+ return false;
+ }
+
+ /**
+ * 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;
+ }
+ if (!(obj instanceof ArcDialFrame)) {
+ return false;
+ }
+ ArcDialFrame that = (ArcDialFrame) obj;
+ if (!PaintUtilities.equal(this.backgroundPaint, that.backgroundPaint)) {
+ return false;
+ }
+ if (!PaintUtilities.equal(this.foregroundPaint, that.foregroundPaint)) {
+ return false;
+ }
+ if (this.startAngle != that.startAngle) {
+ return false;
+ }
+ if (this.extent != that.extent) {
+ return false;
+ }
+ if (this.innerRadius != that.innerRadius) {
+ return false;
+ }
+ if (this.outerRadius != that.outerRadius) {
+ return false;
+ }
+ if (!this.stroke.equals(that.stroke)) {
+ return false;
+ }
+ return super.equals(obj);
+ }
+
+ /**
+ * Returns a hash code for this instance.
+ *
+ * @return The hash code.
+ */
+ public int hashCode() {
+ int result = 193;
+ long temp = Double.doubleToLongBits(this.startAngle);
+ result = 37 * result + (int) (temp ^ (temp >>> 32));
+ temp = Double.doubleToLongBits(this.extent);
+ result = 37 * result + (int) (temp ^ (temp >>> 32));
+ temp = Double.doubleToLongBits(this.innerRadius);
+ result = 37 * result + (int) (temp ^ (temp >>> 32));
+ temp = Double.doubleToLongBits(this.outerRadius);
+ result = 37 * result + (int) (temp ^ (temp >>> 32));
+ result = 37 * result + HashUtilities.hashCodeForPaint(
+ this.backgroundPaint);
+ result = 37 * result + HashUtilities.hashCodeForPaint(
+ this.foregroundPaint);
+ result = 37 * result + this.stroke.hashCode();
+ return result;
+ }
+
+ /**
+ * Returns a clone of this instance.
+ *
+ * @return A clone.
+ *
+ * @throws CloneNotSupportedException if any attribute of this instance
+ * cannot be cloned.
+ */
+ public Object clone() throws CloneNotSupportedException {
+ return super.clone();
+ }
+
+ /**
+ * Provides serialization support.
+ *
+ * @param stream the output stream.
+ *
+ * @throws IOException if there is an I/O error.
+ */
+ private void writeObject(ObjectOutputStream stream) throws IOException {
+ stream.defaultWriteObject();
+ SerialUtilities.writePaint(this.backgroundPaint, stream);
+ SerialUtilities.writePaint(this.foregroundPaint, stream);
+ SerialUtilities.writeStroke(this.stroke, stream);
+ }
+
+ /**
+ * Provides serialization support.
+ *
+ * @param stream the input stream.
+ *
+ * @throws IOException if there is an I/O error.
+ * @throws ClassNotFoundException if there is a classpath problem.
+ */
+ private void readObject(ObjectInputStream stream)
+ throws IOException, ClassNotFoundException {
+ stream.defaultReadObject();
+ this.backgroundPaint = SerialUtilities.readPaint(stream);
+ this.foregroundPaint = SerialUtilities.readPaint(stream);
+ this.stroke = SerialUtilities.readStroke(stream);
+ }
+
+}
Modified: trunk/experimental/org/jfree/experimental/chart/plot/dial/DialFrame.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/DialFrame.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/DialFrame.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -47,7 +47,7 @@
/**
* A dial frame is the face plate for a dial plot - it is always drawn last.
* JFreeChart includes a couple of implementations of this interface
- * ({@link SimpleDialFrame} and {@link StandardDialFrame}).
+ * ({@link SimpleDialFrame} and {@link ArcDialFrame}).
* <br><br>
* Classes that implement this interface should be {@link Serializable},
* otherwise chart serialization may fail.
Modified: trunk/experimental/org/jfree/experimental/chart/plot/dial/DialPlot.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/DialPlot.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/DialPlot.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -143,7 +143,7 @@
public DialPlot(ValueDataset dataset) {
this.background = null;
this.cap = null;
- this.dialFrame = new StandardDialFrame();
+ this.dialFrame = new ArcDialFrame();
this.datasets = new ObjectList();
if (dataset != null) {
this.setDataset(dataset);
Deleted: trunk/experimental/org/jfree/experimental/chart/plot/dial/StandardDialFrame.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/StandardDialFrame.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/StandardDialFrame.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -1,516 +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.]
- *
- * ----------------------
- * StandardDialFrame.java
- * ----------------------
- * (C) Copyright 2006, 2007, by Object Refinery Limited.
- *
- * Original Author: David Gilbert (for Object Refinery Limited);
- * Contributor(s): -;
- *
- * Changes
- * -------
- * 03-Nov-2006 : Version 1 (DG);
- * 08-Mar-2007 : Fix in hashCode() (DG);
- * 21-Jun-2007 : Removed JCommon dependencies (DG);
- * 17-Oct-2007 : Updated equals() (DG);
- * 24-Oct-2007 : Added argument checks and API docs (DG);
- *
- */
-
-package org.jfree.experimental.chart.plot.dial;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Area;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
-import org.jfree.chart.HashUtilities;
-import org.jfree.chart.util.PaintUtilities;
-import org.jfree.chart.util.PublicCloneable;
-import org.jfree.chart.util.SerialUtilities;
-
-/**
- * A standard frame for the {@link DialPlot} class.
- */
-public class StandardDialFrame extends AbstractDialLayer implements DialFrame,
- Cloneable, PublicCloneable, Serializable {
-
- /**
- * The color used for the front of the panel. This field is transient
- * because it requires special handling for serialization.
- */
- private transient Paint backgroundPaint;
-
- /**
- * The color used for the border around the window. This field is transient
- * because it requires special handling for serialization.
- */
- private transient Paint foregroundPaint;
-
- /**
- * The stroke for drawing the frame outline. This field is transient
- * because it requires special handling for serialization.
- */
- private transient Stroke stroke;
-
- /**
- * The start angle.
- */
- private double startAngle;
-
- /**
- * The end angle.
- */
- private double extent;
-
- /** The inner radius, relative to the framing rectangle. */
- private double innerRadius;
-
- /** The outer radius, relative to the framing rectangle. */
- private double outerRadius;
-
- /**
- * Creates a new instance of <code>StandardDialFrame</code> that spans
- * 180 degrees.
- */
- public StandardDialFrame() {
- this(0, 180);
- }
-
- /**
- * Creates a new instance of <code>StandardDialFrame</code> that spans
- * the arc specified.
- *
- * @param startAngle the startAngle (in degrees).
- * @param extent the extent of the arc (in degrees, counter-clockwise).
- */
- public StandardDialFrame(double startAngle, double extent) {
- this.backgroundPaint = Color.gray;
- this.foregroundPaint = new Color(100, 100, 150);
- this.stroke = new BasicStroke(2.0f);
- this.innerRadius = 0.25;
- this.outerRadius = 0.75;
- this.startAngle = startAngle;
- this.extent = extent;
- }
-
- /**
- * Returns the background paint (never <code>null</code>).
- *
- * @return The background paint.
- *
- * @see #setBackgroundPaint(Paint)
- */
- public Paint getBackgroundPaint() {
- return this.backgroundPaint;
- }
-
- /**
- * Sets the background paint and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param paint the paint (<code>null</code> not permitted).
- *
- * @see #getBackgroundPaint()
- */
- public void setBackgroundPaint(Paint paint) {
- if (paint == null) {
- throw new IllegalArgumentException("Null 'paint' argument.");
- }
- this.backgroundPaint = paint;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the foreground paint.
- *
- * @return The foreground paint (never <code>null</code>).
- *
- * @see #setForegroundPaint(Paint)
- */
- public Paint getForegroundPaint() {
- return this.foregroundPaint;
- }
-
- /**
- * Sets the foreground paint and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param paint the paint (<code>null</code> not permitted).
- *
- * @see #getForegroundPaint()
- */
- public void setForegroundPaint(Paint paint) {
- if (paint == null) {
- throw new IllegalArgumentException("Null 'paint' argument.");
- }
- this.foregroundPaint = paint;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the stroke.
- *
- * @return The stroke (never <code>null</code>).
- *
- * @see #setStroke(Stroke)
- */
- public Stroke getStroke() {
- return this.stroke;
- }
-
- /**
- * Sets the stroke and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param stroke the stroke (<code>null</code> not permitted).
- *
- * @see #getStroke()
- */
- public void setStroke(Stroke stroke) {
- if (stroke == null) {
- throw new IllegalArgumentException("Null 'stroke' argument.");
- }
- this.stroke = stroke;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the inner radius, relative to the framing rectangle.
- *
- * @return The inner radius.
- *
- * @see #setInnerRadius(double)
- */
- public double getInnerRadius() {
- return this.innerRadius;
- }
-
- /**
- * Sets the inner radius and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param radius the inner radius.
- *
- * @see #getInnerRadius()
- */
- public void setInnerRadius(double radius) {
- if (radius < 0.0) {
- throw new IllegalArgumentException("Negative 'radius' argument.");
- }
- this.innerRadius = radius;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the outer radius, relative to the framing rectangle.
- *
- * @return The outer radius.
- *
- * @see #setOuterRadius(double)
- */
- public double getOuterRadius() {
- return this.outerRadius;
- }
-
- /**
- * Sets the outer radius and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param radius the outer radius.
- *
- * @see #getOuterRadius()
- */
- public void setOuterRadius(double radius) {
- if (radius < 0.0) {
- throw new IllegalArgumentException("Negative 'radius' argument.");
- }
- this.outerRadius = radius;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the start angle.
- *
- * @return The start angle.
- *
- * @see #setStartAngle(double)
- */
- public double getStartAngle() {
- return this.startAngle;
- }
-
- /**
- * Sets the start angle and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param angle the angle.
- *
- * @see #getStartAngle()
- */
- public void setStartAngle(double angle) {
- this.startAngle = angle;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the extent.
- *
- * @return The extent.
- *
- * @see #setExtent(double)
- */
- public double getExtent() {
- return this.extent;
- }
-
- /**
- * Sets the extent and sends a {@link DialLayerChangeEvent} to
- * all registered listeners.
- *
- * @param extent the extent.
- *
- * @see #getExtent()
- */
- public void setExtent(double extent) {
- this.extent = extent;
- notifyListeners(new DialLayerChangeEvent(this));
- }
-
- /**
- * Returns the shape for the window for this dial. Some dial layers will
- * request that their drawing be clipped within this window.
- *
- * @param frame the reference frame (<code>null</code> not permitted).
- *
- * @return The shape of the dial's window.
- */
- public Shape getWindow(Rectangle2D frame) {
-
- Rectangle2D innerFrame = DialPlot.rectangleByRadius(frame,
- this.innerRadius, this.innerRadius);
- Rectangle2D outerFrame = DialPlot.rectangleByRadius(frame,
- this.outerRadius, this.outerRadius);
- Arc2D inner = new Arc2D.Double(innerFrame, this.startAngle, this.extent,
- Arc2D.OPEN);
- Arc2D outer = new Arc2D.Double(outerFrame, this.startAngle
- + this.extent, - this.extent, Arc2D.OPEN);
- GeneralPath p = new GeneralPath();
- Point2D point1 = inner.getStartPoint();
- p.moveTo((float) point1.getX(), (float) point1.getY());
- p.append(inner, true);
- p.append(outer, true);
- p.closePath();
- return p;
-
- }
-
- /**
- * Returns the outer window.
- *
- * @param frame the frame.
- *
- * @return The outer window.
- */
- protected Shape getOuterWindow(Rectangle2D frame) {
- double radiusMargin = 0.02;
- double angleMargin = 1.5;
- Rectangle2D innerFrame = DialPlot.rectangleByRadius(frame,
- this.innerRadius - radiusMargin, this.innerRadius
- - radiusMargin);
- Rectangle2D outerFrame = DialPlot.rectangleByRadius(frame,
- this.outerRadius + radiusMargin, this.outerRadius
- + radiusMargin);
- Arc2D inner = new Arc2D.Double(innerFrame, this.startAngle
- - angleMargin, this.extent + 2 * angleMargin, Arc2D.OPEN);
- Arc2D outer = new Arc2D.Double(outerFrame, this.startAngle
- + angleMargin + this.extent, - this.extent - 2 * angleMargin,
- Arc2D.OPEN);
- GeneralPath p = new GeneralPath();
- Point2D point1 = inner.getStartPoint();
- p.moveTo((float) point1.getX(), (float) point1.getY());
- p.append(inner, true);
- p.append(outer, true);
- p.closePath();
- return p;
- }
-
- /**
- * Draws the frame.
- *
- * @param g2 the graphics target.
- * @param plot the plot.
- * @param frame the dial's reference frame.
- * @param view the dial's view rectangle.
- */
- public void draw(Graphics2D g2, DialPlot plot, Rectangle2D frame,
- Rectangle2D view) {
-
- Shape window = getWindow(frame);
- Shape outerWindow = getOuterWindow(frame);
-
- Area area1 = new Area(outerWindow);
- Area area2 = new Area(window);
- area1.subtract(area2);
- g2.setPaint(Color.lightGray);
- g2.fill(area1);
-
- g2.setStroke(this.stroke);
- g2.setPaint(this.foregroundPaint);
- g2.draw(window);
- g2.draw(outerWindow);
-
-
- }
-
- /**
- * Returns <code>false</code> to indicate that this dial layer is not
- * clipped to the dial window.
- *
- * @return <code>false</code>.
- */
- public boolean isClippedToWindow() {
- return false;
- }
-
- /**
- * 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;
- }
- if (!(obj instanceof StandardDialFrame)) {
- return false;
- }
- StandardDialFrame that = (StandardDialFrame) obj;
- if (!PaintUtilities.equal(this.backgroundPaint, that.backgroundPaint)) {
- return false;
- }
- if (!PaintUtilities.equal(this.foregroundPaint, that.foregroundPaint)) {
- return false;
- }
- if (this.startAngle != that.startAngle) {
- return false;
- }
- if (this.extent != that.extent) {
- return false;
- }
- if (this.innerRadius != that.innerRadius) {
- return false;
- }
- if (this.outerRadius != that.outerRadius) {
- return false;
- }
- if (!this.stroke.equals(that.stroke)) {
- return false;
- }
- return super.equals(obj);
- }
-
- /**
- * Returns a hash code for this instance.
- *
- * @return The hash code.
- */
- public int hashCode() {
- int result = 193;
- long temp = Double.doubleToLongBits(this.startAngle);
- result = 37 * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(this.extent);
- result = 37 * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(this.innerRadius);
- result = 37 * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(this.outerRadius);
- result = 37 * result + (int) (temp ^ (temp >>> 32));
- result = 37 * result + HashUtilities.hashCodeForPaint(
- this.backgroundPaint);
- result = 37 * result + HashUtilities.hashCodeForPaint(
- this.foregroundPaint);
- result = 37 * result + this.stroke.hashCode();
- return result;
- }
-
- /**
- * Returns a clone of this instance.
- *
- * @return A clone.
- *
- * @throws CloneNotSupportedException if any attribute of this instance
- * cannot be cloned.
- */
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
- /**
- * Provides serialization support.
- *
- * @param stream the output stream.
- *
- * @throws IOException if there is an I/O error.
- */
- private void writeObject(ObjectOutputStream stream) throws IOException {
- stream.defaultWriteObject();
- SerialUtilities.writePaint(this.backgroundPaint, stream);
- SerialUtilities.writePaint(this.foregroundPaint, stream);
- SerialUtilities.writeStroke(this.stroke, stream);
- }
-
- /**
- * Provides serialization support.
- *
- * @param stream the input stream.
- *
- * @throws IOException if there is an I/O error.
- * @throws ClassNotFoundException if there is a classpath problem.
- */
- private void readObject(ObjectInputStream stream)
- throws IOException, ClassNotFoundException {
- stream.defaultReadObject();
- this.backgroundPaint = SerialUtilities.readPaint(stream);
- this.foregroundPaint = SerialUtilities.readPaint(stream);
- this.stroke = SerialUtilities.readStroke(stream);
- }
-
-}
Copied: trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/ArcDialFrameTests.java (from rev 355, trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/StandardDialFrameTests.java)
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/ArcDialFrameTests.java (rev 0)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/ArcDialFrameTests.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -0,0 +1,202 @@
+/* ===========================================================
+ * 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.]
+ *
+ * ---------------------------
+ * ArcDialFrameTests.java
+ * ---------------------------
+ * (C) Copyright 2006-2007, by Object Refinery Limited and Contributors.
+ *
+ * Original Author: David Gilbert (for Object Refinery Limited);
+ * Contributor(s): -;
+ *
+ * Changes
+ * -------
+ * 03-Nov-2006 : Version 1 (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.plot.dial.junit;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.GradientPaint;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.jfree.experimental.chart.plot.dial.ArcDialFrame;
+
+/**
+ * Tests for the {@link ArcDialFrame} class.
+ */
+public class ArcDialFrameTests extends TestCase {
+
+ /**
+ * Returns the tests as a test suite.
+ *
+ * @return The test suite.
+ */
+ public static Test suite() {
+ return new TestSuite(ArcDialFrameTests.class);
+ }
+
+ /**
+ * Constructs a new set of tests.
+ *
+ * @param name the name of the tests.
+ */
+ public ArcDialFrameTests(String name) {
+ super(name);
+ }
+
+ /**
+ * Confirm that the equals method can distinguish all the required fields.
+ */
+ public void testEquals() {
+ ArcDialFrame f1 = new ArcDialFrame();
+ ArcDialFrame f2 = new ArcDialFrame();
+ assertTrue(f1.equals(f2));
+
+ // background paint
+ f1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
+ 3.0f, 4.0f, Color.yellow));
+ assertFalse(f1.equals(f2));
+ f2.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
+ 3.0f, 4.0f, Color.yellow));
+ assertTrue(f1.equals(f2));
+
+ // foreground paint
+ f1.setForegroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
+ 3.0f, 4.0f, Color.yellow));
+ assertFalse(f1.equals(f2));
+ f2.setForegroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
+ 3.0f, 4.0f, Color.yellow));
+ assertTrue(f1.equals(f2));
+
+ // stroke
+ f1.setStroke(new BasicStroke(1.1f));
+ assertFalse(f1.equals(f2));
+ f2.setStroke(new BasicStroke(1.1f));
+ assertTrue(f1.equals(f2));
+
+ // inner radius
+ f1.setInnerRadius(0.11);
+ assertFalse(f1.equals(f2));
+ f2.setInnerRadius(0.11);
+ assertTrue(f1.equals(f2));
+
+ // outer radius
+ f1.setOuterRadius(0.88);
+ assertFalse(f1.equals(f2));
+ f2.setOuterRadius(0.88);
+ assertTrue(f1.equals(f2));
+
+ // startAngle
+ f1.setStartAngle(99);
+ assertFalse(f1.equals(f2));
+ f2.setStartAngle(99);
+ assertTrue(f1.equals(f2));
+
+ // extent
+ f1.setExtent(33);
+ assertFalse(f1.equals(f2));
+ f2.setExtent(33);
+ assertTrue(f1.equals(f2));
+
+ // check an inherited attribute
+ f1.setVisible(false);
+ assertFalse(f1.equals(f2));
+ f2.setVisible(false);
+ assertTrue(f1.equals(f2));
+ }
+
+ /**
+ * Two objects that are equal are required to return the same hashCode.
+ */
+ public void testHashCode() {
+ ArcDialFrame f1 = new ArcDialFrame();
+ ArcDialFrame f2 = new ArcDialFrame();
+ assertTrue(f1.equals(f2));
+ int h1 = f1.hashCode();
+ int h2 = f2.hashCode();
+ assertEquals(h1, h2);
+ }
+
+ /**
+ * Confirm that cloning works.
+ */
+ public void testCloning() {
+ ArcDialFrame f1 = new ArcDialFrame();
+ ArcDialFrame f2 = null;
+ try {
+ f2 = (ArcDialFrame) f1.clone();
+ }
+ catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ assertTrue(f1 != f2);
+ assertTrue(f1.getClass() == f2.getClass());
+ assertTrue(f1.equals(f2));
+
+ // check that the listener lists are independent
+ MyDialLayerChangeListener l1 = new MyDialLayerChangeListener();
+ f1.addChangeListener(l1);
+ assertTrue(f1.hasListener(l1));
+ assertFalse(f2.hasListener(l1));
+ }
+
+ /**
+ * Serialize an instance, restore it, and check for equality.
+ */
+ public void testSerialization() {
+ ArcDialFrame f1 = new ArcDialFrame();
+ ArcDialFrame f2 = null;
+
+ try {
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(buffer);
+ out.writeObject(f1);
+ out.close();
+
+ ObjectInput in = new ObjectInputStream(
+ new ByteArrayInputStream(buffer.toByteArray()));
+ f2 = (ArcDialFrame) in.readObject();
+ in.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ assertEquals(f1, f2);
+ }
+
+}
Modified: trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPackageTests.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPackageTests.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPackageTests.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -67,7 +67,7 @@
suite.addTestSuite(DialTextAnnotationTests.class);
suite.addTestSuite(DialValueIndicatorTests.class);
suite.addTestSuite(SimpleDialFrameTests.class);
- suite.addTestSuite(StandardDialFrameTests.class);
+ suite.addTestSuite(ArcDialFrameTests.class);
suite.addTestSuite(StandardDialRangeTests.class);
suite.addTestSuite(StandardDialScaleTests.class);
return suite;
Modified: trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPlotTests.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPlotTests.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/DialPlotTests.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -59,7 +59,7 @@
import org.jfree.experimental.chart.plot.dial.DialCap;
import org.jfree.experimental.chart.plot.dial.DialPlot;
import org.jfree.experimental.chart.plot.dial.SimpleDialFrame;
-import org.jfree.experimental.chart.plot.dial.StandardDialFrame;
+import org.jfree.experimental.chart.plot.dial.ArcDialFrame;
import org.jfree.experimental.chart.plot.dial.StandardDialScale;
/**
@@ -258,14 +258,14 @@
*/
public void testFrameListener() {
DialPlot p = new DialPlot();
- StandardDialFrame f1 = new StandardDialFrame();
+ ArcDialFrame f1 = new ArcDialFrame();
p.setDialFrame(f1);
p.addChangeListener(this);
this.lastEvent = null;
f1.setBackgroundPaint(Color.gray);
assertNotNull(this.lastEvent);
- StandardDialFrame f2 = new StandardDialFrame();
+ ArcDialFrame f2 = new ArcDialFrame();
p.setDialFrame(f2);
this.lastEvent = null;
f1.setBackgroundPaint(Color.blue);
Deleted: trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/StandardDialFrameTests.java
===================================================================
--- trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/StandardDialFrameTests.java 2007-10-24 16:21:50 UTC (rev 419)
+++ trunk/experimental/org/jfree/experimental/chart/plot/dial/junit/StandardDialFrameTests.java 2007-10-24 16:30:42 UTC (rev 420)
@@ -1,202 +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.]
- *
- * ---------------------------
- * StandardDialFrameTests.java
- * ---------------------------
- * (C) Copyright 2006-2007, by Object Refinery Limited and Contributors.
- *
- * Original Author: David Gilbert (for Object Refinery Limited);
- * Contributor(s): -;
- *
- * Changes
- * -------
- * 03-Nov-2006 : Version 1 (DG);
- *
- */
-
-package org.jfree.experimental.chart.plot.dial.junit;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.GradientPaint;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jfree.experimental.chart.plot.dial.StandardDialFrame;
-
-/**
- * Tests for the {@link StandardDialFrame} class.
- */
-public class StandardDialFrameTests extends TestCase {
-
- /**
- * Returns the tests as a test suite.
- *
- * @return The test suite.
- */
- public static Test suite() {
- return new TestSuite(StandardDialFrameTests.class);
- }
-
- /**
- * Constructs a new set of tests.
- *
- * @param name the name of the tests.
- */
- public StandardDialFrameTests(String name) {
- super(name);
- }
-
- /**
- * Confirm that the equals method can distinguish all the required fields.
- */
- public void testEquals() {
- StandardDialFrame f1 = new StandardDialFrame();
- StandardDialFrame f2 = new StandardDialFrame();
- assertTrue(f1.equals(f2));
-
- // background paint
- f1.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
- 3.0f, 4.0f, Color.yellow));
- assertFalse(f1.equals(f2));
- f2.setBackgroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
- 3.0f, 4.0f, Color.yellow));
- assertTrue(f1.equals(f2));
-
- // foreground paint
- f1.setForegroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
- 3.0f, 4.0f, Color.yellow));
- assertFalse(f1.equals(f2));
- f2.setForegroundPaint(new GradientPaint(1.0f, 2.0f, Color.red,
- 3.0f, 4.0f, Color.yellow));
- assertTrue(f1.equals(f2));
-
- // stroke
- f1.setStroke(new BasicStroke(1.1f));
- assertFalse(f1.equals(f2));
- f2.setStroke(new BasicStroke(1.1f));
- assertTrue(f1.equals(f2));
-
- // inner radius
- f1.setInnerRadius(0.11);
- assertFalse(f1.equals(f2));
- f2.setInnerRadius(0.11);
- assertTrue(f1.equals(f2));
-
- // outer radius
- f1.setOuterRadius(0.88);
- assertFalse(f1.equals(f2));
- f2.setOuterRadius(0.88);
- assertTrue(f1.equals(f2));
-
- // startAngle
- f1.setStartAngle(99);
- assertFalse(f1.equals(f2));
- f2.setStartAngle(99);
- assertTrue(f1.equals(f2));
-
- // extent
- f1.setExtent(33);
- assertFalse(f1.equals(f2));
- f2.setExtent(33);
- assertTrue(f1.equals(f2));
-
- // check an inherited attribute
- f1.setVisible(false);
- assertFalse(f1.equals(f2));
- f2.setVisible(false);
- assertTrue(f1.equals(f2));
- }
-
- /**
- * Two objects that are equal are required to return the same hashCode.
- */
- public void testHashCode() {
- StandardDialFrame f1 = new StandardDialFrame();
- StandardDialFrame f2 = new StandardDialFrame();
- assertTrue(f1.equals(f2));
- int h1 = f1.hashCode();
- int h2 = f2.hashCode();
- assertEquals(h1, h2);
- }
-
- /**
- * Confirm that cloning works.
- */
- public void testCloning() {
- StandardDialFrame f1 = new StandardDialFrame();
- StandardDialFrame f2 = null;
- try {
- f2 = (StandardDialFrame) f1.clone();
- }
- catch (CloneNotSupportedException e) {
- e.printStackTrace();
- }
- assertTrue(f1 != f2);
- assertTrue(f1.getClass() == f2.getClass());
- assertTrue(f1.equals(f2));
-
- // check that the listener lists are independent
- MyDialLayerChangeListener l1 = new MyDialLayerChangeListener();
- f1.addChangeListener(l1);
- assertTrue(f1.hasListener(l1));
- assertFalse(f2.hasListener(l1));
- }
-
- /**
- * Serialize an instance, restore it, and check for equality.
- */
- public void testSerialization() {
- StandardDialFrame f1 = new StandardDialFrame();
- StandardDialFrame f2 = null;
-
- try {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- ObjectOutput out = new ObjectOutputStream(buffer);
- out.writeObject(f1);
- out.close();
-
- ObjectInput in = new ObjectInputStream(
- new ByteArrayInputStream(buffer.toByteArray()));
- f2 = (StandardDialFrame) in.readObject();
- in.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- assertEquals(f1, f2);
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|