[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/standard/charts ChartTool.java,1.1.1.1,1.2 CostTypeBarChart.java,1.1.1.1,1.2 CostTypePieChart.java,1.1.1.1,1.2

[Hirzel P. <ph...@us...>]

Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/src/org/tcotool/standard/charts

Modified Files:
	ChartTool.java CostTypeBarChart.java CostTypePieChart.java 
Log Message:
Refactoring: CostType replaced CostCause

Index: CostTypePieChart.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypePieChart.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CostTypePieChart.java	29 Aug 2005 09:41:14 -0000	1.1.1.1
--- CostTypePieChart.java	28 Dec 2005 11:52:57 -0000	1.2
***************
*** 30,37 ****
  import org.jfree.data.category.CategoryDataset;
  import org.jfree.util.TableOrder;
! import org.tcotool.model.CostType;
  import org.tcotool.model.TcoPackage;
  
  import ch.softenvironment.client.ResourceManager;
  
  /**
--- 30,39 ----
  import org.jfree.data.category.CategoryDataset;
  import org.jfree.util.TableOrder;
! import org.tcotool.model.CostCause;
  import org.tcotool.model.TcoPackage;
+ import org.tcotool.tools.ModelUtility;
  
  import ch.softenvironment.client.ResourceManager;
+ import ch.softenvironment.util.NlsUtils;
  
  /**
***************
*** 50,55 ****
       * @throws Throwable
       */
!     public JPanel createPieChartTcoCostType() throws Throwable {    
!     	CategoryDataset categorydataset = createTotalCostTypeDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostType.class)));
      	JFreeChart jfreechart = createChart(categorydataset);
      	ChartPanel chartpanel = new ChartPanel(jfreechart);
--- 52,57 ----
       * @throws Throwable
       */
!     public JPanel createPieChartTcoCostCause() throws Throwable {    
!     	CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class)));
      	JFreeChart jfreechart = createChart(categorydataset);
      	ChartPanel chartpanel = new ChartPanel(jfreechart);
***************
*** 64,68 ****
  	 */
      private JFreeChart createChart(CategoryDataset categorydataset) {
!     	JFreeChart jfreechart = ChartFactory.createMultiplePieChart(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"),
      			    						  categorydataset,
      			    						  TableOrder.BY_COLUMN, true,
--- 66,70 ----
  	 */
      private JFreeChart createChart(CategoryDataset categorydataset) {
!     	JFreeChart jfreechart = ChartFactory.createMultiplePieChart(NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)),
      			    						  categorydataset,
      			    						  TableOrder.BY_COLUMN, true,
***************
*** 84,86 ****
      	return jfreechart;
      }
! }
--- 86,88 ----
      	return jfreechart;
      }
! }
\ No newline at end of file

Index: ChartTool.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/ChartTool.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ChartTool.java	29 Aug 2005 09:41:13 -0000	1.1.1.1
--- ChartTool.java	28 Dec 2005 11:52:57 -0000	1.2
***************
*** 27,31 ****
  import org.tcotool.standard.report.ReportTool;
  import org.tcotool.tools.Calculator;
! import org.tcotool.model.CostType;
  import org.tcotool.model.TcoPackage;
  
--- 27,31 ----
  import org.tcotool.standard.report.ReportTool;
  import org.tcotool.tools.Calculator;
! import org.tcotool.model.CostCause;
  import org.tcotool.model.TcoPackage;
  
***************
*** 78,95 ****
       * @throws Throwable
       */
!     protected CategoryDataset createTotalCostTypeDataset(java.util.Map costTypes) throws Throwable {
!         DefaultCategoryDataset defaultcategorydataset = new DefaultCategoryDataset();
          
          DbObjectServer server = ((DbObject)LauncherView.getInstance().getUtility().getRoot()).getObjectServer();
!         Iterator types = server.retrieveCodes(CostType.class).iterator();
!         while (types.hasNext()) {
!             DbCodeType code = (DbCodeType)types.next();
!             java.util.List amounts = (java.util.List)costTypes.get(((DbObject)code).getId());
              for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) {
!                 defaultcategorydataset.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear"));
              }
          }
  
! 		return defaultcategorydataset;
      }
  }
--- 78,95 ----
       * @throws Throwable
       */
!     protected CategoryDataset createTotalCostCauseDataset(java.util.Map causes) throws Throwable {
!         DefaultCategoryDataset set = new DefaultCategoryDataset();
          
          DbObjectServer server = ((DbObject)LauncherView.getInstance().getUtility().getRoot()).getObjectServer();
!         Iterator it = server.retrieveCodes(CostCause.class).iterator();
!         while (it.hasNext()) {
!             DbCodeType code = (DbCodeType)it.next();
!             java.util.List amounts = (java.util.List)causes.get(((DbObject)code).getId());
              for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) {
!                 set.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear"));
              }
          }
  
! 		return set;
      }
  }

Index: CostTypeBarChart.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypeBarChart.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CostTypeBarChart.java	29 Aug 2005 09:41:13 -0000	1.1.1.1
--- CostTypeBarChart.java	28 Dec 2005 11:52:57 -0000	1.2
***************
*** 34,41 ****
  import org.tcotool.application.FactCostDetailView;
  import org.tcotool.application.LauncherView;
! import org.tcotool.model.CostType;
  import org.tcotool.model.TcoPackage;
  
  import ch.softenvironment.client.ResourceManager;
  
  /**
--- 34,43 ----
  import org.tcotool.application.FactCostDetailView;
  import org.tcotool.application.LauncherView;
! import org.tcotool.model.CostCause;
  import org.tcotool.model.TcoPackage;
+ import org.tcotool.tools.ModelUtility;
  
  import ch.softenvironment.client.ResourceManager;
+ import ch.softenvironment.util.NlsUtils;
  
  /**
***************
*** 90,96 ****
       * @throws Throwable
       */
!     public JPanel createBarChartTcoCostType() throws Throwable {
!     	CategoryDataset categorydataset = createTotalCostTypeDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostType.class)));
!     	JFreeChart jfreechart = createChart(categorydataset, ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString());
      	ChartPanel chart = new ChartPanel(jfreechart);
      	chart.setPreferredSize(new Dimension(500, 270));
--- 92,98 ----
       * @throws Throwable
       */
!     public JPanel createBarChartTcoCostCause() throws Throwable {
!     	CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class)));
!     	JFreeChart jfreechart = createChart(categorydataset, NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString());
      	ChartPanel chart = new ChartPanel(jfreechart);
      	chart.setPreferredSize(new Dimension(500, 270));