[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/standard/report ReportInvestment.java, 1.4, 1.5 ReportTco.java, 1.5, 1.6 ReportStaff.java, 1.5, 1.6

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

Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32091/src/org/tcotool/standard/report

Modified Files:
	ReportInvestment.java ReportTco.java ReportStaff.java 
Log Message:
Refactoring: JOMM API (DbComparatorType removed)

Index: ReportInvestment.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportInvestment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReportInvestment.java	29 Jun 2006 22:50:05 -0000	1.4
--- ReportInvestment.java	19 Jun 2007 07:03:57 -0000	1.5
***************
*** 27,32 ****
  
  import ch.softenvironment.client.ResourceManager;
! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
  import ch.softenvironment.util.Tracer;
  
--- 27,33 ----
  
  import ch.softenvironment.client.ResourceManager;
! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
+ import ch.softenvironment.util.ListUtils;
  import ch.softenvironment.util.Tracer;
  
***************
*** 85,89 ****
          // print data by CostType
      	try {
!     	    Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());
--- 86,90 ----
          // print data by CostType
      	try {
!     	    Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());

Index: ReportTco.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTco.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReportTco.java	29 Jun 2006 22:50:05 -0000	1.5
--- ReportTco.java	19 Jun 2007 07:03:57 -0000	1.6
***************
*** 22,27 ****
  import org.tcotool.application.*;
  
! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
  import ch.softenvironment.util.NlsUtils;
  import ch.softenvironment.util.Tracer;
--- 22,28 ----
  import org.tcotool.application.*;
  
! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
+ import ch.softenvironment.util.ListUtils;
  import ch.softenvironment.util.NlsUtils;
  import ch.softenvironment.util.Tracer;
***************
*** 84,88 ****
          // print data by CostType
      	try {
!     	    Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());
--- 85,89 ----
          // print data by CostType
      	try {
!     	    Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());

Index: ReportStaff.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportStaff.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReportStaff.java	13 Jun 2007 20:17:33 -0000	1.5
--- ReportStaff.java	19 Jun 2007 07:03:57 -0000	1.6
***************
*** 24,29 ****
  import org.tcotool.application.*;
  
! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
  import ch.softenvironment.util.NlsUtils;
  import ch.softenvironment.util.StringUtils;
--- 24,30 ----
  import org.tcotool.application.*;
  
! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator;
  import ch.softenvironment.jomm.mvc.model.DbObject;
+ import ch.softenvironment.util.ListUtils;
  import ch.softenvironment.util.NlsUtils;
  import ch.softenvironment.util.StringUtils;
***************
*** 157,161 ****
          // print data by CostType
      	try {
!     	    Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());
--- 158,162 ----
          // print data by CostType
      	try {
!     	    Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator();
      	    while (types.hasNext()) {
      	        encodeCostBlockColumns(root, types.next());