Menu
▾
▴
[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/tools ModelUtility.java, 1.12, 1.13
|
From: Hirzel P. <ph...@us...> - 2008-05-18 15:35:55
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1964/src/org/tcotool/tools Modified Files: ModelUtility.java Log Message: Refactoring Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ModelUtility.java 3 Mar 2008 22:06:29 -0000 1.12 --- ModelUtility.java 18 May 2008 15:35:54 -0000 1.13 *************** *** 50,56 **** */ public class ModelUtility implements ch.softenvironment.view.tree.TreeNodeUtility { ! public static final Long EXPENDABLE_DURATION = new Long(12); // 12 month private TcoModel model = null; ! private String file = null; private Diagram dependencyDiagram = null; private Map iconMap = new HashMap(); --- 50,57 ---- */ public class ModelUtility implements ch.softenvironment.view.tree.TreeNodeUtility { ! //public static final Long EXPENDABLE_DURATION = new Long(12); // 12 month ! public static final String XSD = "http://www.interlis.ch/INTERLIS2.2 TcoTool.xsd"; private TcoModel model = null; ! private String filename = null; private Diagram dependencyDiagram = null; private Map iconMap = new HashMap(); *************** *** 61,65 **** public ModelUtility(DbObjectServer server) throws Throwable { super(); ! file = null; dependencyDiagram = null; // define DbEnumerations --- 62,66 ---- public ModelUtility(DbObjectServer server) throws Throwable { super(); ! filename = null; dependencyDiagram = null; // define DbEnumerations *************** *** 76,83 **** * @param model root-element */ ! public ModelUtility(TcoModel model, String file) throws Throwable { super(); this.model = model; ! this.file = file; fixModel(model); --- 77,84 ---- * @param model root-element */ ! public ModelUtility(TcoModel model, String filename) throws Throwable { super(); this.model = model; ! setFilename(filename); fixModel(model); *************** *** 269,273 **** group.setName(ResourceManager.getResource(ModelUtility.class, "CIItPlattform")); } ! private static CostCause createCostCause(XmlObjectServer server, Locale locale, final String iliCode, final String name, Boolean direct) throws Throwable { CostCause cause = (CostCause)server.createInstance(CostCause.class); cause.setIliCode(iliCode); --- 270,284 ---- group.setName(ResourceManager.getResource(ModelUtility.class, "CIItPlattform")); } ! public static CostCentre createCostCenter(XmlObjectServer server, Locale locale, final String iliCode, final String name) throws Throwable { ! CostCentre centre = (CostCentre)server.createInstance(CostCentre.class); ! centre.setIliCode(iliCode); ! centre.getName().setValue(name, locale); ! //cause.setDirect(direct); ! centre.save(); ! server.cacheCode(centre); ! centre.getNameString(); ! return centre; ! } ! public static CostCause createCostCause(XmlObjectServer server, Locale locale, final String iliCode, final String name, Boolean direct) throws Throwable { CostCause cause = (CostCause)server.createInstance(CostCause.class); cause.setIliCode(iliCode); *************** *** 440,448 **** * @return */ ! public String getFile() { ! return file; } ! public void setFile(String file) { ! this.file = file; } /** --- 451,462 ---- * @return */ ! public String getFilename() { ! return filename; } ! public void setFilename(final String filename) { ! this.filename = filename; ! if (getRoot() != null) { ! ((TcoModel)getRoot()).setName(new java.io.File(filename).getName()); ! } } /** *************** *** 619,622 **** --- 633,649 ---- } /** + * Return the given object as package or root if null. + * Convenience method. + * @param object + * @return + */ + public static TcoPackage getTcoPackageOrRoot(Object object) { + if (object == null) { + return (TcoPackage)LauncherView.getInstance().getUtility().getRoot(); + } else { + return (TcoPackage)object; + } + } + /** * Reuse data of assigned Catalogue. * @param cost *************** *** 689,693 **** * Return the root-element of the Model-Tree. */ ! public Object getRoot() { return model; } --- 716,720 ---- * Return the root-element of the Model-Tree. */ ! public Object /*TcoModel*/ getRoot() { return model; } *************** *** 743,746 **** --- 770,775 ---- } else if (type.equals(PersonalCost.class)) { return ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text"); + } else if (type.equals(Cost.class)) { + return ResourceManager.getResource(FactCostDetailView.class, "FrmWindow_text") + "/" + ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text"); // DbEnumeration's } else if (type.equals(CostCause.class)) { *************** *** 885,888 **** --- 914,920 ---- return java.util.Locale.getDefault(); } + public static String getIliSender() { + return "www.tcotool.org (" + LauncherView.getVersion() + ")"; + } /** * Register the default DbCode's for new Configurations. *************** *** 907,918 **** server.mapCodes(org.tcotool.model.ServiceCategory.class, nlsText, locale); ! nlsText = new String[]{ ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIInternal"), ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIInfrastructure"), ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIMerchandising"), ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIEducation"), ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIAdministration"), ! ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIProduction") }; ! server.mapCodes(org.tcotool.model.CostCentre.class, nlsText, locale); nlsText = new String[]{ --- 939,948 ---- server.mapCodes(org.tcotool.model.ServiceCategory.class, nlsText, locale); ! createCostCenter(server, locale, CostCentre.INTERNAL, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIInternal")); ! createCostCenter(server, locale, CostCentre.INFRASTRUCTURE, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIInfrastructure")); ! createCostCenter(server, locale, CostCentre.MERCHANDISING, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIMerchandising")); ! createCostCenter(server, locale, CostCentre.EDUCATION, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIEducation")); ! createCostCenter(server, locale, CostCentre.ADMINISTRATION, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIAdministration")); ! createCostCenter(server, locale, CostCentre.PRODUCTION, ResourceManager.getResource(org.tcotool.model.CostCentre.class, "CIProduction")); nlsText = new String[]{ *************** *** 991,1007 **** java.util.Locale locale = getCodeTypeLocale(); - /*TODO remove OBSOLETE DbEnumeration CostType might only be referenced in configurations stored before V1.4 (do not create them any more!) - server.createEnumeration(CostType.class, CostCause.HARDWARE, locale, ResourceManager.getResource(CostCause.class, "CIHardware")); - server.createEnumeration(CostType.class, CostCause.SOFTWARE, locale, ResourceManager.getResource(CostCause.class, "CISoftware")); - server.createEnumeration(CostType.class, CostCause.INSTALLATION, locale, ResourceManager.getResource(CostCause.class, "CIInstallation")); - server.createEnumeration(CostType.class, CostCause.INTEGRATION, locale, ResourceManager.getResource(CostCause.class, "CIIntegration")); - server.createEnumeration(CostType.class, CostCause.OPERATION, locale, ResourceManager.getResource(CostCause.class, "CIOperaion")); - server.createEnumeration(CostType.class, CostCause.OPERATIONHARDWARE, locale, ResourceManager.getResource(CostCause.class, "CIOperationHardware")); - server.createEnumeration(CostType.class, CostCause.OPERATIONSOFTWARE, locale, ResourceManager.getResource(CostCause.class, "CIOperationSoftware")); - server.createEnumeration(CostType.class, CostCause.INFRASTRUCTURE, locale, ResourceManager.getResource(CostCause.class, "CIInfrastructure")); - server.createEnumeration(CostType.class, CostCause.SERVICE, locale, ResourceManager.getResource(CostCause.class, "CIService")); - server.createEnumeration(CostType.class, CostCause.EDUCATION, locale, ResourceManager.getResource(CostCause.class, "CIEducation")); - server.createEnumeration(CostType.class, CostCause.STORAGE, locale, ResourceManager.getResource(CostCause.class, "CIStorage")); - */ server.createEnumeration(Branch.class, Branch.GOVERNMENT, locale, ResourceManager.getResource(Branch.class, "EnumGOVERNMENT")); server.createEnumeration(Branch.class, Branch.BANKINSURANCE, locale, ResourceManager.getResource(Branch.class, "EnumBANKINSURANCE")); --- 1021,1024 ---- |
