[Jfreechart-commit] SF.net SVN: jfreechart: [48] trunk/source/org/jfree/chart

[<mu...@us...>]

Revision: 48
          http://jfreechart.svn.sourceforge.net/jfreechart/?rev=48&view=rev
Author:   mungady
Date:     2007-06-21 03:41:54 -0700 (Thu, 21 Jun 2007)

Log Message:
-----------
Removed JCommon dependencies.

Modified Paths:
--------------
    trunk/source/org/jfree/chart/ChartFactory.java
    trunk/source/org/jfree/chart/ChartRenderingInfo.java
    trunk/source/org/jfree/chart/JFreeChart.java
    trunk/source/org/jfree/chart/LegendItem.java
    trunk/source/org/jfree/chart/PaintMap.java
    trunk/source/org/jfree/chart/StrokeMap.java
    trunk/source/org/jfree/chart/annotations/CategoryLineAnnotation.java
    trunk/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java
    trunk/source/org/jfree/chart/annotations/TextAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYBoxAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYDrawableAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYImageAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYLineAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYPointerAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYPolygonAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYShapeAnnotation.java
    trunk/source/org/jfree/chart/annotations/XYTextAnnotation.java
    trunk/source/org/jfree/chart/axis/Axis.java
    trunk/source/org/jfree/chart/axis/AxisSpace.java
    trunk/source/org/jfree/chart/axis/CategoryAxis.java
    trunk/source/org/jfree/chart/axis/CyclicNumberAxis.java
    trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java
    trunk/source/org/jfree/chart/axis/PeriodAxis.java
    trunk/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java
    trunk/source/org/jfree/chart/axis/SubCategoryAxis.java
    trunk/source/org/jfree/chart/axis/SymbolAxis.java
    trunk/source/org/jfree/chart/axis/ValueAxis.java
    trunk/source/org/jfree/chart/block/AbstractBlock.java
    trunk/source/org/jfree/chart/block/BlockBorder.java
    trunk/source/org/jfree/chart/block/BlockContainer.java
    trunk/source/org/jfree/chart/block/BlockFrame.java
    trunk/source/org/jfree/chart/block/ColorBlock.java
    trunk/source/org/jfree/chart/block/EmptyBlock.java
    trunk/source/org/jfree/chart/block/LabelBlock.java
    trunk/source/org/jfree/chart/block/LineBorder.java
    trunk/source/org/jfree/chart/entity/ChartEntity.java
    trunk/source/org/jfree/chart/entity/StandardEntityCollection.java
    trunk/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/CategoryToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java
    trunk/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java
    trunk/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/StandardXYItemLabelGenerator.java
    trunk/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java
    trunk/source/org/jfree/chart/labels/StandardXYToolTipGenerator.java
    trunk/source/org/jfree/chart/labels/SymbolicXYItemLabelGenerator.java
    trunk/source/org/jfree/chart/needle/MeterNeedle.java
    trunk/source/org/jfree/chart/plot/CategoryMarker.java
    trunk/source/org/jfree/chart/plot/CategoryPlot.java
    trunk/source/org/jfree/chart/plot/CombinedDomainCategoryPlot.java
    trunk/source/org/jfree/chart/plot/CombinedDomainXYPlot.java
    trunk/source/org/jfree/chart/plot/CombinedRangeCategoryPlot.java
    trunk/source/org/jfree/chart/plot/CombinedRangeXYPlot.java
    trunk/source/org/jfree/chart/plot/CompassPlot.java
    trunk/source/org/jfree/chart/plot/DefaultDrawingSupplier.java
    trunk/source/org/jfree/chart/plot/FastScatterPlot.java
    trunk/source/org/jfree/chart/plot/IntervalMarker.java
    trunk/source/org/jfree/chart/plot/Marker.java
    trunk/source/org/jfree/chart/plot/MeterInterval.java
    trunk/source/org/jfree/chart/plot/MeterPlot.java
    trunk/source/org/jfree/chart/plot/MultiplePiePlot.java
    trunk/source/org/jfree/chart/plot/PiePlot.java
    trunk/source/org/jfree/chart/plot/Plot.java
    trunk/source/org/jfree/chart/plot/PlotRenderingInfo.java
    trunk/source/org/jfree/chart/plot/PolarPlot.java
    trunk/source/org/jfree/chart/plot/RingPlot.java
    trunk/source/org/jfree/chart/plot/SpiderWebPlot.java
    trunk/source/org/jfree/chart/plot/ThermometerPlot.java
    trunk/source/org/jfree/chart/plot/XYPlot.java
    trunk/source/org/jfree/chart/renderer/AbstractRenderer.java
    trunk/source/org/jfree/chart/renderer/GrayPaintScale.java
    trunk/source/org/jfree/chart/renderer/LookupPaintScale.java

Modified: trunk/source/org/jfree/chart/ChartFactory.java
===================================================================
--- trunk/source/org/jfree/chart/ChartFactory.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/ChartFactory.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -196,6 +196,7 @@
 import org.jfree.chart.util.RectangleEdge;
 import org.jfree.chart.util.RectangleInsets;
 import org.jfree.chart.util.SortOrder;
+import org.jfree.chart.util.TableOrder;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.IntervalCategoryDataset;
 import org.jfree.data.general.DefaultPieDataset;
@@ -209,7 +210,6 @@
 import org.jfree.data.xy.WindDataset;
 import org.jfree.data.xy.XYDataset;
 import org.jfree.data.xy.XYZDataset;
-import org.jfree.util.TableOrder;
 
 /**
  * A collection of utility methods for creating some standard charts with 

Modified: trunk/source/org/jfree/chart/ChartRenderingInfo.java
===================================================================
--- trunk/source/org/jfree/chart/ChartRenderingInfo.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/ChartRenderingInfo.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -----------------------
  * ChartRenderingInfo.java
  * -----------------------
- * (C) Copyright 2002-2006, by Object Refinery Limited.
+ * (C) Copyright 2002-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -46,6 +46,7 @@
  * 30-Nov-2005 : Removed get/setPlotArea() (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 01-Dec-2006 : Fixed equals() and clone() (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -60,9 +61,9 @@
 import org.jfree.chart.entity.EntityCollection;
 import org.jfree.chart.entity.StandardEntityCollection;
 import org.jfree.chart.plot.PlotRenderingInfo;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A structure for storing rendering information from one call to the

Modified: trunk/source/org/jfree/chart/JFreeChart.java
===================================================================
--- trunk/source/org/jfree/chart/JFreeChart.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/JFreeChart.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -197,18 +197,18 @@
 import org.jfree.chart.title.Title;
 import org.jfree.chart.util.Align;
 import org.jfree.chart.util.HorizontalAlignment;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
 import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.chart.util.Size2D;
 import org.jfree.chart.util.VerticalAlignment;
 import org.jfree.data.Range;
-import org.jfree.io.SerialUtilities;
 import org.jfree.ui.Drawable;
 import org.jfree.ui.about.Contributor;
 import org.jfree.ui.about.Licences;
 import org.jfree.ui.about.ProjectInfo;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
 
 /**
  * A chart class implemented using the Java 2D APIs.  The current version

Modified: trunk/source/org/jfree/chart/LegendItem.java
===================================================================
--- trunk/source/org/jfree/chart/LegendItem.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/LegendItem.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -74,13 +74,13 @@
 import java.text.AttributedString;
 import java.text.CharacterIterator;
 
+import org.jfree.chart.util.AttributedStringUtilities;
 import org.jfree.chart.util.GradientPaintTransformer;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.SerialUtilities;
+import org.jfree.chart.util.ShapeUtilities;
 import org.jfree.chart.util.StandardGradientPaintTransformer;
 import org.jfree.data.general.Dataset;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.AttributedStringUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.ShapeUtilities;
 
 /**
  * A temporary storage object for recording the properties of a legend item, 

Modified: trunk/source/org/jfree/chart/PaintMap.java
===================================================================
--- trunk/source/org/jfree/chart/PaintMap.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/PaintMap.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -39,6 +39,7 @@
  * 27-Sep-2006 : Version 1 (DG);
  * 17-Jan-2007 : Changed TreeMap to HashMap, so that different classes that
  *               implement Comparable can be used as keys (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -54,8 +55,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A storage structure that maps <code>Comparable</code> instances with

Modified: trunk/source/org/jfree/chart/StrokeMap.java
===================================================================
--- trunk/source/org/jfree/chart/StrokeMap.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/StrokeMap.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * --------------
  * StrokeMap.java
  * --------------
- * (C) Copyright 2006, by Object Refinery Limited.
+ * (C) Copyright 2006, 2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -37,7 +37,8 @@
  * Changes:
  * --------
  * 27-Sep-2006 : Version 1 (DG);
- *
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
+ * 
  */
 
 package org.jfree.chart;
@@ -52,8 +53,8 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A storage structure that maps <code>Comparable</code> instances with

Modified: trunk/source/org/jfree/chart/annotations/CategoryLineAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/CategoryLineAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/CategoryLineAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -39,7 +39,7 @@
  * 29-Jul-2005 : Version 1, based on CategoryTextAnnotation (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 06-Mar-2007 : Reimplemented hashCode() (DG);
- * 20-Jun-2007 : Removed JCommon dependencies (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -63,11 +63,11 @@
 import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
 
 /**
  * A line annotation that can be placed on a {@link CategoryPlot}.

Modified: trunk/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/CategoryPointerAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -64,11 +64,11 @@
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * An arrow and label that can be placed on a {@link CategoryPlot}.  The arrow 

Modified: trunk/source/org/jfree/chart/annotations/TextAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/TextAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/TextAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -64,9 +64,9 @@
 
 import org.jfree.chart.HashUtilities;
 import org.jfree.chart.text.TextAnchor;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A base class for text annotations.  This class records the content but not 

Modified: trunk/source/org/jfree/chart/annotations/XYBoxAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYBoxAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYBoxAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -60,11 +60,11 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A box annotation that can be placed on an {@link XYPlot}.  The 

Modified: trunk/source/org/jfree/chart/annotations/XYDrawableAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYDrawableAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYDrawableAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -49,15 +49,15 @@
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
+import org.jfree.chart.Drawable;
 import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.ui.Drawable;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A general annotation that can be placed on an {@link XYPlot}.

Modified: trunk/source/org/jfree/chart/annotations/XYImageAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYImageAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYImageAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -65,10 +65,10 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleAnchor;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * An annotation that allows an image to be placed at some location on 

Modified: trunk/source/org/jfree/chart/annotations/XYLineAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYLineAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYLineAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -68,12 +68,12 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
-import org.jfree.util.ShapeUtilities;
+import org.jfree.chart.util.SerialUtilities;
+import org.jfree.chart.util.ShapeUtilities;
 
 /**
  * A simple line annotation that can be placed on an {@link XYPlot}.

Modified: trunk/source/org/jfree/chart/annotations/XYPointerAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYPointerAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYPointerAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -73,10 +73,10 @@
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * An arrow and label that can be placed on an 

Modified: trunk/source/org/jfree/chart/annotations/XYPolygonAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYPolygonAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYPolygonAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -62,11 +62,11 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A polygon annotation that can be placed on an {@link XYPlot}.  The 

Modified: trunk/source/org/jfree/chart/annotations/XYShapeAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYShapeAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYShapeAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -75,11 +75,11 @@
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A simple <code>Shape</code> annotation that can be placed on an 

Modified: trunk/source/org/jfree/chart/annotations/XYTextAnnotation.java
===================================================================
--- trunk/source/org/jfree/chart/annotations/XYTextAnnotation.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/annotations/XYTextAnnotation.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -74,10 +74,10 @@
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A text annotation that can be placed at a particular (x, y) location on an 

Modified: trunk/source/org/jfree/chart/axis/Axis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/Axis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/Axis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -110,11 +110,11 @@
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
 import org.jfree.chart.util.RectangleInsets;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * The base class for all axes in JFreeChart.  Subclasses are divided into 

Modified: trunk/source/org/jfree/chart/axis/AxisSpace.java
===================================================================
--- trunk/source/org/jfree/chart/axis/AxisSpace.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/AxisSpace.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * --------------
  * AxisSpace.java
  * --------------
- * (C) Copyright 2003-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -43,6 +43,7 @@
  * 07-Jan-2005 : Updated equals() method (DG);
  * 11-Jan-2005 : Removed deprecated methods in preparation for 1.0.0 
  *               release (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
  
@@ -51,8 +52,8 @@
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A record that contains the space required at each edge of a plot.

Modified: trunk/source/org/jfree/chart/axis/CategoryAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/CategoryAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/CategoryAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -115,14 +115,14 @@
 import org.jfree.chart.text.G2TextMeasurer;
 import org.jfree.chart.text.TextBlock;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleAnchor;
 import org.jfree.chart.util.RectangleEdge;
 import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
+import org.jfree.chart.util.ShapeUtilities;
 import org.jfree.chart.util.Size2D;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.ShapeUtilities;
 
 /**
  * An axis that displays categories.

Modified: trunk/source/org/jfree/chart/axis/CyclicNumberAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/CyclicNumberAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/CyclicNumberAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -70,11 +70,11 @@
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.Range;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
 
 /**
 This class extends NumberAxis and handles cycling.

Modified: trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -61,9 +61,9 @@
 import org.jfree.chart.text.TextBlock;
 import org.jfree.chart.text.TextFragment;
 import org.jfree.chart.text.TextLine;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * An extended version of the {@link CategoryAxis} class that supports 

Modified: trunk/source/org/jfree/chart/axis/PeriodAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/PeriodAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/PeriodAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -85,14 +85,14 @@
 import org.jfree.chart.plot.ValueAxisPlot;
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.Range;
 import org.jfree.data.time.Day;
 import org.jfree.data.time.Month;
 import org.jfree.data.time.RegularTimePeriod;
 import org.jfree.data.time.Year;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * An axis that displays a date scale based on a 

Modified: trunk/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java
===================================================================
--- trunk/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/PeriodAxisLabelInfo.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ------------------------
  * PeriodAxisLabelInfo.java
  * ------------------------
- * (C) Copyright 2004, 2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2004-2007, by Object Refinery Limited and Contributors.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -41,6 +41,7 @@
  * 01-Mar-2005 : Modified constructors to accept DateFormat (DG);
  * 20-May-2005 : Added default constants and null argument checks in the 
  *               constructor (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -60,9 +61,9 @@
 import java.util.Date;
 import java.util.TimeZone;
 
+import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.time.RegularTimePeriod;
-import org.jfree.io.SerialUtilities;
-import org.jfree.ui.RectangleInsets;
 
 /**
  * A record that contains information for one "band" of date labels in 
@@ -80,11 +81,11 @@
     
     /** The default insets. */
     public static final RectangleInsets DEFAULT_INSETS 
-        = new RectangleInsets(2, 2, 2, 2);
+            = new RectangleInsets(2, 2, 2, 2);
     
     /** The default font. */
     public static final Font DEFAULT_FONT 
-        = new Font("SansSerif", Font.PLAIN, 10);
+            = new Font("SansSerif", Font.PLAIN, 10);
     
     /** The default label paint. */
     public static final Paint DEFAULT_LABEL_PAINT = Color.black;

Modified: trunk/source/org/jfree/chart/axis/SubCategoryAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/SubCategoryAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/SubCategoryAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -71,8 +71,8 @@
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.io.SerialUtilities;
 
 /**
  * A specialised category axis that can display sub-categories.

Modified: trunk/source/org/jfree/chart/axis/SymbolAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/SymbolAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/SymbolAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -102,10 +102,10 @@
 import org.jfree.chart.plot.ValueAxisPlot;
 import org.jfree.chart.text.TextAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.PaintUtilities;
 import org.jfree.chart.util.RectangleEdge;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.Range;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PaintUtilities;
 
 /**
  * A standard linear value axis that replaces integer values with symbols.

Modified: trunk/source/org/jfree/chart/axis/ValueAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/ValueAxis.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/axis/ValueAxis.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -122,12 +122,12 @@
 import org.jfree.chart.event.AxisChangeEvent;
 import org.jfree.chart.plot.Plot;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleEdge;
 import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.data.Range;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * The base class for axes that display value data, where values are measured 

Modified: trunk/source/org/jfree/chart/block/AbstractBlock.java
===================================================================
--- trunk/source/org/jfree/chart/block/AbstractBlock.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/AbstractBlock.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -59,13 +59,13 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
+import org.jfree.chart.util.ShapeUtilities;
 import org.jfree.chart.util.Size2D;
 import org.jfree.data.Range;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
-import org.jfree.util.ShapeUtilities;
 
 /**
  * A convenience class for creating new classes that implement 

Modified: trunk/source/org/jfree/chart/block/BlockBorder.java
===================================================================
--- trunk/source/org/jfree/chart/block/BlockBorder.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/BlockBorder.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -42,6 +42,7 @@
  * 06-May-2005 : Added new convenience constructors (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 16-Mar-2007 : Implemented BlockFrame (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -56,9 +57,9 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.jfree.io.SerialUtilities;
-import org.jfree.ui.RectangleInsets;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A border for a block.  This class is immutable.

Modified: trunk/source/org/jfree/chart/block/BlockContainer.java
===================================================================
--- trunk/source/org/jfree/chart/block/BlockContainer.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/BlockContainer.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -60,8 +60,8 @@
 
 import org.jfree.chart.entity.EntityCollection;
 import org.jfree.chart.entity.StandardEntityCollection;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.chart.util.Size2D;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A container for a collection of {@link Block} objects.  The container uses 

Modified: trunk/source/org/jfree/chart/block/BlockFrame.java
===================================================================
--- trunk/source/org/jfree/chart/block/BlockFrame.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/BlockFrame.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -37,6 +37,7 @@
  * Changes:
  * --------
  * 16-Mar-2007 : Version 1 (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -45,8 +46,8 @@
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
-import org.jfree.ui.RectangleInsets;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.PublicCloneable;
+import org.jfree.chart.util.RectangleInsets;
 
 /**
  * A block frame is a type of border that can be drawn around the outside of 

Modified: trunk/source/org/jfree/chart/block/ColorBlock.java
===================================================================
--- trunk/source/org/jfree/chart/block/ColorBlock.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/ColorBlock.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -40,6 +40,7 @@
  * 20-Apr-2005 : Added new draw() method (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 16-Mar-2007 : Implemented equals() and fixed serialization (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -52,8 +53,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A block that is filled with a single color.

Modified: trunk/source/org/jfree/chart/block/EmptyBlock.java
===================================================================
--- trunk/source/org/jfree/chart/block/EmptyBlock.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/EmptyBlock.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ---------------
  * EmptyBlock.java
  * ---------------
- * (C) Copyright 2004, 2005, by Object Refinery Limited.
+ * (C) Copyright 2004-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -39,6 +39,7 @@
  * 22-Oct-2004 : Version 1 (DG);
  * 04-Feb-2005 : Now cloneable and serializable (DG);
  * 20-Apr-2005 : Added new draw() method (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -48,7 +49,7 @@
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
 
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.PublicCloneable;
 
 /**
  * An empty block with a fixed size.

Modified: trunk/source/org/jfree/chart/block/LabelBlock.java
===================================================================
--- trunk/source/org/jfree/chart/block/LabelBlock.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/LabelBlock.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -67,11 +67,11 @@
 import org.jfree.chart.text.TextBlock;
 import org.jfree.chart.text.TextBlockAnchor;
 import org.jfree.chart.text.TextUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities;
 import org.jfree.chart.util.Size2D;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A block containing a label.

Modified: trunk/source/org/jfree/chart/block/LineBorder.java
===================================================================
--- trunk/source/org/jfree/chart/block/LineBorder.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/block/LineBorder.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -56,10 +56,10 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.jfree.io.SerialUtilities;
-import org.jfree.ui.RectangleInsets;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PaintUtilities;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PaintUtilities;
+import org.jfree.chart.util.RectangleInsets;
+import org.jfree.chart.util.SerialUtilities;
 
 /**
  * A line border for any {@link AbstractBlock}. 

Modified: trunk/source/org/jfree/chart/entity/ChartEntity.java
===================================================================
--- trunk/source/org/jfree/chart/entity/ChartEntity.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/entity/ChartEntity.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -63,6 +63,7 @@
  * 20-Apr-2005 : Added toString() implementation (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 06-Feb-2007 : API doc update (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -78,9 +79,9 @@
 
 import org.jfree.chart.imagemap.ToolTipTagFragmentGenerator;
 import org.jfree.chart.imagemap.URLTagFragmentGenerator;
-import org.jfree.io.SerialUtilities;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
+import org.jfree.chart.util.SerialUtilities; 
 
 /**
  * A class that captures information about some component of a chart (a bar, 

Modified: trunk/source/org/jfree/chart/entity/StandardEntityCollection.java
===================================================================
--- trunk/source/org/jfree/chart/entity/StandardEntityCollection.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/entity/StandardEntityCollection.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -----------------------------
  * StandardEntityCollection.java
  * -----------------------------
- * (C) Copyright 2001-2006, by Object Refinery Limited.
+ * (C) Copyright 2001-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -46,6 +46,7 @@
  * 20-May-2005 : Fixed bug 1113521 - inefficiency in getEntity() method (DG);
  * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 01-Dec-2006 : Implemented PublicCloneable and fixed clone() method (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -57,8 +58,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 
 /**
  * A standard implementation of the {@link EntityCollection} interface.

Modified: trunk/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/AbstractCategoryItemLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ---------------------------------------
  * AbstractCategoryItemLabelGenerator.java
  * ---------------------------------------
- * (C) Copyright 2005, 2006, by Object Refinery Limited.
+ * (C) Copyright 2005-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -41,6 +41,7 @@
  * 17-May-2005 : Added percentage to item array (DG);
  * ------------- JFREECHART 1.0.0 ---------------------------------------------
  * 03-May-2006 : Added new constructor (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  */
 
 package org.jfree.chart.labels;
@@ -50,10 +51,10 @@
 import java.text.MessageFormat;
 import java.text.NumberFormat;
 
+import org.jfree.chart.util.ObjectUtilities;
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.DataUtilities;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.util.ObjectUtilities;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A base class that can be used to create a label or tooltip generator that 

Modified: trunk/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/BoxAndWhiskerToolTipGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ------------------------------------
  * BoxAndWhiskerToolTipGenerator.java
  * ------------------------------------
- * (C) Copyright 2004, 2005, by David Browning and Contributors.
+ * (C) Copyright 2004-2007, by David Browning and Contributors.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -38,6 +38,7 @@
  * -------
  * 02-Jun-2004 : Version 1 (DG);
  * 23-Mar-2005 : Implemented PublicCloneable (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -47,9 +48,9 @@
 import java.text.MessageFormat;
 import java.text.NumberFormat;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.statistics.BoxAndWhiskerCategoryDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * An item label generator for plots that use data from a 

Modified: trunk/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/CategoryItemLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -------------------------------
  * CategoryItemLabelGenerator.java
  * -------------------------------
- * (C) Copyright 2001-2005, by Object Refinery Limited.
+ * (C) Copyright 2001-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -56,11 +56,13 @@
  * 31-Jan-2005 : Added generateRowLabel() and generateColumnLabel()  
  *               methods (DG);
  * 20-Apr-2005 : Reverted name change of 11-May-2004 (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
 package org.jfree.chart.labels;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
 
 /**
@@ -70,7 +72,7 @@
  * items in a {@link org.jfree.chart.plot.CategoryPlot}. 
  * <p>
  * To assist with cloning charts, classes that implement this interface should 
- * also implement the {@link org.jfree.util.PublicCloneable} interface.
+ * also implement the {@link PublicCloneable} interface.
  */
 public interface CategoryItemLabelGenerator {
 

Modified: trunk/source/org/jfree/chart/labels/CategoryToolTipGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/CategoryToolTipGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/CategoryToolTipGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -----------------------------
  * CategoryToolTipGenerator.java
  * -----------------------------
- * (C) Copyright 2001-2004, by Object Refinery Limited.
+ * (C) Copyright 2001-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -38,11 +38,13 @@
  * -------
  * 15-Apr-2004 : Separated tool tip method from CategoryItemLabelGenerator 
  *               interface (DG);
+ * 21-Jun-2007 : Removed JCommon dependency (DG);
  *
  */
 
 package org.jfree.chart.labels;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
 
 /**
@@ -52,8 +54,7 @@
  * items in a {@link org.jfree.chart.plot.CategoryPlot}. 
  * <p>
  * To assist with cloning charts, classes that implement this interface should 
- * also implement the <code>org.jfree.util.PublicCloneable</code> interface (in
- * JCommon).
+ * also implement the {@link PublicCloneable} interface.
  */
 public interface CategoryToolTipGenerator {
 

Modified: trunk/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/CustomXYToolTipGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -43,6 +43,7 @@
  * 17-Nov-2003 : Implemented PublicCloneable (DG);
  * 25-Feb-2004 : Renamed XYToolTipGenerator --> XYItemLabelGenerator (DG);
  * 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  * 
  */
 
@@ -51,8 +52,8 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.xy.XYDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A tool tip generator that stores custom tooltips. The dataset passed into 

Modified: trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/HighLowItemLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ------------------------------
  * HighLowItemLabelGenerator.java
  * ------------------------------
- * (C) Copyright 2001-2005, by Object Refinery Limited.
+ * (C) Copyright 2001-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   David Basten;
@@ -48,6 +48,7 @@
  * 15-Jul-2004 : Switched getX() with getXValue() and getY() with 
  *               getYValue() (DG);
  * 20-Apr-2005 : Renamed XYLabelGenerator --> XYItemLabelGenerator (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -58,9 +59,9 @@
 import java.text.NumberFormat;
 import java.util.Date;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.xy.OHLCDataset;
 import org.jfree.data.xy.XYDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A standard item label generator for plots that use data from a 

Modified: trunk/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/IntervalCategoryItemLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ---------------------------------------
  * IntervalCategoryItemLabelGenerator.java
  * ---------------------------------------
- * (C) Copyright 2004, 2005, by Object Refinery Limited.
+ * (C) Copyright 2004-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -37,7 +37,8 @@
  * Changes
  * -------
  * 11-May-2004 : Version 1, split from IntervalCategoryItemLabelGenerator (DG);
- *
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
+ * 
  */
 
 package org.jfree.chart.labels;
@@ -46,9 +47,9 @@
 import java.text.DateFormat;
 import java.text.NumberFormat;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.IntervalCategoryDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A label generator for plots that use data from an 

Modified: trunk/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/IntervalCategoryToolTipGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -------------------------------------
  * IntervalCategoryToolTipGenerator.java
  * -------------------------------------
- * (C) Copyright 2004, by Object Refinery Limited.
+ * (C) Copyright 2004, 2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -37,6 +37,7 @@
  * Changes
  * -------
  * 11-May-2004 : Version 1, split from IntervalCategoryItemLabelGenerator (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -46,9 +47,9 @@
 import java.text.DateFormat;
 import java.text.NumberFormat;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.IntervalCategoryDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A tooltip generator for plots that use data from an 

Modified: trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/MultipleXYSeriesLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -39,6 +39,7 @@
  * 19-Nov-2004 : Version 1 (DG);
  * 18-Apr-2005 : Use StringBuffer (DG);
  * 20-Feb-2007 : Fixed for equals() and cloning() (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -52,8 +53,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.xy.XYDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A series label generator for plots that use data from 

Modified: trunk/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/StandardCategoryItemLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * ---------------------------------------
  * StandardCategoryItemLabelGenerator.java
  * ---------------------------------------
- * (C) Copyright 2004-2006, by Object Refinery Limited.
+ * (C) Copyright 2004-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -39,8 +39,10 @@
  * 11-May-2004 : Version 1 (DG);
  * 20-Apr-2005 : Renamed StandardCategoryLabelGenerator 
  *               --> StandardCategoryItemLabelGenerator (DG);
- * ------------- JFREECHART 1.0.0 ---------------------------------------------
+ * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 03-May-2005 : Added equals() implementation, to fix bug 1481087 (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
+ * 
  */
 
 package org.jfree.chart.labels;
@@ -49,8 +51,8 @@
 import java.text.DateFormat;
 import java.text.NumberFormat;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A standard label generator that can be used with a 

Modified: trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java
===================================================================
--- trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java	2007-06-21 10:39:22 UTC (rev 47)
+++ trunk/source/org/jfree/chart/labels/StandardCategorySeriesLabelGenerator.java	2007-06-21 10:41:54 UTC (rev 48)
@@ -2,7 +2,7 @@
  * JFreeChart : a free chart library for the Java(tm) platform
  * ===========================================================
  *
- * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
  *
  * Project Info:  http://www.jfree.org/jfreechart/index.html
  *
@@ -27,7 +27,7 @@
  * -----------------------------------------
  * StandardCategorySeriesLabelGenerator.java
  * -----------------------------------------
- * (C) Copyright 2005, 2006, by Object Refinery Limited.
+ * (C) Copyright 2005-2007, by Object Refinery Limited.
  *
  * Original Author:  David Gilbert (for Object Refinery Limited);
  * Contributor(s):   -;
@@ -37,8 +37,9 @@
  * Changes
  * -------
  * 20-Apr-2005 : Version 1 (DG);
- * ------------- JFREECHART 1.0.0 ---------------------------------------------
+ * ------------- JFREECHART 1.0.x ---------------------------------------------
  * 03-May-2006 : Fixed equals() method (bug 1481102) (DG);
+ * 21-Jun-2007 : Removed JCommon dependencies (DG);
  *
  */
 
@@ -47,8 +48,8 @@
 import java.io.Serializable;
 import java.text.MessageFormat;
 
+import org.jfree.chart.util.PublicCloneable;
 import org.jfree.data.category.CategoryDataset;
-import org.jfree.util.PublicCloneable;
 
 /**
  * A standard series label generator for plots that use data from 

Modified: trunk/source/org/jfree/chart/labels/StandardPieToolTipGenerator.java
===================================================================
--- trunk/source/org/jfree/chart...
 
[truncated message content]