[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/model FactCost.java, 1.3, 1.4 Cost.java, 1.2, 1.3

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

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

Modified Files:
	FactCost.java Cost.java 
Log Message:
Feature: Cost#baseOffset, #expendable

Index: Cost.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Cost.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Cost.java	28 Dec 2005 11:52:30 -0000	1.2
--- Cost.java	18 May 2008 14:55:35 -0000	1.3
***************
*** 5,9 ****
  import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor;
  /**
!  * Effective calcuable Cost-Parameters.
   * @author generated by the umleditor
   */
--- 5,9 ----
  import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor;
  /**
!  * Effective calculateable Cost-Parameters.
   * @author generated by the umleditor
   */
***************
*** 66,86 ****
        firePropertyChange("cause", oldValue, fieldCause);
    }
- private org.tcotool.model.CostType fieldType;
-   /**
-    * @deprecated (replaced by CostCause
-    */
- public org.tcotool.model.CostType getType() {
-     refresh(false); // read lazy initialized objects
-     return fieldType;
- }
-   /**
-    * @deprecated (replaced by CostCause
-    */
- public void setType(org.tcotool.model.CostType type){
-     org.tcotool.model.CostType oldValue=fieldType;
-     fieldType=type;
-     firePropertyChange("type", oldValue, fieldType);
- }
- 
    private java.lang.Long fieldDriverId;
    public java.lang.Long getDriverId() {
--- 66,69 ----
***************
*** 95,98 ****
--- 78,82 ----
    public static DbDescriptor createDescriptor() {
      DbDescriptor descriptor = new DbDescriptor(Cost.class);
+     descriptor.add("baseOffset","baseOffset",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(1,1));
      descriptor.add("amount","amount",new DbNumericFieldDescriptor(java.lang.Double.class,0.0,9.99999999999E11,2),new DbMultiplicityRange(1,1));
      descriptor.addCode("currency", "currency", new DbMultiplicityRange(1,1));
***************
*** 100,107 ****
      descriptor.add("repeatable","repeatable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1));
      descriptor.addCode("cause", "cause", new DbMultiplicityRange(0,1));
! //TODO @deprecated CostType
! descriptor.addCode("type", "type", new DbMultiplicityRange(0,1));
      descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "driverId", "T_Id_driver", new DbMultiplicityRange(1,1));
      return descriptor;
    }
  }
--- 84,105 ----
      descriptor.add("repeatable","repeatable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1));
      descriptor.addCode("cause", "cause", new DbMultiplicityRange(0,1));
! //descriptor.addCode("type", "type", new DbMultiplicityRange(0,1));
      descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "driverId", "T_Id_driver", new DbMultiplicityRange(1,1));
      return descriptor;
    }
+   
+     private java.lang.Long fieldBaseOffset;
+     public java.lang.Long getBaseOffset() {
+         return fieldBaseOffset;
+     }
+     /**
+      * Offset of cost impact from the very beginning of the whole
+      * TCO-Configuration in months.
+      * @param fieldBaseOffset
+      */
+     public void setBaseOffset(java.lang.Long baseOffset) {
+         java.lang.Long oldValue=fieldBaseOffset;
+         fieldBaseOffset=baseOffset;
+         firePropertyChange("baseOffset", oldValue, fieldBaseOffset);
+     }
  }

Index: FactCost.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/FactCost.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FactCost.java	18 Mar 2006 17:08:28 -0000	1.3
--- FactCost.java	18 May 2008 14:55:35 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  
  import ch.softenvironment.jomm.descriptor.DbDescriptor;
+ import ch.softenvironment.jomm.descriptor.DbFieldTypeDescriptor;
  import ch.softenvironment.jomm.descriptor.DbMultiplicityRange;
  import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor;
***************
*** 23,26 ****
--- 24,29 ----
      descriptor.add("depreciationDuration","depreciationDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(1,1));
      descriptor.add("usageDuration","usageDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(1,1));
+     descriptor.add("expendable","expendable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1));
+ //TODO @deprecated    
  descriptor.add("serialNumber","serialNumber",new DbTextFieldDescriptor(20),new DbMultiplicityRange(0,1));
  descriptor.add("portsUseable","portsUseable",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(0,1));
***************
*** 85,88 ****
--- 88,95 ----
  	firePropertyChange("catalogue", oldValue, catalogue);
  }
+   /**
+    * Time of accountancy depreciation time in months.
+    * @param depreciationDuration
+    */
    public void setDepreciationDuration(java.lang.Long depreciationDuration){
      java.lang.Long oldValue=fieldDepreciationDuration;
***************
*** 122,125 ****
--- 129,136 ----
      firePropertyChange("serialNumber", oldValue, fieldSerialNumber);
    }
+   /**
+    * Time of lifecycle in months.
+    * @param usageDuration
+    */
    public void setUsageDuration(java.lang.Long usageDuration){
      java.lang.Long oldValue=fieldUsageDuration;
***************
*** 127,129 ****
--- 138,153 ----
      firePropertyChange("usageDuration", oldValue, fieldUsageDuration);
    }
+   private Boolean fieldExpendable;
+   /**
+    * Define whether a thing is to be used as tool (for e.g. Computer)
+    * or "throw away material" like paper in a printre. (de "Verbrauchsmaterial").
+    */
+   public void setExpendable(Boolean expendable) {
+       Boolean oldValue = fieldExpendable;
+       fieldExpendable = expendable;
+       firePropertyChange("expendable", oldValue, expendable);
+   }
+   public Boolean getExpendable() {
+       return fieldExpendable;
+   }
  }
\ No newline at end of file