Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27659/src/org/tcotool/model Modified Files: CostType.java Branch.java CostCause.java CostCentre.java ProjectPhase.java Currency.java Process.java Activity.java Responsibility.java Catalogue.java ServiceCategory.java LifeCycle.java Role.java Site.java TcoObject.java CostExponent.java SupplierInfluence.java Added Files: ConfigurationTag.java Log Message: Release V1.4.4 Index: Catalogue.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Catalogue.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Catalogue.java 13 Jan 2006 17:41:20 -0000 1.3 --- Catalogue.java 13 Jun 2007 20:15:54 -0000 1.4 *************** *** 10,14 **** * @author generated by the umleditor */ ! public class Catalogue extends DbCode { public Catalogue(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 10,14 ---- * @author generated by the umleditor */ ! public final class Catalogue extends DbCode { public Catalogue(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: Branch.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Branch.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Branch.java 29 Aug 2005 09:41:07 -0000 1.1.1.1 --- Branch.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 5,9 **** * @author generated by the umleditor */ ! public class Branch extends DbEnumeration { public static final String INDUSTRY="Industry"; public static final String GOVERNMENT="Government"; --- 5,9 ---- * @author generated by the umleditor */ ! public final class Branch extends DbEnumeration { public static final String INDUSTRY="Industry"; public static final String GOVERNMENT="Government"; Index: CostType.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CostType.java 28 Dec 2005 11:52:30 -0000 1.2 --- CostType.java 13 Jun 2007 20:15:54 -0000 1.3 *************** *** 7,11 **** * @deprecated (replaced by CostCause) */ ! public class CostType extends DbEnumeration { public CostType(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 7,11 ---- * @deprecated (replaced by CostCause) */ ! public final class CostType extends DbEnumeration { public CostType(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: Role.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Role.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Role.java 18 Mar 2006 17:08:28 -0000 1.2 --- Role.java 13 Jun 2007 20:15:54 -0000 1.3 *************** *** 13,17 **** * @author generated by the umleditor */ ! public class Role extends DbCode { public java.lang.Boolean fieldInternal; // NOT NULL public java.lang.Long fieldYearlyHours; // NOT NULL --- 13,17 ---- * @author generated by the umleditor */ ! public final class Role extends DbCode { public java.lang.Boolean fieldInternal; // NOT NULL public java.lang.Long fieldYearlyHours; // NOT NULL Index: CostExponent.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostExponent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CostExponent.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- CostExponent.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 3,7 **** import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public class CostExponent extends DbEnumeration { public final static String ASIS = "AsIs"; public final static String INTHOUSAND = "InThousand"; --- 3,7 ---- import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public final class CostExponent extends DbEnumeration { public final static String ASIS = "AsIs"; public final static String INTHOUSAND = "InThousand"; Index: CostCentre.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostCentre.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CostCentre.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- CostCentre.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 2,6 **** import ch.softenvironment.jomm.mvc.model.DbCode; ! public class CostCentre extends DbCode { public CostCentre(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 2,6 ---- import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class CostCentre extends DbCode { public CostCentre(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: Process.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Process.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Process.java 29 Aug 2005 09:41:05 -0000 1.1.1.1 --- Process.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 2,6 **** import ch.softenvironment.jomm.mvc.model.DbCode; ! public class Process extends DbCode { public Process(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 2,6 ---- import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class Process extends DbCode { public Process(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: Site.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Site.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Site.java 29 Aug 2005 09:41:05 -0000 1.1.1.1 --- Site.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 11,15 **** * @author generated by the umleditor */ ! public class Site extends DbCode { private String fieldAddress; private ch.softenvironment.jomm.datatypes.interlis.IliCoord2d fieldCoordinates; --- 11,15 ---- * @author generated by the umleditor */ ! public final class Site extends DbCode { private String fieldAddress; private ch.softenvironment.jomm.datatypes.interlis.IliCoord2d fieldCoordinates; Index: TcoObject.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/TcoObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TcoObject.java 2 Oct 2005 11:23:47 -0000 1.2 --- TcoObject.java 13 Jun 2007 20:15:54 -0000 1.3 *************** *** 12,22 **** */ public abstract class TcoObject extends DbEntityBean { ! public String fieldName; // NOT NULL ! public String fieldDocumentation; ! public java.lang.Double fieldMultitude; // NOT NULL ! public java.util.Date fieldBaseDate; ! public java.util.List fieldClientId=new java.util.ArrayList(); ! public ImportReference fieldReference; ! public java.util.List fieldSupplierId=new java.util.ArrayList(); public TcoObject(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 12,23 ---- */ public abstract class TcoObject extends DbEntityBean { ! private String fieldName; // NOT NULL ! private String fieldDocumentation; ! private java.lang.Double fieldMultitude; // NOT NULL ! private java.util.Date fieldBaseDate; ! private java.util.List fieldClientId=new java.util.ArrayList(); ! private java.util.List fieldSupplierId=new java.util.ArrayList(); ! private java.util.List fieldTagId=new java.util.ArrayList(); ! public TcoObject(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); *************** *** 28,34 **** descriptor.add("multitude","multitude",new DbNumericFieldDescriptor(java.lang.Double.class,0.0,9999999.0,2),new DbMultiplicityRange(1,1)); descriptor.add("baseDate","baseDate",new DbDateFieldDescriptor(DbDateFieldDescriptor.DATE),new DbMultiplicityRange(0,1)); ! descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "clientId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Dependency.class, "supplierId"); ! descriptor.addOneToOne(DbDescriptor.COMPOSITION, "reference", "importerId", new DbMultiplicityRange(0,1), false); descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "supplierId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Dependency.class, "clientId"); return descriptor; } --- 29,35 ---- descriptor.add("multitude","multitude",new DbNumericFieldDescriptor(java.lang.Double.class,0.0,9999999.0,2),new DbMultiplicityRange(1,1)); descriptor.add("baseDate","baseDate",new DbDateFieldDescriptor(DbDateFieldDescriptor.DATE),new DbMultiplicityRange(0,1)); ! descriptor.addAssociationAttributed(DbDescriptor.AGGREGATION, "clientId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Dependency.class, "supplierId"); descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "supplierId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Dependency.class, "clientId"); + //TODO comparable configurations descriptor.addAssociationAttributed(DbDescriptor.AGGREGATION, "objectId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Configuration.class, "tagId"); return descriptor; } *************** *** 53,59 **** return fieldName; } ! public ImportReference getReference() { refresh(false); // read lazy initialized objects ! return fieldReference; } public java.util.List getSupplierId() { --- 54,60 ---- return fieldName; } ! public java.util.List getTag() { refresh(false); // read lazy initialized objects ! return fieldTagId; } public java.util.List getSupplierId() { *************** *** 86,93 **** firePropertyChange("name", oldValue, fieldName); } ! public void setReference(ImportReference reference) { ! ImportReference oldValue=fieldReference; ! fieldReference=reference; ! firePropertyChange("reference", oldValue, fieldReference); } public void setSupplierId(java.util.List supplier) { --- 87,94 ---- firePropertyChange("name", oldValue, fieldName); } ! public void setTag(java.util.List tag) { ! java.util.List oldValue=fieldTagId; ! fieldTagId=tag; ! firePropertyChange("tag", oldValue, fieldTagId); } public void setSupplierId(java.util.List supplier) { Index: SupplierInfluence.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/SupplierInfluence.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SupplierInfluence.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- SupplierInfluence.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 4,8 **** import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public class SupplierInfluence extends DbEnumeration { public static final String AIDING2 = "Aiding2"; public static final String AIDING1 = "Aiding1"; --- 4,8 ---- import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public final class SupplierInfluence extends DbEnumeration { public static final String AIDING2 = "Aiding2"; public static final String AIDING1 = "Aiding1"; Index: CostCause.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostCause.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CostCause.java 29 Jun 2006 22:50:05 -0000 1.3 --- CostCause.java 13 Jun 2007 20:15:54 -0000 1.4 *************** *** 14,18 **** * @author generated by the umleditor */ ! public class CostCause extends DbCode { // standard CodeCause's for the most TCO-Configuration public static final String INSTALLATION = "Installation"; --- 14,18 ---- * @author generated by the umleditor */ ! public final class CostCause extends DbCode { // standard CodeCause's for the most TCO-Configuration public static final String INSTALLATION = "Installation"; *************** *** 83,89 **** text = getName().getValue(); if (getDirect().booleanValue()) { ! text = text + " [" + ResourceManager.getResource(CostCauseDetailView.class, "LblDirect_text", false) + "]"; } else { ! text = text + " [" + ResourceManager.getResource(CostCauseDetailView.class, "LblIndirect_text", false) + "]"; } } --- 83,89 ---- text = getName().getValue(); if (getDirect().booleanValue()) { ! text = text + " [" + ResourceManager.getResourceAsNonLabeled(CostCauseDetailView.class, "LblDirect_text") + "]"; } else { ! text = text + " [" + ResourceManager.getResourceAsNonLabeled(CostCauseDetailView.class, "LblIndirect_text") + "]"; } } Index: Responsibility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Responsibility.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Responsibility.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- Responsibility.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 2,6 **** import ch.softenvironment.jomm.mvc.model.DbCode; ! public class Responsibility extends DbCode { public Responsibility(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 2,6 ---- import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class Responsibility extends DbCode { public Responsibility(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: LifeCycle.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/LifeCycle.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LifeCycle.java 29 Aug 2005 09:41:04 -0000 1.1.1.1 --- LifeCycle.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 4,8 **** import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public class LifeCycle extends DbEnumeration { public static final String DEVELOPMENT = "Development"; public static final String OPERATION = "Operation"; --- 4,8 ---- import ch.softenvironment.jomm.mvc.model.DbEnumeration; ! public final class LifeCycle extends DbEnumeration { public static final String DEVELOPMENT = "Development"; public static final String OPERATION = "Operation"; Index: ServiceCategory.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/ServiceCategory.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ServiceCategory.java 29 Aug 2005 09:41:04 -0000 1.1.1.1 --- ServiceCategory.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 2,6 **** import ch.softenvironment.jomm.mvc.model.DbCode; ! public class ServiceCategory extends DbCode { public ServiceCategory(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 2,6 ---- import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class ServiceCategory extends DbCode { public ServiceCategory(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: Activity.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Activity.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Activity.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- Activity.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 2,6 **** import ch.softenvironment.jomm.mvc.model.DbCode; ! public class Activity extends DbCode { public Activity(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 2,6 ---- import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class Activity extends DbCode { public Activity(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); Index: ProjectPhase.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/ProjectPhase.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ProjectPhase.java 29 Aug 2005 09:41:05 -0000 1.1.1.1 --- ProjectPhase.java 13 Jun 2007 20:15:54 -0000 1.2 *************** *** 3,7 **** import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbCode; ! public class ProjectPhase extends DbCode { public static final String INITIALISATION="Initialisation"; public static final String ANALYSIS="Analysis"; --- 3,7 ---- import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbCode; ! public final class ProjectPhase extends DbCode { public static final String INITIALISATION="Initialisation"; public static final String ANALYSIS="Analysis"; Index: Currency.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Currency.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Currency.java 7 May 2006 14:39:03 -0000 1.3 --- Currency.java 13 Jun 2007 20:15:54 -0000 1.4 *************** *** 4,10 **** /** * Currency Enumeration according to ISO 4217. * @author Peter Hirzel <i>soft</i>Environment */ ! public class Currency extends DbEnumeration { public final static String CHF = "CHF"; public final static String EUR = "EUR"; --- 4,12 ---- /** * Currency Enumeration according to ISO 4217. + * @see http://www.iso.org/iso/en/prods-services/popstds/currencycodeslist.html * @author Peter Hirzel <i>soft</i>Environment */ ! public final class Currency extends DbEnumeration { ! // IliCode definition according to 3 letter alphanumeric code according to: public final static String CHF = "CHF"; public final static String EUR = "EUR"; *************** *** 16,19 **** --- 18,22 ---- public final static String CAD = "CAD"; public final static String XAF = "XAF"; + public Currency(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- NEW FILE: ConfigurationTag.java --- package org.tcotool.model; import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.descriptor.DbMultiplicityRange; import ch.softenvironment.jomm.descriptor.DbTextFieldDescriptor; import ch.softenvironment.jomm.mvc.model.DbEntityBean; /** * @author generated by the umleditor */ public class ConfigurationTag extends DbEntityBean { public ConfigurationTag(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } private String fieldName; public String getName() { refresh(false); // read lazy initialized objects return fieldName; } public void setName(String name){ String oldValue=fieldName; fieldName=name; firePropertyChange("name", oldValue, fieldName); } /* private String fieldImportFile; public String getImportFile() { refresh(false); // read lazy initialized objects return fieldImportFile; } public void setImportFile(String importFile){ String oldValue=fieldImportFile; fieldImportFile=importFile; firePropertyChange("importFile", oldValue, fieldImportFile); } private java.lang.Long fieldExternalId; public java.lang.Long getExternalId() { refresh(false); // read lazy initialized objects return fieldExternalId; } public void setExternalId(java.lang.Long externalId){ java.lang.Long oldValue=fieldExternalId; fieldExternalId=externalId; firePropertyChange("externalId", oldValue, fieldExternalId); } */ private java.util.List fieldObjectId; public java.util.List getObjectId() { refresh(false); // read lazy initialized objects return fieldObjectId; } public void setObjectId(java.util.List id) { java.util.List oldValue=fieldObjectId; fieldObjectId=id; firePropertyChange("objectId", oldValue, fieldObjectId); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(ConfigurationTag.class); descriptor.add("name","name",new DbTextFieldDescriptor(50),new DbMultiplicityRange(1,1)); // descriptor.add("importFile","importFile",new DbTextFieldDescriptor(1023),new DbMultiplicityRange(0,1)); // descriptor.add("externalId","externalId",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(0,1)); //TODO Comparable Configurations descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "tagId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), Configuration.class, "objectId"); return descriptor; } } |