tcotool-cvs

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

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

Modified Files:
	CatalogueDetailView.java 
Log Message:
Feature: Catalogue#expendable

Index: CatalogueDetailView.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CatalogueDetailView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CatalogueDetailView.java	13 Jun 2007 20:13:56 -0000	1.5
--- CatalogueDetailView.java	18 May 2008 14:47:21 -0000	1.6
***************
*** 1469,1473 ****
  		}
  		
!         JComboBoxUtility.initComboBox(getCbxCurrency(), ((Catalogue)object).getObjectServer().retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator());
          
  		if (((Catalogue)object).getPersistencyState().isNew()) {
--- 1469,1473 ----
  		}
  		
!         JComboBoxUtility.initComboBox(getCbxCurrency(), ((Catalogue)object).getObjectServer().retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale()));
          
  		if (((Catalogue)object).getPersistencyState().isNew()) {
***************
*** 1479,1483 ****
              ((Catalogue)object).setUsageDuration(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultUsageDuration());
  		}
!         
          if (((Catalogue)object).getExpendable().booleanValue()) {
              // @see #updateModel()
--- 1479,1483 ----
              ((Catalogue)object).setUsageDuration(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultUsageDuration());
  		}
! /*        
          if (((Catalogue)object).getExpendable().booleanValue()) {
              // @see #updateModel()
***************
*** 1485,1489 ****
              getTxtDepreciation().setEditable(false);
          }
! 		
  		setObject((org.tcotool.model.Catalogue)object);
          initialName = getObject().getNameString();
--- 1485,1489 ----
              getTxtDepreciation().setEditable(false);
          }
! */		
  		setObject((org.tcotool.model.Catalogue)object);
          initialName = getObject().getNameString();
***************
*** 1570,1574 ****
                      evt.getPropertyName().equals("usageDuration") || evt.getPropertyName().equals("depreciationDuration") ||
                      evt.getPropertyName().equals("expendable")) {
!                 if (evt.getPropertyName().equals("expendable")) {
                      if (getObject().getExpendable().booleanValue()) {
                          // fix duration to one year
--- 1570,1575 ----
                      evt.getPropertyName().equals("usageDuration") || evt.getPropertyName().equals("depreciationDuration") ||
                      evt.getPropertyName().equals("expendable")) {
! /*                
! 				if (evt.getPropertyName().equals("expendable")) {
                      if (getObject().getExpendable().booleanValue()) {
                          // fix duration to one year
***************
*** 1582,1585 ****
--- 1583,1587 ----
                      }
                  }
+ */                
                  // @see #treatFactCost()
                  TreeTool treeTool = new TreeTool(this);