From: Hirzel P. <ph...@us...> - 2007-06-13 20:16:38
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28100/src/org/tcotool/standard/charts Modified Files: ChartTool.java Log Message: Release V1.4.4 Index: ChartTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/ChartTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChartTool.java 18 Mar 2006 17:10:45 -0000 1.4 --- ChartTool.java 13 Jun 2007 20:16:39 -0000 1.5 *************** *** 29,37 **** import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; ! import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; ! import org.jfree.chart.labels.StandardPieItemLabelGenerator; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.MultiplePiePlot; --- 29,38 ---- import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; ! //import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; ! //import org.jfree.chart.labels.StandardPieItemLabelGenerator; ! import org.jfree.chart.labels.StandardPieSectionLabelGenerator; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.MultiplePiePlot; *************** *** 49,55 **** import org.tcotool.tools.Calculator; import org.tcotool.tools.ModelUtility; - import org.tcotool.model.CostCause; - import org.tcotool.model.Responsibility; - import org.tcotool.model.ServiceCategory; import org.tcotool.model.TcoPackage; --- 50,53 ---- *************** *** 137,141 **** */ private JFreeChart createBarChart(CategoryDataset categorydataset, String title, String currency) { ! JFreeChart jfreechart = ChartFactory.createBarChart(title, ch.softenvironment.client.ResourceManager.getResource(FactCostDetailView.class, "LblUsageDuration_text", false), currency, categorydataset, PlotOrientation.VERTICAL, true, true, --- 135,139 ---- */ private JFreeChart createBarChart(CategoryDataset categorydataset, String title, String currency) { ! JFreeChart jfreechart = ChartFactory.createBarChart(title, ch.softenvironment.client.ResourceManager.getResourceAsNonLabeled(FactCostDetailView.class, "LblUsageDuration_text"), currency, categorydataset, PlotOrientation.VERTICAL, true, true, *************** *** 224,228 **** pieplot.setBackgroundPaint(null); pieplot.setOutlineStroke(null); ! pieplot.setLabelGenerator(new StandardPieItemLabelGenerator ("{0} ({2})", NumberFormat.getNumberInstance(), --- 222,226 ---- pieplot.setBackgroundPaint(null); pieplot.setOutlineStroke(null); ! pieplot.setLabelGenerator(new StandardPieSectionLabelGenerator// StandardPieItemLabelGenerator (in JFreeCharts V0.9.6) ("{0} ({2})", NumberFormat.getNumberInstance(), |