[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/tools ModelUtility.java, 1.10, 1.11 Calculator.java, 1.5, 1.6

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

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

Modified Files:
	ModelUtility.java Calculator.java 
Log Message:
Release V1.4.4

Index: ModelUtility.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ModelUtility.java	29 Jun 2006 22:50:05 -0000	1.10
--- ModelUtility.java	13 Jun 2007 20:17:33 -0000	1.11
***************
*** 766,770 ****
  public java.lang.String getToolTip(java.lang.Object node) {
  //	return ch.softenvironment.util.StringUtils.getPureClassName(node);
! 	return ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text", false) + " = " + ((TcoObject)node).getMultitude();
  }
  /**
--- 766,770 ----
  public java.lang.String getToolTip(java.lang.Object node) {
  //	return ch.softenvironment.util.StringUtils.getPureClassName(node);
! 	return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblMultitude_text") + " = " + ((TcoObject)node).getMultitude();
  }
  /**
***************
*** 787,814 ****
      // DbEnumeration's
      } else if (type.equals(CostCause.class)) {
!         return ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false);
      // DbCode's
  	} else if (type.equals(ServiceCategory.class)) {
  //TODO HACK
  //return "Clinical Symptom";
!         return ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false);
      } else if (type.equals(Responsibility.class)) {
!         return ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false);
      } else if (type.equals(CostCentre.class)) {
!         return ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false);
      } else if (type.equals(Process.class)) {
!         return ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text", false);
      } else if (type.equals(ProjectPhase.class)) {
!         return ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false);
      } else if (type.equals(LifeCycle.class)) {
!         return ResourceManager.getResource(CostDriverDetailView.class, "LblCycle_text", false);
      } else if (type.equals(Site.class)) {
!         return ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false);
      } else if (type.equals(Catalogue.class)) {
!         return ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false);
      } else if (type.equals(Role.class)) {
!         return ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false);
      } else if (type.equals(Activity.class)) {
!         return ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false);
      }
  Tracer.getInstance().developerWarning("String for type: " + type);
--- 787,814 ----
      // DbEnumeration's
      } else if (type.equals(CostCause.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "TbcCosttype_text");
      // DbCode's
  	} else if (type.equals(ServiceCategory.class)) {
  //TODO HACK
  //return "Clinical Symptom";
!         return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblCategory_text");
      } else if (type.equals(Responsibility.class)) {
!         return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblResponsibility_text");
      } else if (type.equals(CostCentre.class)) {
!         return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblCostCentre_text");
      } else if (type.equals(Process.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblProcess_text");
      } else if (type.equals(ProjectPhase.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblPhase_text");
      } else if (type.equals(LifeCycle.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblCycle_text");
      } else if (type.equals(Site.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblSite_text");
      } else if (type.equals(Catalogue.class)) {
!         return ResourceManager.getResourceAsNonLabeled(CatalogueDetailView.class, "FrmWindow_text");
      } else if (type.equals(Role.class)) {
!         return ResourceManager.getResourceAsNonLabeled(RoleDetailView.class, "FrmWindow_text");
      } else if (type.equals(Activity.class)) {
!         return ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text");
      }
  Tracer.getInstance().developerWarning("String for type: " + type);

Index: Calculator.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/Calculator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Calculator.java	29 Jun 2006 22:50:05 -0000	1.5
--- Calculator.java	13 Jun 2007 20:17:33 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  import ch.softenvironment.jomm.mvc.model.DbCodeType;
  import ch.softenvironment.jomm.mvc.model.DbObject;
+ import ch.softenvironment.math.MathUtils;
  import ch.softenvironment.util.AmountFormat;
  import ch.softenvironment.util.DeveloperException;