jfreechart-commit — Receives automatic notification of all CVS commits

[Jfreechart-commit] jfreechart ChangeLog,1.26,1.27

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28138

Modified Files:
	ChangeLog 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/title/AttributedTextTitle.java
	(arrangeFF): add message logging.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ChangeLog	28 Oct 2005 10:23:24 -0000	1.26
--- ChangeLog	28 Oct 2005 10:35:26 -0000	1.27
***************
*** 1,4 ****
--- 1,9 ----
  28-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/title/AttributedTextTitle.java
+ 	(arrangeFF): add message logging.
+ 
+ 28-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/LegendItem.java
  	(attributedLabel): made transient,

[Jfreechart-commit] jfreechart/source/org/jfree/chart LegendItem.java,1.11,1.12

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25816/source/org/jfree/chart

Modified Files:
	LegendItem.java 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/LegendItem.java
	(attributedLabel): made transient,
	(equalACI): removed,
	(equals): make use of AttributedStringUtilities class,
	(writeObject): handle serialization of attributedLabel,
	(readObject): handle serialization of attributedLabel.



Index: LegendItem.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/LegendItem.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LegendItem.java	19 Jul 2005 14:28:32 -0000	1.11
--- LegendItem.java	28 Oct 2005 10:23:24 -0000	1.12
***************
*** 65,72 ****
  import java.io.ObjectOutputStream;
  import java.io.Serializable;
- import java.text.AttributedCharacterIterator;
  import java.text.AttributedString;
  
  import org.jfree.io.SerialUtilities;
  import org.jfree.util.ObjectUtilities;
  import org.jfree.util.ShapeUtilities;
--- 65,72 ----
  import java.io.ObjectOutputStream;
  import java.io.Serializable;
  import java.text.AttributedString;
  
  import org.jfree.io.SerialUtilities;
+ import org.jfree.util.AttributedStringUtilities;
  import org.jfree.util.ObjectUtilities;
  import org.jfree.util.ShapeUtilities;
***************
*** 88,92 ****
      
      /** The attributed label (if null, fall back to the regular label). */
!     private AttributedString attributedLabel;
      /** 
       * The description (not currently used - could be displayed as a tool tip). 
--- 88,93 ----
      
      /** The attributed label (if null, fall back to the regular label). */
!     private transient AttributedString attributedLabel;
! 
      /** 
       * The description (not currently used - could be displayed as a tool tip). 
***************
*** 485,506 ****
      }
      
-     private boolean equalACI(AttributedCharacterIterator aci1, 
-             AttributedCharacterIterator aci2) {
-         if (aci1 == null) {
-             return false;
-         }
-         if (aci2 == null) {
-             return false;
-         }
-         if (aci1 == aci2) {
-             return true;
-         }
-         if (aci1.getEndIndex() != aci2.getEndIndex()) {
-             return false;
-         }
-         // TODO: evaluate contents
-         return true;
-     }
-     
      /**
       * Tests this item for equality with an arbitrary object.
--- 486,489 ----
***************
*** 521,526 ****
              return false;
          }
!         if (!equalACI(this.attributedLabel.getIterator(), 
!                 that.attributedLabel.getIterator())) {
              return false;
          }
--- 504,509 ----
              return false;
          }
!         if (!AttributedStringUtilities.equal(this.attributedLabel, 
!                 that.attributedLabel)) {
              return false;
          }
***************
*** 573,576 ****
--- 556,560 ----
      private void writeObject(ObjectOutputStream stream) throws IOException {
          stream.defaultWriteObject();
+         SerialUtilities.writeAttributedString(this.attributedLabel, stream);
          SerialUtilities.writeShape(this.shape, stream);
          SerialUtilities.writePaint(this.fillPaint, stream);
***************
*** 593,596 ****
--- 577,581 ----
          throws IOException, ClassNotFoundException {
          stream.defaultReadObject();
+         this.attributedLabel = SerialUtilities.readAttributedString(stream);
          this.shape = SerialUtilities.readShape(stream);
          this.fillPaint = SerialUtilities.readPaint(stream);

[Jfreechart-commit] jfreechart ChangeLog,1.25,1.26

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25816

Modified Files:
	ChangeLog 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/LegendItem.java
	(attributedLabel): made transient,
	(equalACI): removed,
	(equals): make use of AttributedStringUtilities class,
	(writeObject): handle serialization of attributedLabel,
	(readObject): handle serialization of attributedLabel.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ChangeLog	28 Oct 2005 10:17:43 -0000	1.25
--- ChangeLog	28 Oct 2005 10:23:24 -0000	1.26
***************
*** 1,4 ****
--- 1,13 ----
  28-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/LegendItem.java
+ 	(attributedLabel): made transient,
+ 	(equalACI): removed,
+ 	(equals): make use of AttributedStringUtilities class,
+ 	(writeObject): handle serialization of attributedLabel,
+ 	(readObject): handle serialization of attributedLabel.
+ 
+ 28-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/NestedGrid.java
  	(arrangeNN): added null check for messages.

[Jfreechart-commit] jfreechart ChangeLog,1.24,1.25

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852

Modified Files:
	ChangeLog 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/NestedGrid.java
	(arrangeNN): added null check for messages.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog	28 Oct 2005 10:12:37 -0000	1.24
--- ChangeLog	28 Oct 2005 10:17:43 -0000	1.25
***************
*** 1,4 ****
--- 1,9 ----
  28-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/NestedGrid.java
+ 	(arrangeNN): added null check for messages.
+ 
+ 28-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/block/ArrangeParams.java
  	(ArrangeParams(boolean): new constructor,

[Jfreechart-commit] jfreechart/source/org/jfree/chart NestedGrid.java,1.4,1.5

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852/source/org/jfree/chart

Modified Files:
	NestedGrid.java 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/NestedGrid.java
	(arrangeNN): added null check for messages.



Index: NestedGrid.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/NestedGrid.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NestedGrid.java	19 Jul 2005 14:28:32 -0000	1.4
--- NestedGrid.java	28 Oct 2005 10:17:43 -0000	1.5
***************
*** 253,257 ****
                      ArrangeResult ar = block.arrange(g2, constraint, params);
                      if (params.isLogEnabled()) {
!                         messages.addAll(ar.getMessages());
                      }
                      block.setBounds(new Rectangle2D.Double(x, y, width, 
--- 253,260 ----
                      ArrangeResult ar = block.arrange(g2, constraint, params);
                      if (params.isLogEnabled()) {
!                         List m = ar.getMessages();
!                         if (m != null) {
!                             messages.addAll(m);
!                         }
                      }
                      block.setBounds(new Rectangle2D.Double(x, y, width, 

[Jfreechart-commit] jfreechart/source/org/jfree/chart/block ArrangeParams.java,1.3,1.4 Message.java,1.1,1.2

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24079/source/org/jfree/chart/block

Modified Files:
	ArrangeParams.java Message.java 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/block/ArrangeParams.java
	(ArrangeParams(boolean): new constructor,
	* source/org/jfree/chart/block/Message.java: added standard header,
	(toString): new method.



Index: ArrangeParams.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/block/ArrangeParams.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArrangeParams.java	19 Jul 2005 14:27:02 -0000	1.3
--- ArrangeParams.java	28 Oct 2005 10:12:37 -0000	1.4
***************
*** 66,74 ****
      
      /**
!      * Creates a new default instance.
       */
      public ArrangeParams() {
          this.recyclableResult = null;
!         this.log = false;
          this.widthCalculators = new java.util.ArrayList();
          this.heightCalculators = new java.util.ArrayList();
--- 66,81 ----
      
      /**
!      * Creates a new instance with no logging.
       */
      public ArrangeParams() {
+         this(false);
+     }
+     
+     /**
+      * Creates a new default instance.
+      */
+     public ArrangeParams(boolean log) {
          this.recyclableResult = null;
!         this.log = log;
          this.widthCalculators = new java.util.ArrayList();
          this.heightCalculators = new java.util.ArrayList();

Index: Message.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/block/Message.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Message.java	19 Jul 2005 14:25:44 -0000	1.1
--- Message.java	28 Oct 2005 10:12:37 -0000	1.2
***************
*** 1,8 ****
! /*
!  * Created on Jul 14, 2005
   *
!  * TODO To change the template for this generated file go to
!  * Window - Preferences - Java - Code Style - Code Templates
   */
  package org.jfree.chart.block;
  
--- 1,43 ----
! /* ===========================================================
!  * JFreeChart : a free chart library for the Java(tm) platform
!  * ===========================================================
   *
!  * (C) Copyright 2000-2005, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
!  *
!  * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
!  * in the United States and other countries.]
!  *
!  * ------------
!  * Message.java
!  * ------------
!  * (C) Copyright 2005, by Object Refinery Limited.
!  *
!  * Original Author:  David Gilbert (for Object Refinery Limited);
!  * Contributor(s):   -;
!  *
!  * $Id$
!  *
!  * Changes:
!  * --------
!  * 20-Jul-2005 : Version 1 (DG);
!  * 
   */
+ 
  package org.jfree.chart.block;
  
***************
*** 28,30 ****
--- 63,70 ----
          return this.message;
      }
+     
+     public String toString() {
+         return "[" + this.source.toString() + ": " + this.message + "]";
+     }
+     
  }

[Jfreechart-commit] jfreechart ChangeLog,1.23,1.24

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24079

Modified Files:
	ChangeLog 
Log Message:
28-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/block/ArrangeParams.java
	(ArrangeParams(boolean): new constructor,
	* source/org/jfree/chart/block/Message.java: added standard header,
	(toString): new method.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog	27 Oct 2005 15:56:58 -0000	1.23
--- ChangeLog	28 Oct 2005 10:12:37 -0000	1.24
***************
*** 1,2 ****
--- 1,9 ----
+ 28-10-2005  David Gilbert  <dav...@ob...>
+ 
+ 	* source/org/jfree/chart/block/ArrangeParams.java
+ 	(ArrangeParams(boolean): new constructor,
+ 	* source/org/jfree/chart/block/Message.java: added standard header,
+ 	(toString): new method.
+ 
  27-10-2005  David Gilbert  <dav...@ob...>
  

[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot/junit PiePlotTests.java,1.9,1.10

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26651/source/org/jfree/chart/plot/junit

Modified Files:
	PiePlotTests.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/PiePlot.java
	(passesRequired): new field,
	(PiePlot(PieDataset)): initialise passes required,
	(getPassesRequired): new method,
	(setPassesRequired): new method,
	(initialise): don't use hard-coded value for setPassesRequired(),
	(getLegendItems): fetch attributed label if available,
	* source/org/jfree/chart/plot/junit/PiePlotTests.java
	(testEquals): updated for separation of StandardPieItemLabelGenerator
	into StandardPieSectionLabelGenerator and StandardPieToolTipGenerator.
----------------------------------------------------------------------


Index: PiePlotTests.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit/PiePlotTests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PiePlotTests.java	19 Jul 2005 14:18:19 -0000	1.9
--- PiePlotTests.java	27 Oct 2005 15:56:58 -0000	1.10
***************
*** 61,65 ****
  
  import org.jfree.chart.LegendItemCollection;
! import org.jfree.chart.labels.StandardPieItemLabelGenerator;
  import org.jfree.chart.plot.PiePlot;
  import org.jfree.chart.urls.StandardPieURLGenerator;
--- 61,66 ----
  
  import org.jfree.chart.LegendItemCollection;
! import org.jfree.chart.labels.StandardPieToolTipGenerator;
! import org.jfree.chart.labels.StandardPieSectionLabelGenerator;
  import org.jfree.chart.plot.PiePlot;
  import org.jfree.chart.urls.StandardPieURLGenerator;
***************
*** 280,286 ****
          
          // labelGenerator
!         plot1.setLabelGenerator(new StandardPieItemLabelGenerator("{2}{1}{0}"));
          assertFalse(plot1.equals(plot2));
!         plot2.setLabelGenerator(new StandardPieItemLabelGenerator("{2}{1}{0}"));
          assertTrue(plot1.equals(plot2));
         
--- 281,289 ----
          
          // labelGenerator
!         plot1.setLabelGenerator(new StandardPieSectionLabelGenerator(
!                 "{2}{1}{0}"));
          assertFalse(plot1.equals(plot2));
!         plot2.setLabelGenerator(new StandardPieSectionLabelGenerator(
!                 "{2}{1}{0}"));
          assertTrue(plot1.equals(plot2));
         
***************
*** 340,348 ****
          // toolTipGenerator
          plot1.setToolTipGenerator(
!             new StandardPieItemLabelGenerator("{2}{1}{0}")
          );
          assertFalse(plot1.equals(plot2));
          plot2.setToolTipGenerator(
!             new StandardPieItemLabelGenerator("{2}{1}{0}")
          );
          assertTrue(plot1.equals(plot2));
--- 343,351 ----
          // toolTipGenerator
          plot1.setToolTipGenerator(
!             new StandardPieToolTipGenerator("{2}{1}{0}")
          );
          assertFalse(plot1.equals(plot2));
          plot2.setToolTipGenerator(
!             new StandardPieToolTipGenerator("{2}{1}{0}")
          );
          assertTrue(plot1.equals(plot2));

[Jfreechart-commit] jfreechart ChangeLog,1.22,1.23

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26651

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/PiePlot.java
	(passesRequired): new field,
	(PiePlot(PieDataset)): initialise passes required,
	(getPassesRequired): new method,
	(setPassesRequired): new method,
	(initialise): don't use hard-coded value for setPassesRequired(),
	(getLegendItems): fetch attributed label if available,
	* source/org/jfree/chart/plot/junit/PiePlotTests.java
	(testEquals): updated for separation of StandardPieItemLabelGenerator
	into StandardPieSectionLabelGenerator and StandardPieToolTipGenerator.
----------------------------------------------------------------------


Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	27 Oct 2005 15:43:59 -0000	1.22
--- ChangeLog	27 Oct 2005 15:56:58 -0000	1.23
***************
*** 1,4 ****
--- 1,17 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/plot/PiePlot.java
+ 	(passesRequired): new field,
+ 	(PiePlot(PieDataset)): initialise passes required,
+ 	(getPassesRequired): new method,
+ 	(setPassesRequired): new method,
+ 	(initialise): don't use hard-coded value for setPassesRequired(),
+ 	(getLegendItems): fetch attributed label if available,
+ 	* source/org/jfree/chart/plot/junit/PiePlotTests.java
+ 	(testEquals): updated for separation of StandardPieItemLabelGenerator
+ 	into StandardPieSectionLabelGenerator and StandardPieToolTipGenerator.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/plot/RingPlot.java
  	(separatorsVisible): renamed sectionSeparatorsVisible,

[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot PiePlot.java,1.22,1.23

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26651/source/org/jfree/chart/plot

Modified Files:
	PiePlot.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/PiePlot.java
	(passesRequired): new field,
	(PiePlot(PieDataset)): initialise passes required,
	(getPassesRequired): new method,
	(setPassesRequired): new method,
	(initialise): don't use hard-coded value for setPassesRequired(),
	(getLegendItems): fetch attributed label if available,
	* source/org/jfree/chart/plot/junit/PiePlotTests.java
	(testEquals): updated for separation of StandardPieItemLabelGenerator
	into StandardPieSectionLabelGenerator and StandardPieToolTipGenerator.
----------------------------------------------------------------------


Index: PiePlot.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/PiePlot.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PiePlot.java	30 Sep 2005 13:52:49 -0000	1.22
--- PiePlot.java	27 Oct 2005 15:56:58 -0000	1.23
***************
*** 149,152 ****
--- 149,153 ----
  import java.io.ObjectOutputStream;
  import java.io.Serializable;
+ import java.text.AttributedString;
  import java.util.Iterator;
  import java.util.List;
***************
*** 390,393 ****
--- 391,397 ----
      private double minimumArcAngleToDraw;
  
+     /** The number of times drawItem will be called for each item. */
+     private int passesRequired;
+     
      /** The resourceBundle for the localization. */
      protected static ResourceBundle localizationResources =
***************
*** 454,457 ****
--- 458,463 ----
          this.ignoreNullValues = false;
          this.ignoreZeroValues = false;
+ 
+         this.passesRequired = 2;
      }
  
***************
*** 491,494 ****
--- 497,515 ----
      
      /**
+      * @return Returns the number of passes required to draw an item. 
+      */
+     public int getPassesRequired() {
+         return passesRequired;
+     }
+ 
+     /**
+      * Sets the number of passed required to draw an item of the pie chart.
+      * @param n the number of passes required.
+      */
+     public void setPassesRequired(int n) {
+         this.passesRequired = n;
+     }
+ 	
+     /**
       * Returns the pie index (this is used by the {@link MultiplePiePlot} class
       * to track subplots).
***************
*** 1464,1468 ****
       
          PiePlotState state = new PiePlotState(info);
!         state.setPassesRequired(2);
          state.setTotal(
              DatasetUtilities.calculatePieDatasetTotal(plot.getDataset())
--- 1485,1489 ----
       
          PiePlotState state = new PiePlotState(info);
!         state.setPassesRequired(getPassesRequired());
          state.setTotal(
              DatasetUtilities.calculatePieDatasetTotal(plot.getDataset())
***************
*** 1976,1988 ****
              if (include) {
                  String label = this.legendLabelGenerator.generateSectionLabel(
!                     this.dataset, key
!                 );
                  String description = label;
                  String toolTipText = null;
                  if (this.legendLabelToolTipGenerator != null) {
                      toolTipText = this.legendLabelToolTipGenerator
! 		        .generateSectionLabel(
!                             this.dataset, key
!                         );
                  }
                  String urlText = null;
--- 1997,2009 ----
              if (include) {
                  String label = this.legendLabelGenerator.generateSectionLabel(
!                     this.dataset, key);
!                 AttributedString attributedLabel 
!                     = this.legendLabelGenerator.generateAttributedSectionLabel(
!                             this.dataset, key);
                  String description = label;
                  String toolTipText = null;
                  if (this.legendLabelToolTipGenerator != null) {
                      toolTipText = this.legendLabelToolTipGenerator
! 		        .generateSectionLabel(this.dataset, key);
                  }
                  String urlText = null;
***************
*** 1990,1995 ****
                  Paint outlinePaint = getSectionOutlinePaint(section);
                  Stroke outlineStroke = getSectionOutlineStroke(section);
!                 LegendItem item = new LegendItem(label, null, description, 
!                         toolTipText, urlText, true, shape, true, paint, 
                          true, outlinePaint, outlineStroke, 
                          false,          // line not visible
--- 2011,2017 ----
                  Paint outlinePaint = getSectionOutlinePaint(section);
                  Stroke outlineStroke = getSectionOutlineStroke(section);
!                 LegendItem item = new LegendItem(label, attributedLabel, 
!                         description, toolTipText, urlText, true, shape, 
!                         true, paint, 
                          true, outlinePaint, outlineStroke, 
                          false,          // line not visible

[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot RingPlot.java,1.6,1.7

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24058/source/org/jfree/chart/plot

Modified Files:
	RingPlot.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/RingPlot.java
	(separatorsVisible): renamed sectionSeparatorsVisible,
	(sectionDepth): new field,
	(RingPlot(PieDataset)): updated for new and renamed fields, set passes 
	required to 3,
	(getSeparatorsVisible): renamed getSectionSeparatorsVisible(),
	(setSeparatorsVisible): renamed setSectionSeparatorsVisible(),
	(getSectionDepth): new method,
	(setSectionDepth): new method,
	(drawItem): use variable section depth, move separator drawing code
	to pass 3,
	(equals): updated for renamed field,
	* source/org/jfree/chart/plot/junit/RingPlotTests.java
	(testEquals): updated for renamed methods.
----------------------------------------------------------------------


Index: RingPlot.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/RingPlot.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RingPlot.java	19 Jul 2005 14:23:55 -0000	1.6
--- RingPlot.java	27 Oct 2005 15:43:59 -0000	1.7
***************
*** 86,90 ****
       * sections of the chart.
       */
!     private boolean separatorsVisible;
      
      /** The stroke used to draw separators. */
--- 86,90 ----
       * sections of the chart.
       */
!     private boolean sectionSeparatorsVisible;
      
      /** The stroke used to draw separators. */
***************
*** 105,109 ****
       */
      private double outerSeparatorExtension;
!     
      /**
       * Creates a new plot with a <code>null</code> dataset.
--- 105,114 ----
       */
      private double outerSeparatorExtension;
! 
!     /** 
!      * The depth of the section as a percentage of the diameter.  
!      */
!     private double sectionDepth;
!    
      /**
       * Creates a new plot with a <code>null</code> dataset.
***************
*** 120,128 ****
      public RingPlot(PieDataset dataset) {
          super(dataset);
!         this.separatorsVisible = true;
          this.separatorStroke = new BasicStroke(0.5f);
          this.separatorPaint = Color.gray;
          this.innerSeparatorExtension = 0.20;  // twenty percent
          this.outerSeparatorExtension = 0.20;  // twenty percent
      }
      
--- 125,135 ----
      public RingPlot(PieDataset dataset) {
          super(dataset);
!         this.sectionSeparatorsVisible = true;
          this.separatorStroke = new BasicStroke(0.5f);
          this.separatorPaint = Color.gray;
          this.innerSeparatorExtension = 0.20;  // twenty percent
          this.outerSeparatorExtension = 0.20;  // twenty percent
+         this.sectionDepth = 0.10; // 10%
+         this.setPassesRequired(3);
      }
      
***************
*** 133,138 ****
       * @return A boolean.
       */
!     public boolean getSeparatorsVisible() {
!         return this.separatorsVisible;
      }
      
--- 140,145 ----
       * @return A boolean.
       */
!     public boolean getSectionSeparatorsVisible() {
!         return this.sectionSeparatorsVisible;
      }
      
***************
*** 144,149 ****
       * @param visible  the flag.
       */
!     public void setSeparatorsVisible(boolean visible) {
!         this.separatorsVisible = visible;
          notifyListeners(new PlotChangeEvent(this));
      }
--- 151,156 ----
       * @param visible  the flag.
       */
!     public void setSectionSeparatorsVisible(boolean visible) {
!         this.sectionSeparatorsVisible = visible;
          notifyListeners(new PlotChangeEvent(this));
      }
***************
*** 242,245 ****
--- 249,270 ----
      
      /**
+      * @return Returns the sectionDepth.
+      */
+     public double getSectionDepth() {
+         return sectionDepth;
+     }
+ 	
+     /**
+      * The section depth is given as percentage of the external diameter.
+      * Specifying 0.5 results in a straightforward pie chart.
+      * 
+      * @param sectionDepth
+      *            The sectionDepth to set.
+      */
+     public void setSectionDepth(double sectionDepth) {
+         this.sectionDepth = sectionDepth;
+     }
+ 	
+     /**
       * Draws a single data item.
       *
***************
*** 294,300 ****
  
              // create the bounds for the inner arc
!             RectangleInsets s = new RectangleInsets(
!                 UnitType.RELATIVE, 0.10, 0.10, 0.10, 0.10
!             );
              Rectangle2D innerArcBounds = new Rectangle2D.Double();
              innerArcBounds.setRect(arcBounds);
--- 319,324 ----
  
              // create the bounds for the inner arc
!             RectangleInsets s = new RectangleInsets(UnitType.RELATIVE, 
! 	            sectionDepth, sectionDepth, sectionDepth, sectionDepth);
              Rectangle2D innerArcBounds = new Rectangle2D.Double();
              innerArcBounds.setRect(arcBounds);
***************
*** 343,356 ****
                  }
                  
-                 if (this.separatorsVisible) {
-                     Line2D extendedSeparator = extendLine(
-                         separator, this.innerSeparatorExtension, 
-                         this.innerSeparatorExtension
-                     );  
-                     g2.setStroke(this.separatorStroke);
-                     g2.setPaint(this.separatorPaint);
-                     g2.draw(extendedSeparator);
-                 }
-                 
                  // add an entity for the pie section
                  if (state.getInfo() != null) {
--- 367,370 ----
***************
*** 381,384 ****
--- 395,409 ----
                  }
              }
+             else if (currentPass == 2) {
+             	// if there were 3 passes...
+                 if (this.sectionSeparatorsVisible) {
+                     Line2D extendedSeparator = extendLine(separator,
+                         this.innerSeparatorExtension, 
+                         this.outerSeparatorExtension);
+                     g2.setStroke(this.separatorStroke);
+                     g2.setPaint(this.separatorPaint);
+                     g2.draw(extendedSeparator);
+                 }
+             }
          }    
          state.setLatestAngle(angle2);
***************
*** 403,407 ****
          }
          RingPlot that = (RingPlot) obj;
!         if (this.separatorsVisible != that.separatorsVisible) {
              return false;
          }
--- 428,432 ----
          }
          RingPlot that = (RingPlot) obj;
!         if (this.sectionSeparatorsVisible != that.sectionSeparatorsVisible) {
              return false;
          }

[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot/junit RingPlotTests.java,1.5,1.6

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24058/source/org/jfree/chart/plot/junit

Modified Files:
	RingPlotTests.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/RingPlot.java
	(separatorsVisible): renamed sectionSeparatorsVisible,
	(sectionDepth): new field,
	(RingPlot(PieDataset)): updated for new and renamed fields, set passes 
	required to 3,
	(getSeparatorsVisible): renamed getSectionSeparatorsVisible(),
	(setSeparatorsVisible): renamed setSectionSeparatorsVisible(),
	(getSectionDepth): new method,
	(setSectionDepth): new method,
	(drawItem): use variable section depth, move separator drawing code
	to pass 3,
	(equals): updated for renamed field,
	* source/org/jfree/chart/plot/junit/RingPlotTests.java
	(testEquals): updated for renamed methods.
----------------------------------------------------------------------


Index: RingPlotTests.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/junit/RingPlotTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RingPlotTests.java	19 Jul 2005 14:18:21 -0000	1.5
--- RingPlotTests.java	27 Oct 2005 15:43:59 -0000	1.6
***************
*** 98,104 ****
                  
          // separatorsVisible
!         plot1.setSeparatorsVisible(false);
          assertFalse(plot1.equals(plot2));
!         plot2.setSeparatorsVisible(false);
          assertTrue(plot1.equals(plot2));
          
--- 98,104 ----
                  
          // separatorsVisible
!         plot1.setSectionSeparatorsVisible(false);
          assertFalse(plot1.equals(plot2));
!         plot2.setSectionSeparatorsVisible(false);
          assertTrue(plot1.equals(plot2));
          

[Jfreechart-commit] jfreechart ChangeLog,1.21,1.22

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24058

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/RingPlot.java
	(separatorsVisible): renamed sectionSeparatorsVisible,
	(sectionDepth): new field,
	(RingPlot(PieDataset)): updated for new and renamed fields, set passes 
	required to 3,
	(getSeparatorsVisible): renamed getSectionSeparatorsVisible(),
	(setSeparatorsVisible): renamed setSectionSeparatorsVisible(),
	(getSectionDepth): new method,
	(setSectionDepth): new method,
	(drawItem): use variable section depth, move separator drawing code
	to pass 3,
	(equals): updated for renamed field,
	* source/org/jfree/chart/plot/junit/RingPlotTests.java
	(testEquals): updated for renamed methods.
----------------------------------------------------------------------


Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ChangeLog	27 Oct 2005 15:21:36 -0000	1.21
--- ChangeLog	27 Oct 2005 15:43:59 -0000	1.22
***************
*** 1,4 ****
--- 1,21 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/plot/RingPlot.java
+ 	(separatorsVisible): renamed sectionSeparatorsVisible,
+ 	(sectionDepth): new field,
+ 	(RingPlot(PieDataset)): updated for new and renamed fields, set passes 
+ 	required to 3,
+ 	(getSeparatorsVisible): renamed getSectionSeparatorsVisible(),
+ 	(setSeparatorsVisible): renamed setSectionSeparatorsVisible(),
+ 	(getSectionDepth): new method,
+ 	(setSectionDepth): new method,
+ 	(drawItem): use variable section depth, move separator drawing code
+ 	to pass 3,
+ 	(equals): updated for renamed field,
+ 	* source/org/jfree/chart/plot/junit/RingPlotTests.java
+ 	(testEquals): updated for renamed methods.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/plot/Marker.java
  	(Marker(Paint, Stroke, Paint, Stroke, float)): changed from public to

[Jfreechart-commit] jfreechart ChangeLog,1.20,1.21

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19534

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/Marker.java
	(Marker(Paint, Stroke, Paint, Stroke, float)): changed from public to
	private.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ChangeLog	27 Oct 2005 15:12:54 -0000	1.20
--- ChangeLog	27 Oct 2005 15:21:36 -0000	1.21
***************
*** 1,4 ****
--- 1,10 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/plot/Marker.java
+ 	(Marker(Paint, Stroke, Paint, Stroke, float)): changed from public to
+ 	private.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/labels/junit/LabelsPackageTests.java
  	(suite): renamed StandardPieItemLabelGeneratorTests 

[Jfreechart-commit] jfreechart/source/org/jfree/chart/plot Marker.java,1.11,1.12

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19534/source/org/jfree/chart/plot

Modified Files:
	Marker.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/plot/Marker.java
	(Marker(Paint, Stroke, Paint, Stroke, float)): changed from public to
	private.



Index: Marker.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/Marker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Marker.java	17 Jun 2005 10:18:52 -0000	1.11
--- Marker.java	27 Oct 2005 15:21:36 -0000	1.12
***************
*** 151,157 ****
       * @param alpha  the alpha transparency.
       */
!     public Marker(Paint paint, Stroke stroke, 
!                   Paint outlinePaint, Stroke outlineStroke, 
!                   float alpha) {
  
          if (paint == null) {
--- 151,157 ----
       * @param alpha  the alpha transparency.
       */
!     protected Marker(Paint paint, Stroke stroke, 
!                      Paint outlinePaint, Stroke outlineStroke, 
!                      float alpha) {
  
          if (paint == null) {

[Jfreechart-commit] jfreechart/source/org/jfree/chart/labels StandardPieItemLabelGenerator.java,1.5,NONE

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18561/source/org/jfree/chart/labels

Removed Files:
	StandardPieItemLabelGenerator.java 
Log Message:
Removed.

--- StandardPieItemLabelGenerator.java DELETED ---

[Jfreechart-commit] jfreechart ChangeLog,1.19,1.20

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17787

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/labels/junit/LabelsPackageTests.java
	(suite): renamed StandardPieItemLabelGeneratorTests 
	--> StandardPieToolTipGeneratorTests,
	* source/org/jfree/chart/labels/junit/StandardPieItemLabelGeneratorTests.java:
	renamed StandardPieToolTipGeneratorTests,
	* source/org/jfree/chart/labels/junit/StandardPieToolTipGeneratorTests.java:
	new file.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog	27 Oct 2005 14:54:54 -0000	1.19
--- ChangeLog	27 Oct 2005 15:12:54 -0000	1.20
***************
*** 1,4 ****
--- 1,14 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/labels/junit/LabelsPackageTests.java
+ 	(suite): renamed StandardPieItemLabelGeneratorTests 
+ 	--> StandardPieToolTipGeneratorTests,
+ 	* source/org/jfree/chart/labels/junit/StandardPieItemLabelGeneratorTests.java:
+ 	renamed StandardPieToolTipGeneratorTests,
+ 	* source/org/jfree/chart/labels/junit/StandardPieToolTipGeneratorTests.java:
+ 	new file.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/labels/PieSectionLabelGenerator.java
  	(generateAttributedSectionLabel): new method,

[Jfreechart-commit] jfreechart/source/org/jfree/chart/labels/junit StandardPieToolTipGeneratorTests.java,NONE,1.1 LabelsPackageTests.java,1.5,1.6 StandardPieItemLabelGeneratorTests.java,1.4,NONE

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels/junit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17787/source/org/jfree/chart/labels/junit

Modified Files:
	LabelsPackageTests.java 
Added Files:
	StandardPieToolTipGeneratorTests.java 
Removed Files:
	StandardPieItemLabelGeneratorTests.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/labels/junit/LabelsPackageTests.java
	(suite): renamed StandardPieItemLabelGeneratorTests 
	--> StandardPieToolTipGeneratorTests,
	* source/org/jfree/chart/labels/junit/StandardPieItemLabelGeneratorTests.java:
	renamed StandardPieToolTipGeneratorTests,
	* source/org/jfree/chart/labels/junit/StandardPieToolTipGeneratorTests.java:
	new file.



--- NEW FILE: StandardPieToolTipGeneratorTests.java ---
/* ===========================================================
 * JFreeChart : a free chart library for the Java(tm) platform
 * ===========================================================
 *
 * (C) Copyright 2000-2005, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 *
 * [Java is a trademark or registered trademark of Sun Microsystems, Inc. 
 * in the United States and other countries.]
 *
 * ---------------------------------------
 * StandardPieItemLabelGeneratorTests.java
 * ---------------------------------------
 * (C) Copyright 2003, 2004, by Object Refinery Limited and Contributors.
 *
 * Original Author:  David Gilbert (for Object Refinery Limited);
 * Contributor(s):   -;
 *
 * $Id: StandardPieToolTipGeneratorTests.java,v 1.1 2005/10/27 15:12:54 mungady Exp $
 *
 * Changes
 * -------
 * 18-Mar-2003 : Version 1 (DG);
 * 13-Aug-2003 : Added clone tests (DG);
 * 04-Mar-2004 : Added test for equals() method (DG);
 *
 */

package org.jfree.chart.labels.junit;

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 java.text.DecimalFormat;
import java.text.NumberFormat;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.jfree.chart.labels.StandardPieToolTipGenerator;

/**
 * Tests for the {@link StandardPieToolTipGenerator} class.
 */
public class StandardPieToolTipGeneratorTests extends TestCase {

    /**
     * Returns the tests as a test suite.
     *
     * @return The test suite.
     */
    public static Test suite() {
        return new TestSuite(StandardPieToolTipGeneratorTests.class);
    }

    /**
     * Constructs a new set of tests.
     *
     * @param name  the name of the tests.
     */
    public StandardPieToolTipGeneratorTests(String name) {
        super(name);
    }

    /**
     * Test that the equals() method distinguishes all fields.
     */
    public void testEquals() {
        StandardPieToolTipGenerator g1 = new StandardPieToolTipGenerator();
        StandardPieToolTipGenerator g2 = new StandardPieToolTipGenerator();
        assertTrue(g1.equals(g2));
        assertTrue(g2.equals(g1));
        
        g1 = new StandardPieToolTipGenerator(
            "{0}", new DecimalFormat("#,##0.00"), 
            NumberFormat.getPercentInstance()
        );
        assertFalse(g1.equals(g2));
        g2 = new StandardPieToolTipGenerator(
            "{0}", new DecimalFormat("#,##0.00"), 
            NumberFormat.getPercentInstance()
        );
        assertTrue(g1.equals(g2));

        g1 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0.00"), 
            NumberFormat.getPercentInstance()
        );
        assertFalse(g1.equals(g2));
        g2 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0.00"), 
            NumberFormat.getPercentInstance()
        );
        assertTrue(g1.equals(g2));
    
        g1 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0"), 
            NumberFormat.getPercentInstance()
        );
        assertFalse(g1.equals(g2));
        g2 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0"), 
            NumberFormat.getPercentInstance()
        );
        assertTrue(g1.equals(g2));

        g1 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0"), new DecimalFormat("0.000%")
        );
        assertFalse(g1.equals(g2));
        g2 = new StandardPieToolTipGenerator(
            "{0} {1}", new DecimalFormat("#,##0"), new DecimalFormat("0.000%")
        );
        assertTrue(g1.equals(g2));
    }
    
    /**
     * Confirm that cloning works.
     */
    public void testCloning() {
        StandardPieToolTipGenerator g1 = new StandardPieToolTipGenerator();
        StandardPieToolTipGenerator g2 = null;
        try {
            g2 = (StandardPieToolTipGenerator) g1.clone();
        }
        catch (CloneNotSupportedException e) {
            System.err.println("Failed to clone.");
        }
        assertTrue(g1 != g2);
        assertTrue(g1.getClass() == g2.getClass());
        assertTrue(g1.equals(g2));
    }

    /**
     * Serialize an instance, restore it, and check for equality.
     */
    public void testSerialization() {

        StandardPieToolTipGenerator g1 = new StandardPieToolTipGenerator();
        StandardPieToolTipGenerator g2 = null;

        try {
            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
            ObjectOutput out = new ObjectOutputStream(buffer);
            out.writeObject(g1);
            out.close();

            ObjectInput in = new ObjectInputStream(
                new ByteArrayInputStream(buffer.toByteArray())
            );
            g2 = (StandardPieToolTipGenerator) in.readObject();
            in.close();
        }
        catch (Exception e) {
            e.printStackTrace();
        }
        assertEquals(g1, g2);

    }

}
Index: LabelsPackageTests.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels/junit/LabelsPackageTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LabelsPackageTests.java	17 May 2005 12:24:44 -0000	1.5
--- LabelsPackageTests.java	27 Oct 2005 15:12:54 -0000	1.6
***************
*** 73,77 ****
          suite.addTestSuite(StandardCategoryToolTipGeneratorTests.class);
          suite.addTestSuite(StandardContourToolTipGeneratorTests.class);
!         suite.addTestSuite(StandardPieItemLabelGeneratorTests.class);
          suite.addTestSuite(StandardPieSectionLabelGeneratorTests.class);
          suite.addTestSuite(StandardXYLabelGeneratorTests.class);
--- 73,77 ----
          suite.addTestSuite(StandardCategoryToolTipGeneratorTests.class);
          suite.addTestSuite(StandardContourToolTipGeneratorTests.class);
!         suite.addTestSuite(StandardPieToolTipGeneratorTests.class);
          suite.addTestSuite(StandardPieSectionLabelGeneratorTests.class);
          suite.addTestSuite(StandardXYLabelGeneratorTests.class);

--- StandardPieItemLabelGeneratorTests.java DELETED ---

[Jfreechart-commit] jfreechart/source/org/jfree/chart/labels PieSectionLabelGenerator.java,1.3,1.4 StandardPieSectionLabelGenerator.java,1.4,1.5

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13931/source/org/jfree/chart/labels

Modified Files:
	PieSectionLabelGenerator.java 
	StandardPieSectionLabelGenerator.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/labels/PieSectionLabelGenerator.java
	(generateAttributedSectionLabel): new method,
	* source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java
	(attributedLabels): new private field,
	(StandardPieSectionLabelGenerator(String, NumberFormat, NumberFormat)):
	initialise attributeLabels field,
	(getAttributedLabel): new method,
	(setAttributedLabel): new method,
	(generateAttributedSectionLabel): new method,
	(generateToolTip): removed.



Index: PieSectionLabelGenerator.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels/PieSectionLabelGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PieSectionLabelGenerator.java	8 Mar 2005 15:35:51 -0000	1.3
--- PieSectionLabelGenerator.java	27 Oct 2005 14:54:54 -0000	1.4
***************
*** 27,31 ****
   * PieSectionLabelGenerator.java
   * -----------------------------
!  * (C) Copyright 2001-2004, by Object Refinery Limited.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
--- 27,31 ----
   * PieSectionLabelGenerator.java
   * -----------------------------
!  * (C) Copyright 2001-2005, by Object Refinery Limited.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
***************
*** 50,53 ****
--- 50,54 ----
   * 15-Apr-2004 : Moved generateToolTip() method into separate interface and 
   *               renamed this interface PieSectionLabelGenerator (DG);
+  * 29-Jul-2005 : Added method to generate label as an AttributedString (DG);
   *
   */
***************
*** 55,58 ****
--- 56,64 ----
  package org.jfree.chart.labels;
  
+ import java.awt.Font;
+ import java.awt.Paint;
+ import java.awt.font.TextAttribute;
+ import java.text.AttributedString;
+ 
  import org.jfree.data.general.PieDataset;
  
***************
*** 73,75 ****
--- 79,111 ----
      public String generateSectionLabel(PieDataset dataset, Comparable key);
          
+     /**
+      * Generates an attributed label for the specified series, or 
+      * <code>null</code> if no attributed label is available (in which case,
+      * the string returned by 
+      * {@link #generateSectionLabel(PieDataset, Comparable)} will 
+      * provide the fallback).  Only certain attributes are recognised by the 
+      * code that ultimately displays the labels: 
+      * <ul>
+      * <li>{@link TextAttribute#FONT}: will set the font;</li>
+      * <li>{@link TextAttribute#POSTURE}: a value of 
+      *     {@link TextAttribute#POSTURE_OBLIQUE} will add {@link Font#ITALIC} to
+      *     the current font;</li>
+      * <li>{@link TextAttribute#WEIGHT}: a value of 
+      *     {@link TextAttribute#WEIGHT_BOLD} will add {@link Font#BOLD} to the 
+      *     current font;</li>
+      * <li>{@link TextAttribute#FOREGROUND}: this will set the {@link Paint} 
+      *     for the current</li>
+      * <li>{@link TextAttribute#SUPERSCRIPT}: the values 
+      *     {@link TextAttribute#SUPERSCRIPT_SUB} and 
+      *     {@link TextAttribute#SUPERSCRIPT_SUPER} are recognised.</li> 
+      * </ul>
+      * 
+      * @param dataset  the dataset.
+      * @param key  the key.
+      * 
+      * @return An attributed label (possibly <code>null</code>).
+      */
+     public AttributedString generateAttributedSectionLabel(PieDataset dataset, 
+                                                            Comparable key);
+ 
  }
\ No newline at end of file

Index: StandardPieSectionLabelGenerator.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StandardPieSectionLabelGenerator.java	19 May 2005 15:42:59 -0000	1.4
--- StandardPieSectionLabelGenerator.java	27 Oct 2005 14:54:54 -0000	1.5
***************
*** 37,40 ****
--- 37,41 ----
   * -------
   * 09-Nov-2004 : Version 1, derived from StandardPieItemLabelGenerator (DG);
+  * 29-Jul-2005 : Removed unused generateToolTip() method (DG);
   * 
   */
***************
*** 42,49 ****
--- 43,55 ----
  package org.jfree.chart.labels;
  
+ import java.awt.Font;
+ import java.awt.Paint;
+ import java.awt.font.TextAttribute;
  import java.io.Serializable;
+ import java.text.AttributedString;
  import java.text.NumberFormat;
  
  import org.jfree.data.general.PieDataset;
+ import org.jfree.util.ObjectList;
  
  /**
***************
*** 66,77 ****
      public static final String DEFAULT_SECTION_LABEL_FORMAT = "{0} = {1}";
  
      /**
       * Creates an item label generator using default number formatters.
       */
      public StandardPieSectionLabelGenerator() {
!         this(
!             "{0} = {1}", 
!             NumberFormat.getNumberInstance(), NumberFormat.getPercentInstance()
!         );
      }
  
--- 72,86 ----
      public static final String DEFAULT_SECTION_LABEL_FORMAT = "{0} = {1}";
  
+     /** 
+      * An optional list of attributed labels (instances of AttributedString). 
+      */
+     private ObjectList attributedLabels;
+ 
      /**
       * Creates an item label generator using default number formatters.
       */
      public StandardPieSectionLabelGenerator() {
!         this("{0} = {1}", NumberFormat.getNumberInstance(), 
!                 NumberFormat.getPercentInstance());
      }
  
***************
*** 82,89 ****
       */
      public StandardPieSectionLabelGenerator(String labelFormat) {
!         this(
!             labelFormat, NumberFormat.getNumberInstance(), 
!             NumberFormat.getPercentInstance()
!         );   
      }
      
--- 91,96 ----
       */
      public StandardPieSectionLabelGenerator(String labelFormat) {
!         this(labelFormat, NumberFormat.getNumberInstance(), 
!                 NumberFormat.getPercentInstance());   
      }
      
***************
*** 103,110 ****
--- 110,140 ----
  
          super(labelFormat, numberFormat, percentFormat);
+         this.attributedLabels = new ObjectList();
  
      }
  
      /**
+      * Returns the attributed label for a series, or <code>null</code> if none
+      * is defined.
+      * 
+      * @param series  the series index.
+      * 
+      * @return The attributed label.
+      */
+     public AttributedString getAttributedLabel(int series) {
+         return (AttributedString) this.attributedLabels.get(series);    
+     }
+     
+     /**
+      * Sets the attributed label for a series.
+      * 
+      * @param series  the series index.
+      * @param label  the label (<code>null</code> permitted).
+      */
+     public void setAttributedLabel(int series, AttributedString label) {
+         this.attributedLabels.set(series, label);
+     }
+     
+     /**
       * Generates a label for a pie section.
       * 
***************
*** 119,131 ****
  
      /**
!      * Generates a tool tip text item for one section in a pie chart.
!      *
       * @param dataset  the dataset (<code>null</code> not permitted).
!      * @param key  the section key (<code>null</code> not permitted).
!      *
!      * @return The tool tip text (possibly <code>null</code>).
       */
!     public String generateToolTip(PieDataset dataset, Comparable key) {
!         return super.generateSectionLabel(dataset, key);
      }
  
--- 149,181 ----
  
      /**
!      * Generates an attributed label for the specified series, or 
!      * <code>null</code> if no attributed label is available (in which case,
!      * the string returned by 
!      * {@link #generateSectionLabel(PieDataset, Comparable)} will 
!      * provide the fallback).  Only certain attributes are recognised by the 
!      * code that ultimately displays the labels: 
!      * <ul>
!      * <li>{@link TextAttribute#FONT}: will set the font;</li>
!      * <li>{@link TextAttribute#POSTURE}: a value of 
!      *     {@link TextAttribute#POSTURE_OBLIQUE} will add {@link Font#ITALIC} to
!      *     the current font;</li>
!      * <li>{@link TextAttribute#WEIGHT}: a value of 
!      *     {@link TextAttribute#WEIGHT_BOLD} will add {@link Font#BOLD} to the 
!      *     current font;</li>
!      * <li>{@link TextAttribute#FOREGROUND}: this will set the {@link Paint} 
!      *     for the current</li>
!      * <li>{@link TextAttribute#SUPERSCRIPT}: the values 
!      *     {@link TextAttribute#SUPERSCRIPT_SUB} and 
!      *     {@link TextAttribute#SUPERSCRIPT_SUPER} are recognised.</li> 
!      * </ul>
!      * 
       * @param dataset  the dataset (<code>null</code> not permitted).
!      * @param key  the key.
!      * 
!      * @return An attributed label (possibly <code>null</code>).
       */
!     public AttributedString generateAttributedSectionLabel(PieDataset dataset, 
!                                                            Comparable key) {
!         return getAttributedLabel(dataset.getIndex(key));
      }
  

[Jfreechart-commit] jfreechart ChangeLog,1.18,1.19

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13931

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/labels/PieSectionLabelGenerator.java
	(generateAttributedSectionLabel): new method,
	* source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java
	(attributedLabels): new private field,
	(StandardPieSectionLabelGenerator(String, NumberFormat, NumberFormat)):
	initialise attributeLabels field,
	(getAttributedLabel): new method,
	(setAttributedLabel): new method,
	(generateAttributedSectionLabel): new method,
	(generateToolTip): removed.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog	27 Oct 2005 14:14:36 -0000	1.18
--- ChangeLog	27 Oct 2005 14:54:54 -0000	1.19
***************
*** 1,4 ****
--- 1,17 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/labels/PieSectionLabelGenerator.java
+ 	(generateAttributedSectionLabel): new method,
+ 	* source/org/jfree/chart/labels/StandardPieSectionLabelGenerator.java
+ 	(attributedLabels): new private field,
+ 	(StandardPieSectionLabelGenerator(String, NumberFormat, NumberFormat)):
+ 	initialise attributeLabels field,
+ 	(getAttributedLabel): new method,
+ 	(setAttributedLabel): new method,
+ 	(generateAttributedSectionLabel): new method,
+ 	(generateToolTip): removed.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/axis/SymbolicTickUnit.java: removed this
  	class as it is no longer used.

[Jfreechart-commit] jfreechart/source/org/jfree/chart/labels StandardXYSeriesLabelGenerator.java,1.7,1.8

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12820/source/org/jfree/chart/labels

Modified Files:
	StandardXYSeriesLabelGenerator.java 
Log Message:
Added API docs.

Index: StandardXYSeriesLabelGenerator.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/labels/StandardXYSeriesLabelGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StandardXYSeriesLabelGenerator.java	1 Jul 2005 14:37:17 -0000	1.7
--- StandardXYSeriesLabelGenerator.java	27 Oct 2005 14:48:40 -0000	1.8
***************
*** 109,112 ****
--- 109,118 ----
      }
      
+     /**
+      * Sets the attributed label for a series.
+      * 
+      * @param series  the series index.
+      * @param label  the label (<code>null</code> permitted).
+      */
      public void setAttributedLabel(int series, AttributedString label) {
          this.attributedLabels.set(series, label);

[Jfreechart-commit] jfreechart/source/org/jfree/chart/axis SymbolicTickUnit.java,1.4,NONE

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3530/source/org/jfree/chart/axis

Removed Files:
	SymbolicTickUnit.java 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/axis/SymbolicTickUnit.java: removed this
	class as it is no longer used.
----------------------------------------------------------------------


--- SymbolicTickUnit.java DELETED ---

[Jfreechart-commit] jfreechart ChangeLog,1.17,1.18

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3530

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/axis/SymbolicTickUnit.java: removed this
	class as it is no longer used.
----------------------------------------------------------------------


Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog	27 Oct 2005 14:04:25 -0000	1.17
--- ChangeLog	27 Oct 2005 14:14:36 -0000	1.18
***************
*** 1,4 ****
--- 1,9 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/axis/SymbolicTickUnit.java: removed this
+ 	class as it is no longer used.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/axis/SymbolicAxis.java: removed this file, it
  	has been renamed SymbolAxis.java.

[Jfreechart-commit] jfreechart/source/org/jfree/chart/axis TickUnit.java,1.4,1.5

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

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3018/source/org/jfree/chart/axis

Modified Files:
	TickUnit.java 
Log Message:
Added API docs.

Index: TickUnit.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis/TickUnit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TickUnit.java	3 Sep 2005 09:02:30 -0000	1.4
--- TickUnit.java	27 Oct 2005 14:12:16 -0000	1.5
***************
*** 27,31 ****
   * TickUnit.java
   * -------------
!  * (C) Copyright 2001-2004, by Object Refinery Limited.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
--- 27,31 ----
   * TickUnit.java
   * -------------
!  * (C) Copyright 2001-2005, by Object Refinery Limited.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
***************
*** 41,44 ****
--- 41,45 ----
   * 08-Nov-2002 : Moved to new package com.jrefinery.chart.axis (DG);
   * 26-Mar-2003 : Implemented Serializable (DG);
+  * 05-Sep-2005 : Implemented hashCode(), thanks to Thomas Morgner (DG);
   *
   */
***************
*** 151,154 ****
--- 152,160 ----
      }
  
+     /**
+      * Returns a hash code for this instance.
+      * 
+      * @return A hash code.
+      */
      public int hashCode() {
          final long temp = size != +0.0d ? Double.doubleToLongBits(size) : 0L;

[Jfreechart-commit] jfreechart ChangeLog,1.16,1.17

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

Update of /cvsroot/jfreechart/jfreechart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv879

Modified Files:
	ChangeLog 
Log Message:
27-10-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/axis/SymbolicAxis.java: removed this file, it
	has been renamed SymbolAxis.java.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ChangeLog	27 Oct 2005 13:44:37 -0000	1.16
--- ChangeLog	27 Oct 2005 14:04:25 -0000	1.17
***************
*** 1,4 ****
--- 1,9 ----
  27-10-2005  David Gilbert  <dav...@ob...>
  
+ 	* source/org/jfree/chart/axis/SymbolicAxis.java: removed this file, it
+ 	has been renamed SymbolAxis.java.
+ 
+ 27-10-2005  David Gilbert  <dav...@ob...>
+ 
  	* source/org/jfree/chart/axis/NumberTickUnit.java
  	(NumberTickUnit): change NullPointerException to