diff -urN ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/output/CPAPage.java src/net/sf/statcvs/output/CPAPage.java
--- ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/output/CPAPage.java	2003-12-18 01:32:04.000000000 +0000
+++ src/net/sf/statcvs/output/CPAPage.java	2005-12-07 10:21:20.000000000 +0000
@@ -29,8 +29,8 @@
 import net.sf.statcvs.model.CvsContent;
 import net.sf.statcvs.renderer.TableRenderer;
 import net.sf.statcvs.reportmodel.Table;
-import net.sf.statcvs.reports.AuthorsTableReport;
 import net.sf.statcvs.reports.AbstractLocTableReport;
+import net.sf.statcvs.reports.AuthorsTableReport;
 import net.sf.statcvs.reports.TableReport;
 
 /**
diff -urN ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/Chart.java src/net/sf/statcvs/renderer/Chart.java
--- ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/Chart.java	2004-10-12 09:23:18.000000000 +0100
+++ src/net/sf/statcvs/renderer/Chart.java	2005-12-07 10:24:08.000000000 +0000
@@ -24,6 +24,8 @@
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -33,7 +35,10 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.title.TextTitle;
-import org.jfree.ui.Spacer;
+import org.jfree.ui.RectangleInsets;
+import org.jfree.util.UnitType;
+
+import test.CairoImage;
 
 /**
  * superclass of all charts
@@ -88,24 +93,30 @@
 	 * @param imageHeight image height
 	 */
 	public void saveChart(int imageWidth, int imageHeight) {
-		try {
-			ChartUtilities.saveChartAsPNG(
-				new File(ConfigurationOptions.getOutputDir() + fileName),
-				chart,
-				imageWidth,
-				imageHeight);
+//		try {
+            
+            CairoImage image = new CairoImage(imageWidth, imageHeight);
+            Graphics2D g2 = image.createGraphics2D();
+            chart.draw(g2, new Rectangle2D.Double(0, 0, imageWidth, imageHeight));
+            image.saveToPNG(new File(ConfigurationOptions.getOutputDir() + fileName));
+//			ChartUtilities.saveChartAsPNG(
+//				new File(ConfigurationOptions.getOutputDir() + fileName),
+//				chart,
+//				imageWidth,
+//				imageHeight);
 			logger.fine("saved chart '" + title + "' as '" + fileName + "'");
-		} catch (IOException e) {
-			logger.warning(
-				"Could not save Chart as png Image: "
-					+ fileName
-					+ e.toString());
-		}
+//		} catch (IOException e) {
+//			logger.warning(
+//				"Could not save Chart as png Image: "
+//					+ fileName
+//					+ e.toString());
+//		}
 	}
 
 	private void addTitles() {
 		TextTitle title2 = new TextTitle(title, font);
-		title2.setSpacer(new Spacer(Spacer.RELATIVE, 0.05, 0.05, 0.05, 0.0));
+        title2.setMargin(new RectangleInsets(UnitType.RELATIVE, 0.05, 0.05, 
+                0.05, 0.0));
 		chart.addSubtitle(title2);
 	}
 	
diff -urN ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/LOCChart.java src/net/sf/statcvs/renderer/LOCChart.java
--- ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/LOCChart.java	2004-10-12 09:23:18.000000000 +0100
+++ src/net/sf/statcvs/renderer/LOCChart.java	2005-12-07 10:07:14.000000000 +0000
@@ -96,7 +96,7 @@
 		while (it.hasNext()) {
 			TimeSeries series = (TimeSeries) it.next();
 			collection.addSeries(series);
-			colors[i] = OutputUtils.getStringColor(series.getName()); 
+			colors[i] = OutputUtils.getStringColor(series.getKey().toString()); 
 			i++;
 		}
 		createLOCChart(collection, colors, title);
diff -urN ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/StackedBarChart.java src/net/sf/statcvs/renderer/StackedBarChart.java
--- ../../statcvs-clean/statcvs-0.2.2/src/net/sf/statcvs/renderer/StackedBarChart.java	2004-10-12 09:23:18.000000000 +0100
+++ src/net/sf/statcvs/renderer/StackedBarChart.java	2005-12-07 10:08:01.000000000 +0000
@@ -37,13 +37,14 @@
 import net.sf.statcvs.output.ConfigurationOptions;
 
 import org.jfree.chart.ChartFactory;
-import org.jfree.chart.Legend;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.NumberTickUnit;
 import org.jfree.chart.plot.CategoryPlot;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.renderer.category.CategoryItemRenderer;
+import org.jfree.chart.title.LegendTitle;
 import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.ui.RectangleEdge;
 
 /**
  * Class for producing stacked bar charts
@@ -150,8 +151,8 @@
 		rangeAxis.setTickUnit(new NumberTickUnit(20.0, new DecimalFormat("0")));
 		rangeAxis.setUpperBound(100.0);
 		
-		Legend legend = getChart().getLegend();
-		legend.setAnchor(Legend.NORTH);
+		LegendTitle legend = getChart().getLegend();
+		legend.setPosition(RectangleEdge.TOP);
 		
 		createChart();
 		saveChart(450, 19 * content.getAuthors().size() + 110, "activity.png");