[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERPlot/Sources/er/plot ERPPieChart.java,1.6,1.7

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERPlot/Sources/er/plot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/Common/Frameworks/ERPlot/Sources/er/plot

Modified Files:
	ERPPieChart.java 
Log Message:
we area now accumulating pie chart data

Index: ERPPieChart.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERPlot/Sources/er/plot/ERPPieChart.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERPPieChart.java	21 Dec 2004 14:43:48 -0000	1.6
--- ERPPieChart.java	29 Dec 2004 10:22:50 -0000	1.7
***************
*** 45,48 ****
--- 45,67 ----
          
      /**
+      * Utility class to accomodate for accumulating data (the superclass can only replace values, 
+      * so it will always yield the latest one.)
+      * @author ak
+      */
+     public static class AccumulatingPieDataset extends DefaultPieDataset {
+         
+         /**
+          * Overridden so it adds the value to the current value for the key instead of replacing it.
+          */
+         public void setValue(Comparable key, Number value) {
+             Number oldValue = getValue(key);
+             if(oldValue != null) {
+                 value = new Double(value.doubleValue() + oldValue.doubleValue());
+             }
+             super.setValue(key, value);
+         }
+     }
+     
+     /**
       * Public constructor
       * @param context the context
***************
*** 69,74 ****
  
      protected Dataset createDataset() {
!         DefaultPieDataset dataset = new DefaultPieDataset();
!         for(Enumeration items = items().objectEnumerator(); items.hasMoreElements(); ) {
              Object item = items.nextElement();
              Comparable name = (Comparable)NSKeyValueCodingAdditions.Utility.valueForKeyPath(item, nameKey());
--- 88,93 ----
  
      protected Dataset createDataset() {
!         AccumulatingPieDataset dataset = new AccumulatingPieDataset();
!          for(Enumeration items = items().objectEnumerator(); items.hasMoreElements(); ) {
              Object item = items.nextElement();
              Comparable name = (Comparable)NSKeyValueCodingAdditions.Utility.valueForKeyPath(item, nameKey());