You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(20) |
Oct
(2) |
Nov
(22) |
Dec
(38) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(12) |
Feb
|
Mar
(7) |
Apr
|
May
(18) |
Jun
(7) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(34) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(24) |
Jun
(45) |
Jul
(4) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Hirzel P. <ph...@us...> - 2008-03-03 22:06:29
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32168/src/org/tcotool/tools Modified Files: ModelUtility.java Log Message: Data: More Currencies added Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ModelUtility.java 13 Jun 2007 20:17:33 -0000 1.11 --- ModelUtility.java 3 Mar 2008 22:06:29 -0000 1.12 *************** *** 27,31 **** import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.mvc.model.DbChangeableBean; - import ch.softenvironment.jomm.mvc.model.DbEnumeration; import ch.softenvironment.jomm.target.xml.XmlObjectServer; import ch.softenvironment.util.AmountFormat; --- 27,30 ---- *************** *** 82,100 **** this.file = file; ! //TODO remove obsolete code: fix older configuration XSD-Schema ! List causes = model.getObjectServer().retrieveCodes(CostCause.class); ! if (causes.size() == 0) { ! // assume CodeType's not yet transformed at least once => ignore BUG: recreation if user removes all these Code's ! createDefaultCostCauses((XmlObjectServer)model.getObjectServer(), getCodeTypeLocale()); ! } /*else { ! Iterator it = causes.iterator(); ! while (it.hasNext()) { ! CostCause cause = (CostCause)it.next(); ! if (cause.getDirect() == null) { ! cause.setDirect(Boolean.FALSE); ! } ! } ! }*/ ! fixModel(model); } /** --- 81,85 ---- this.file = file; ! fixModel(model); } /** *************** *** 202,205 **** --- 187,191 ---- FactCost cost = (FactCost)object; cost.setName(ResourceManager.getResource(CostDriverDetailView.class, "CTFactCostName")); + cost.setBaseOffset(new Long(0)); cost.setAmount(new Double(0.0)); cost.setEstimated(Boolean.FALSE); *************** *** 208,214 **** --- 194,202 ---- cost.setDepreciationDuration(getSystemParameter().getDefaultDepreciationDuration()); cost.setUsageDuration(getSystemParameter().getDefaultUsageDuration()); + cost.setExpendable(Boolean.FALSE); } else if (object instanceof PersonalCost) { PersonalCost cost = (PersonalCost)object; cost.setName(ResourceManager.getResource(CostDriverDetailView.class, "CTPersonalCostName")); + cost.setBaseOffset(new Long(0)); cost.setAmount(new Double(0.0)); cost.setEstimated(Boolean.FALSE); *************** *** 281,335 **** group.setName(ResourceManager.getResource(ModelUtility.class, "CIItPlattform")); } ! /** ! * CostCause are the most important code in a TCO-Configuration ! * because they allow to classify each Cost-factor. ! * @param server ! * @param locale ! * @throws Throwable ! * @deprecated (necessary for version <1.4.0) ! */ ! private static void createDefaultCostCauses(XmlObjectServer server, Locale locale) throws Throwable { ! morphEnumeration(server.getIliCode(CostType.class, CostCause.HARDWARE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.SOFTWARE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.INSTALLATION)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.INTEGRATION)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.OPERATION)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.OPERATIONHARDWARE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.OPERATIONSOFTWARE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.INFRASTRUCTURE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.SERVICE)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.EDUCATION)); ! morphEnumeration(server.getIliCode(CostType.class, CostCause.STORAGE)); ! /* ! String nlsText[] = new String[]{ ResourceManager.getResource(CostType.class, "CIHardware"), ! ResourceManager.getResource(CostCause.class, "CISoftware"), ! ResourceManager.getResource(CostCause.class, "CIInstallation"), ! ResourceManager.getResource(CostCause.class, "CIIntegration"), ! ResourceManager.getResource(CostCause.class, "CIOperaion"), ! ResourceManager.getResource(CostCause.class, "CIOperationHardware"), ! ResourceManager.getResource(CostCause.class, "CIOperationSoftware"), ! ResourceManager.getResource(CostCause.class, "CIInfrastructure"), ! ResourceManager.getResource(CostCause.class, "CIService"), ! ResourceManager.getResource(CostCause.class, "CIEducation"), ! ResourceManager.getResource(CostCause.class, "CIStorage") ! }; ! ! server.mapCodes(CostCause.class, nlsText, locale); ! */ ! } ! /** ! * Morph given enumeration into a new instance of dbCode. ! * @param enumeration ! * @param dbCode ! * @return ! * @deprecated (see #fixModel()) ! */ ! private static CostCause morphEnumeration(DbEnumeration enumeration) throws Throwable { ! CostCause cause = (CostCause)enumeration.getObjectServer().createInstance(CostCause.class); ! cause.setName(enumeration.getName()); ! cause.setIliCode(enumeration.getIliCode()); ! cause.setDirect(Boolean.FALSE); cause.save(); ! enumeration.getObjectServer().cacheCode(cause); return cause; } --- 269,280 ---- 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); ! cause.getName().setValue(name, locale); ! cause.setDirect(direct); cause.save(); ! server.cacheCode(cause); ! cause.getNameString(); return cause; } *************** *** 524,528 **** CostCause cause = (CostCause)it.next(); if (cause.getDirect() == null) { ! cause.setDirect(Boolean.FALSE); } } --- 469,473 ---- CostCause cause = (CostCause)it.next(); if (cause.getDirect() == null) { ! cause.setDirect(Boolean.TRUE); } } *************** *** 559,567 **** while (itc.hasNext()) { Cost cost = (Cost)itc.next(); if (cost.getEstimated() == null) { cost.setEstimated(Boolean.FALSE); } ! if (cost.getType() != null) { ! // <= V1.4.0 instances => morph CostType into CostCause String iliCode = cost.getType().getIliCode(); Iterator itCauses = causes.iterator(); --- 504,521 ---- while (itc.hasNext()) { Cost cost = (Cost)itc.next(); + if (cost.getBaseOffset() == null) { + // <= V1.4.4 + cost.setBaseOffset(new Long(0)); + } + if ((cost instanceof FactCost) && (((FactCost)cost).getExpendable() == null)) { + // <= V1.4.4 + ((FactCost)cost).setExpendable(Boolean.FALSE); + } if (cost.getEstimated() == null) { cost.setEstimated(Boolean.FALSE); } ! /* ! if (cost.getType() != null) { ! // <= V1.4.0 instances => morph CostType into CostCause String iliCode = cost.getType().getIliCode(); Iterator itCauses = causes.iterator(); *************** *** 570,579 **** if (iliCode.equals(code.getIliCode())) { Tracer.getInstance().debug("Morph enum: " + cost.getType().getNameString() + " => code: " + code.getNameString()); ! cost.setCause(code); ! cost.setType(null); ! break; ! } ! } ! } if (cost instanceof PersonalCost) { PersonalCost pCost = (PersonalCost)cost; --- 524,535 ---- if (iliCode.equals(code.getIliCode())) { Tracer.getInstance().debug("Morph enum: " + cost.getType().getNameString() + " => code: " + code.getNameString()); ! cost.setCause(code); ! cost.setType(null); ! break; ! } ! } ! } ! */ ! if (cost instanceof PersonalCost) { PersonalCost pCost = (PersonalCost)cost; *************** *** 663,675 **** } /** ! * Reuse price and duration of Catalogue. * @param cost */ public static void updateCatalogue(FactCost cost) { if (cost.getCatalogue() != null) { cost.setAmount(cost.getCatalogue().getPrice()); cost.setCurrency(cost.getCatalogue().getCurrency()); cost.setUsageDuration(cost.getCatalogue().getUsageDuration()); cost.setDepreciationDuration(cost.getCatalogue().getDepreciationDuration()); // by default Catalogue parts are known in price exactly cost.setEstimated(Boolean.FALSE); --- 619,633 ---- } /** ! * Reuse data of assigned Catalogue. * @param cost */ public static void updateCatalogue(FactCost cost) { if (cost.getCatalogue() != null) { + //cost.setName(cost.getCatalogue().getNameString()); //=> was used initially only! cost.setAmount(cost.getCatalogue().getPrice()); cost.setCurrency(cost.getCatalogue().getCurrency()); cost.setUsageDuration(cost.getCatalogue().getUsageDuration()); cost.setDepreciationDuration(cost.getCatalogue().getDepreciationDuration()); + cost.setExpendable(cost.getCatalogue().getExpendable()); // by default Catalogue parts are known in price exactly cost.setEstimated(Boolean.FALSE); *************** *** 922,930 **** /** * Return the Locale for NLS-Codes. ! * @deprecated (JOMM does not suppert multiple NLS-Settings yet!) */ ! private static Locale getCodeTypeLocale() { ! //TODO replace by proper JOMM-Mechanism ! return java.util.Locale.GERMAN; } /** --- 880,887 ---- /** * Return the Locale for NLS-Codes. ! * @deprecated */ ! public static Locale getCodeTypeLocale() { ! return java.util.Locale.getDefault(); } /** *************** *** 933,967 **** */ private static void mapDefaultCodes(ch.softenvironment.jomm.target.xml.XmlObjectServer server, SystemParameter sysPar) throws Throwable { - //TODO NLS-translations java.util.Locale locale = getCodeTypeLocale(); ! createDefaultCostCauses(server, locale); ! String nlsText[] = new String[]{ "System-Service", ! "Security-Service", ! "Network-Service", ! "Outsourcing-Service" ! /* ,"Service-Level 1", ! "Service-Level 2", ! "Service-Level 3", ! "Product" /*, ! "Marktleistung" ! */ ! }; ! server.mapCodes(org.tcotool.model.ServiceCategory.class, nlsText, locale); ! nlsText = new String[]{ "1st Level-Support", ! "2nd Level-Support", ! "3rd Level-Support" }; server.mapCodes(org.tcotool.model.Activity.class, nlsText, locale); nlsText = new String[]{ ! "Projektleiter", ! // "Auftraggeber", ! "Lösungsarchitekt", ! // "Anwendervertreter", ! // "Qualitätsverantwortlicher", ! // "Risikoverantwortlicher", ! "Leistungserbringer" }; java.util.Iterator it = server.mapCodes(org.tcotool.model.Role.class, nlsText, locale).iterator(); while (it.hasNext()) { --- 890,956 ---- */ private static void mapDefaultCodes(ch.softenvironment.jomm.target.xml.XmlObjectServer server, SystemParameter sysPar) throws Throwable { java.util.Locale locale = getCodeTypeLocale(); ! String nlsText[] = new String[]{ ! ResourceManager.getResource(org.tcotool.model.Responsibility.class, "CIOperations"), ! ResourceManager.getResource(org.tcotool.model.Responsibility.class, "CIManagement"), ! ResourceManager.getResource(org.tcotool.model.Responsibility.class, "CIHelpDesk")}; ! server.mapCodes(org.tcotool.model.Responsibility.class, nlsText, locale); ! nlsText = new String[]{ ! ResourceManager.getResource(org.tcotool.model.ServiceCategory.class, "CISystemService"), ! ResourceManager.getResource(org.tcotool.model.ServiceCategory.class, "CISecurityService"), ! ResourceManager.getResource(org.tcotool.model.ServiceCategory.class, "CINetworkService"), ! ResourceManager.getResource(org.tcotool.model.ServiceCategory.class, "CIOutsourcingService") ! }; ! 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[]{ ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIControlIT"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIEducation"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIProviding"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIManageIT"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIDevelopSolution"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIMaintainInfrastructure"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIUserSupport"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIMaintainProcess"), ! ResourceManager.getResource(org.tcotool.model.Process.class, "CIFinancialAdministration") }; ! server.mapCodes(org.tcotool.model.Process.class, nlsText, locale); ! ! // CostCause ! createCostCause(server, locale, CostCause.HARDWARE, ResourceManager.getResource(CostCause.class, "CIHardware"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.SOFTWARE, ResourceManager.getResource(CostCause.class, "CISoftware"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.INSTALLATION, ResourceManager.getResource(CostCause.class, "CIInstallation"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.INTEGRATION, ResourceManager.getResource(CostCause.class, "CIIntegration"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.OPERATION, ResourceManager.getResource(CostCause.class, "CIOperaion"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.OPERATIONHARDWARE, ResourceManager.getResource(CostCause.class, "CIOperationHardware"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.OPERATIONSOFTWARE, ResourceManager.getResource(CostCause.class, "CIOperationSoftware"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.INFRASTRUCTURE, ResourceManager.getResource(CostCause.class, "CIInfrastructure"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.SERVICE, ResourceManager.getResource(CostCause.class, "CIService"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.EDUCATION, ResourceManager.getResource(CostCause.class, "CIEducation"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.STORAGE, ResourceManager.getResource(CostCause.class, "CIStorage"), Boolean.TRUE); ! createCostCause(server, locale, CostCause.DOWNTIME, ResourceManager.getResource(CostCause.class, "CIDowntime"), Boolean.FALSE); ! createCostCause(server, locale, CostCause.END_USER_OPERATION, ResourceManager.getResource(CostCause.class, "CIEndUserOperation"), Boolean.FALSE); ! ! nlsText = new String[]{ ResourceManager.getResource(org.tcotool.model.Activity.class, "CIFirstLevelSupport"), ! ResourceManager.getResource(org.tcotool.model.Activity.class, "CISecondLevelSupport"), ! ResourceManager.getResource(org.tcotool.model.Activity.class, "CIThirdLevelSupport") }; server.mapCodes(org.tcotool.model.Activity.class, nlsText, locale); nlsText = new String[]{ ! ResourceManager.getResource(org.tcotool.model.Role.class, "CIProjectManager"), ! ResourceManager.getResource(org.tcotool.model.Role.class, "CISolutionArchtitect"), ! ResourceManager.getResource(org.tcotool.model.Role.class, "CIQualityAssurance"), ! ResourceManager.getResource(org.tcotool.model.Role.class, "CIServiceProvider") }; java.util.Iterator it = server.mapCodes(org.tcotool.model.Role.class, nlsText, locale).iterator(); while (it.hasNext()) { *************** *** 969,1010 **** } ! // HERMES nlsText = new String[]{ ! "Initialisierung", ! "Voranalyse", ! "Konzept", ! "Realisierung", ! "Einführung", ! "Abschluss" }; server.mapCodes(org.tcotool.model.ProjectPhase.class, nlsText, locale); - - nlsText = new String[]{ "Intern", - "Infrastruktur" }; - server.mapCodes(org.tcotool.model.CostCentre.class, nlsText, locale); ! nlsText = new String[]{ "Firmensitz"}; server.mapCodes(org.tcotool.model.Site.class, nlsText, locale); ! nlsText = new String[]{ "Informatik steuern (P01)", ! "Fähigkeiten entwickeln (P02)", ! "Güter und Dienstleistungen beschaffen (P03)", ! "Informatik führen (P04)", ! "Lösungen entwickeln (P05)", ! "Infrastruktur betreiben (P06)", ! "Benutzer unterstützen (P07)", ! "Prozesse pflegen (P08)", ! "Finanzielle Führung unterstützen (P09)" }; ! /* ! // Produktentwicklung & -Einführung ! "Idea & Business Opportunity Scanning", ! "Produktentscheidungsfindung", ! "Produktentwicklungsprojekt", ! "Markteinführung", ! // Produktbereitstellung & -Support ! "Eingangsbearbeitung", ! "Realisierung/Rollout", ! "Accounting/Billing" }; ! */ ! server.mapCodes(org.tcotool.model.Process.class, nlsText, locale); /* nlsText = new String[]{ "Monitor", --- 958,977 ---- } ! // HERMES phase model (see http://www.hermes.admin.ch/) nlsText = new String[]{ ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CIInitialization"), ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CIAnalysis"), ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CIConcept"), ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CIRealization"), ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CIIntroduction"), ! ResourceManager.getResource(org.tcotool.model.ProjectPhase.class, "CITransition") }; server.mapCodes(org.tcotool.model.ProjectPhase.class, nlsText, locale); ! nlsText = new String[]{ ! ResourceManager.getResource(org.tcotool.model.Site.class, "CIMainSite"), ! ResourceManager.getResource(org.tcotool.model.Site.class, "CISubsidiary") }; server.mapCodes(org.tcotool.model.Site.class, nlsText, locale); ! /* nlsText = new String[]{ "Monitor", *************** *** 1013,1026 **** server.mapCodes(org.tcotool.model.Catalogue.class, nlsText, locale); */ ! nlsText = new String[]{ "Operations" ! // BIT ! /* "Gesamtplanung & -Verantwortung SGE", ! "Aufgabenplanung & Koordination SGE", ! "Aufgabenplanung & Koordination nicht SGE", ! "Budgetkompetenz SGE", ! "Budgetkompetenz nicht SGE" ! */ ! }; ! server.mapCodes(org.tcotool.model.Responsibility.class, nlsText, locale); } /** --- 980,984 ---- server.mapCodes(org.tcotool.model.Catalogue.class, nlsText, locale); */ ! } /** *************** *** 1033,1037 **** java.util.Locale locale = getCodeTypeLocale(); ! //TODO OBSOLETE DbEnumeration CostType server.createEnumeration(CostType.class, CostCause.HARDWARE, locale, ResourceManager.getResource(CostCause.class, "CIHardware")); server.createEnumeration(CostType.class, CostCause.SOFTWARE, locale, ResourceManager.getResource(CostCause.class, "CISoftware")); --- 991,995 ---- 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")); *************** *** 1045,1049 **** 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")); --- 1003,1007 ---- 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")); *************** *** 1060,1063 **** --- 1018,1032 ---- server.createEnumeration(Currency.class, Currency.CFA, locale, "CFA"); server.createEnumeration(Currency.class, Currency.INR, locale, "INR"); + server.createEnumeration(Currency.class, Currency.AUD, locale, "AUD"); + server.createEnumeration(Currency.class, Currency.CAD, locale, "CAD"); + server.createEnumeration(Currency.class, Currency.XAF, locale, "XAF"); + server.createEnumeration(Currency.class, Currency.BRL, locale, "BRL"); + server.createEnumeration(Currency.class, Currency.NZD, locale, "NZD"); + server.createEnumeration(Currency.class, Currency.HKD, locale, "HKD"); + server.createEnumeration(Currency.class, Currency.NOK, locale, "NOK"); + server.createEnumeration(Currency.class, Currency.DKK, locale, "DKK"); + server.createEnumeration(Currency.class, Currency.SEK, locale, "SEK"); + server.createEnumeration(Currency.class, Currency.CNY, locale, "CNY"); + //TODO ISK, XDR etc server.createEnumeration(CostExponent.class, CostExponent.ASIS, locale, ResourceManager.getResource(CostExponent.class, "CIAsIs")); |
From: Hirzel P. <ph...@us...> - 2008-03-03 22:06:29
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32168/src/org/tcotool/model Modified Files: Currency.java Log Message: Data: More Currencies added Index: Currency.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Currency.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Currency.java 13 Jun 2007 20:15:54 -0000 1.4 --- Currency.java 3 Mar 2008 22:06:29 -0000 1.5 *************** *** 9,21 **** 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"; ! public final static String USD = "USD"; ! public final static String JPY = "JPY"; ! public final static String CFA = "CFA"; ! public final static String INR = "INR"; ! public final static String AUD = "AUD"; ! public final static String CAD = "CAD"; ! public final static String XAF = "XAF"; public Currency(ch.softenvironment.jomm.DbObjectServer objectServer) { --- 9,29 ---- public final class Currency extends DbEnumeration { // IliCode definition according to 3 letter alphanumeric code according to: ! public final static String CHF = "CHF"; // Swiss Franc ! public final static String EUR = "EUR"; // Euro ! public final static String USD = "USD"; // American Dollar ! public final static String JPY = "JPY"; // Japanes Yen ! public final static String CFA = "CFA"; // Cameron CFA Franc ! public final static String INR = "INR"; // Indian Rupee ! public final static String AUD = "AUD"; // Australian Dollar ! public final static String CAD = "CAD"; // Canadian Dollar ! public final static String XAF = "XAF"; // Central African Republic ! public final static String BRL = "BRL"; // Brasilian Real ! public final static String NZD = "NZD"; // New Zealand Dollar ! public final static String HKD = "HKD"; // Hong Kong Dollar ! public final static String NOK = "NOK"; // Norwegian Krone ! public final static String DKK = "DKK"; // Danish Krone ! public final static String SEK = "SEK"; // Danish Krone ! public final static String CNY = "CNY"; // Yuan Renminbi ! public Currency(ch.softenvironment.jomm.DbObjectServer objectServer) { |
From: Hirzel P. <ph...@us...> - 2007-08-06 14:30:17
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11236/src/org/tcotool/model/resources Modified Files: CostCause.properties CostCause_de.properties Added Files: Site.properties Process.properties Process_de.properties Responsibility.properties Site_de.properties CostCentre_de.properties CostCentre.properties Log Message: Translations enhanced and added --- NEW FILE: Process_de.properties --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Process.properties --- CIControlIT = Control IT (P01) CIEducation = Develop skills (P02) CIProviding = Provide goods and services (P03) CIManageIT = Guide IT (P04) CIDevelopSolution = Develop solutions (P05) CIMaintainInfrastructure = Maintain infrastructure (P06) CIUserSupport = User support (P07) CIMaintainProcess = Maintain processes (P08) CIFinancialAdministration = Financial administration (P09) --- NEW FILE: Site_de.properties --- CIMainSite = Firmensitz CISubsidiary = Nebenstelle Index: CostCause.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources/CostCause.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CostCause.properties 11 Jan 2006 15:11:22 -0000 1.1 --- CostCause.properties 6 Aug 2007 14:30:07 -0000 1.2 *************** *** 9,11 **** CIService = Service/Consulting CIEducation = Education ! CIStorage = Storage \ No newline at end of file --- 9,13 ---- CIService = Service/Consulting CIEducation = Education ! CIStorage = Storage ! CIDowntime = Non-productive time ! CIEndUserOperation = Peer user support (shadow education) \ No newline at end of file --- NEW FILE: CostCentre.properties --- CIInternal = Internal CIInfrastructure = Infrastructure CIMerchandising = Merchandising CIEducation = Education CIAdministration = Administration CIProduction = Production Index: CostCause_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources/CostCause_de.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CostCause_de.properties 11 Jan 2006 15:11:22 -0000 1.1 --- CostCause_de.properties 6 Aug 2007 14:30:08 -0000 1.2 *************** *** 9,11 **** CIService = Dienstleistung CIEducation = Schulung ! CIStorage = Storage \ No newline at end of file --- 9,13 ---- CIService = Dienstleistung CIEducation = Schulung ! CIStorage = Storage ! CIDowntime = Unproduktive Zeit ! CIEndUserOperation = Gegenseitige Nutzerunterstützung \ No newline at end of file --- NEW FILE: Responsibility.properties --- CIOperations = Operations CIManagement = Management CIHelpDesk = Help desk --- NEW FILE: CostCentre_de.properties --- CIInternal = Intern CIInfrastructure = Infrastruktur CIMerchandising = Vertrieb CIEducation = Aus-/Weiterbildung CIAdministration = Administration CIProduction = Produktion --- NEW FILE: Site.properties --- CIMainSite = Principal office CISubsidiary = Subsidiary |
From: Hirzel P. <ph...@us...> - 2007-07-27 16:42:42
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv334/src/org/tcotool/model/resources Added Files: ProjectPhase_de.properties ServiceCategory.properties Role.properties ProjectPhase.properties Role_de.properties Activity.properties Log Message: New translations --- NEW FILE: Role.properties --- CIProjectManager = Project manager CISolutionArchtitect = Solution architect CIServiceProvider = Service provider CIQualityAssurance = Quality responsible --- NEW FILE: ProjectPhase_de.properties --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ProjectPhase.properties --- CIInitialization = Inception CIAnalysis = Analysis CIConcept = Elaboration CIRealization = Construction CIIntroduction = Introduction CITransition = Transition --- NEW FILE: Activity.properties --- CIFirstLevelSupport = 1st Level-Support CISecondLevelSupport = 2nd Level-Support CIThirdLevelSupport = 3rd Level-Support --- NEW FILE: Role_de.properties --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ServiceCategory.properties --- CISystemService = System-Service CISecurityService = Security-Service CINetworkService = Network-Service CIOutsourcingService = Outsourcing-Service |
From: Hirzel P. <ph...@us...> - 2007-06-19 14:45:23
|
Update of /cvsroot/tcotool/TCO-Tool/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12162/model Modified Files: DataModel_Classdiagram_UML.png README.txt PackageDependencies_UML.png TCO-Model.uml Log Message: Model updated V1.4.4 Index: DataModel_Classdiagram_UML.png =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/model/DataModel_Classdiagram_UML.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvszt5gTY and /tmp/cvsBIMJeg differ Index: PackageDependencies_UML.png =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/model/PackageDependencies_UML.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsXvO7O3 and /tmp/cvs4cKTjl differ Index: README.txt =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/model/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README.txt 29 Aug 2005 18:34:18 -0000 1.2 --- README.txt 19 Jun 2007 14:45:15 -0000 1.3 *************** *** 1,3 **** ! The file "TCO-Model.uml" contains an UML-Classdiagram of the model classes designed for the TCO-Tool. It can be opened by "www.umleditor.org" (UML/INTERLIS-Editor). The File "softenvironment.ili" is an import file to extend persistent reusable classes for NLS-Support etc. The model classes in "org.tcotool.model" are generated out of this UML-Repository, therefore they are always accurate and complete! For those not willing to install UML/INTERLIS-Editor, the following diagrams represent hardcopied subsets: --- 1,6 ---- ! The file "TCO-Model.uml" contains an UML-Classdiagram of the model classes designed for the TCO-Tool. ! It can be opened by "www.umleditor.org" (UML/INTERLIS-Editor). The File "softenvironment.ili" ! is an import file to extend persistent reusable classes for NLS-Support etc. ! The model classes in "org.tcotool.model" are generated out of this UML-Repository, therefore they are always accurate and complete! For those not willing to install UML/INTERLIS-Editor, the following diagrams represent hardcopied subsets: *************** *** 6,10 **** - ObjectTree.png (most relevant TCO-"containers" in overview) ! Tco_Tool_DRAFT_ONLY.xsd is a generated xsd-schema corresponding to the data-model. Please, be aware it is not yet complete nor will it valdiate correctly against an XML-instance saved by TCO-Tool. --- 9,14 ---- - ObjectTree.png (most relevant TCO-"containers" in overview) ! Tco_Tool_DRAFT_ONLY.xsd is a generated xsd-schema (also by UML/INTERLIS-Editor) corresponding to the data-model. ! Please, be aware it is not yet complete nor will it valdiate correctly against an XML-instance saved by TCO-Tool. Index: TCO-Model.uml =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/model/TCO-Model.uml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TCO-Model.uml 25 Nov 2005 18:06:23 -0000 1.6 --- TCO-Model.uml 19 Jun 2007 14:45:15 -0000 1.7 *************** *** 1,16 **** <?xml version="1.0" encoding="UTF-8" ?> <ch.ehi.umleditor.1> - <ch.ehi.basics.types.NlsString TID="1"> - <Entry TID="10" language="de" translation="UmlModel1"/> - </ch.ehi.basics.types.NlsString> - <ch.ehi.basics.types.NlsString TID="2"> - </ch.ehi.basics.types.NlsString> <ch.ehi.uml1_4.foundation.core.ElementOwnership TID="4"> <Namespace>0</Namespace> ! <OwnedElement>11</OwnedElement> [...34201 lines suppressed...] ! <Multiline>false</Multiline> ! <MaxLength>0</MaxLength> ! </ch.ehi.interlis.domainsandconstants.basetypes.Text> ! <ch.ehi.uml1_4.implementation.UmlMultiplicity TID="3553"> ! <Range>3556</Range> ! </ch.ehi.uml1_4.implementation.UmlMultiplicity> ! <ch.ehi.uml1_4.implementation.UmlMultiplicityRange TID="3556"> ! <Multiplicity>3553</Multiplicity> ! <Lower>0</Lower> ! <Upper>1</Upper> ! </ch.ehi.uml1_4.implementation.UmlMultiplicityRange> ! <ch.ehi.basics.types.NlsString TID="3552"> ! <Entry TID="3557" language="de" translation="NameInBaseLanguage"/> </ch.ehi.basics.types.NlsString> + <ch.ehi.interlis.attributes.DomainAttribute TID="2862"> + <DomainDef>1668</DomainDef> + <AttributeDef>2824</AttributeDef> + </ch.ehi.interlis.attributes.DomainAttribute> <ch.ehi.uml1_4.implementation.UmlModel TID="0"> <Abstract>false</Abstract> |
From: Hirzel P. <ph...@us...> - 2007-06-19 11:12:07
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11044/src/org/tcotool/application/resources Modified Files: OccuranceDetailView_de.properties OccuranceDetailView.properties Log Message: Bug fix: Translation Index: OccuranceDetailView.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/OccuranceDetailView.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OccuranceDetailView.properties 29 Aug 2005 09:41:02 -0000 1.1.1.1 --- OccuranceDetailView.properties 19 Jun 2007 11:12:01 -0000 1.2 *************** *** 1,2 **** ! FrmWindow_title = Service occurance LblSite_text = Site \ No newline at end of file --- 1,2 ---- ! FrmWindow_title = Site occurance LblSite_text = Site \ No newline at end of file Index: OccuranceDetailView_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/OccuranceDetailView_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OccuranceDetailView_de.properties 29 Aug 2005 09:41:02 -0000 1.1.1.1 --- OccuranceDetailView_de.properties 19 Jun 2007 11:12:01 -0000 1.2 *************** *** 1,2 **** ! FrmWindow_title = Dienst-Vorkommnis LblSite_text = Standort \ No newline at end of file --- 1,2 ---- ! FrmWindow_title = Standort-Vorkommnis LblSite_text = Standort \ No newline at end of file |
From: Hirzel P. <ph...@us...> - 2007-06-19 08:22:01
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32196/src/org/tcotool/application Modified Files: LauncherView.java Log Message: Cosmetics: enable Find-Toolbar-Icon; show Icon in PersonalCost-Report Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** LauncherView.java 13 Jun 2007 20:13:56 -0000 1.11 --- LauncherView.java 19 Jun 2007 08:21:59 -0000 1.12 *************** *** 165,169 **** public void tbbCutAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbDeleteAction_actionPerformed(java.util.EventObject newEvent) {}; ! public void tbbFindAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbNewAction_actionPerformed(java.util.EventObject newEvent) { if (newEvent.getSource() == LauncherView.this.getTlbStandard()) --- 165,175 ---- public void tbbCutAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbDeleteAction_actionPerformed(java.util.EventObject newEvent) {}; ! public void tbbFindAction_actionPerformed(java.util.EventObject newEvent) { ! try { ! mniFind(); ! } catch (java.lang.Throwable ivjExc) { ! handleException(ivjExc); ! } ! }; public void tbbNewAction_actionPerformed(java.util.EventObject newEvent) { if (newEvent.getSource() == LauncherView.this.getTlbStandard()) *************** *** 1010,1013 **** --- 1016,1020 ---- // user code begin {1} ivjMniDependencyGraph.setText(getResourceString("MniDependencyGraph_text") + " (S1--10%-->S2)"); + ivjMniDependencyGraph.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "Dependency.png")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1160,1174 **** mniFind.setName("MniFind"); mniFind.setText(CommonUserAccess.getMniEditFindText()); mniFind.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { ! try { ! if (!getViewOptions().getViewManager().activateView(FindDialog.class)) { ! javax.swing.JDialog dialog = new FindDialog(getInstance(), getViewOptions(), false); ! getViewOptions().getViewManager().checkIn(null, dialog); ! dialog.setVisible(true); ! } ! } catch(Throwable ex) { ! handleException(ex); ! } } }); --- 1167,1174 ---- mniFind.setName("MniFind"); mniFind.setText(CommonUserAccess.getMniEditFindText()); + mniFind.setIcon(CommonUserAccess.getIconFind()); mniFind.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { ! mniFind(); } }); *************** *** 1179,1182 **** --- 1179,1193 ---- return mniFind; } + private void mniFind() { + try { + if (!getViewOptions().getViewManager().activateView(FindDialog.class)) { + javax.swing.JDialog dialog = new FindDialog(getInstance(), getViewOptions(), false); + getViewOptions().getViewManager().checkIn(null, dialog); + dialog.setVisible(true); + } + } catch(Throwable ex) { + handleException(ex); + } + } /** * Return the MniHelp property value. *************** *** 1259,1262 **** --- 1270,1274 ---- // user code begin {1} ivjMniReportPersonalCost.setText(ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text")); + ivjMniReportPersonalCost.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "PersonalCost.png")); //getUtility().getIcon(PersonalCost.class, false) // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 2051,2054 **** --- 2063,2067 ---- getTlbStandard().setTbbNewEnabled(true); getTlbStandard().setTbbChangeEnabled(true); + getTlbStandard().setTbbFindEnabled(true); mnuFileHistory = new FileHistoryMenu(this, 9, getSettings().getLastFiles()); |
From: Hirzel P. <ph...@us...> - 2007-06-19 08:21:18
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32109/src/org/tcotool/standard/report Modified Files: ReportTool.java Log Message: Bug fix: #tableDataAmount() export double to CSV Index: ReportTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTool.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ReportTool.java 13 Jun 2007 20:17:33 -0000 1.8 --- ReportTool.java 19 Jun 2007 08:21:14 -0000 1.9 *************** *** 545,549 **** nativeContent("</td>"); ! getCsvWriter().cell(af.format(value)); } /** --- 545,549 ---- nativeContent("</td>"); ! getCsvWriter().cell(new Double(value)); } /** |
From: Hirzel P. <ph...@us...> - 2007-06-19 07:39:45
|
Update of /cvsroot/tcotool/TCO-Tool/meta-inf In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14481/meta-inf Modified Files: MANIFEST.MF Log Message: Unnecessary Class Path removed Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/meta-inf/MANIFEST.MF,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MANIFEST.MF 29 Aug 2005 09:41:17 -0000 1.1.1.1 --- MANIFEST.MF 19 Jun 2007 07:39:45 -0000 1.2 *************** *** 1,4 **** Manifest-Version: 1.0 ! Class-Path: jcommon-0.9.6.jar Main-Class: org.tcotool.application.LauncherView --- 1,4 ---- Manifest-Version: 1.0 ! Class-Path: Main-Class: org.tcotool.application.LauncherView |
From: Hirzel P. <ph...@us...> - 2007-06-19 07:03:58
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32091/src/org/tcotool/standard/report Modified Files: ReportInvestment.java ReportTco.java ReportStaff.java Log Message: Refactoring: JOMM API (DbComparatorType removed) Index: ReportInvestment.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportInvestment.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportInvestment.java 29 Jun 2006 22:50:05 -0000 1.4 --- ReportInvestment.java 19 Jun 2007 07:03:57 -0000 1.5 *************** *** 27,32 **** import ch.softenvironment.client.ResourceManager; ! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.Tracer; --- 27,33 ---- import ch.softenvironment.client.ResourceManager; ! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.util.ListUtils; import ch.softenvironment.util.Tracer; *************** *** 85,89 **** // print data by CostType try { ! Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 86,90 ---- // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); Index: ReportTco.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTco.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReportTco.java 29 Jun 2006 22:50:05 -0000 1.5 --- ReportTco.java 19 Jun 2007 07:03:57 -0000 1.6 *************** *** 22,27 **** import org.tcotool.application.*; ! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.NlsUtils; import ch.softenvironment.util.Tracer; --- 22,28 ---- import org.tcotool.application.*; ! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.util.ListUtils; import ch.softenvironment.util.NlsUtils; import ch.softenvironment.util.Tracer; *************** *** 84,88 **** // print data by CostType try { ! Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 85,89 ---- // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); Index: ReportStaff.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportStaff.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReportStaff.java 13 Jun 2007 20:17:33 -0000 1.5 --- ReportStaff.java 19 Jun 2007 07:03:57 -0000 1.6 *************** *** 24,29 **** import org.tcotool.application.*; ! import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.NlsUtils; import ch.softenvironment.util.StringUtils; --- 24,30 ---- import org.tcotool.application.*; ! import ch.softenvironment.jomm.mvc.controller.DbObjectEvaluator; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.util.ListUtils; import ch.softenvironment.util.NlsUtils; import ch.softenvironment.util.StringUtils; *************** *** 157,161 **** // print data by CostType try { ! Iterator types = DbCodeTypeComparator.sort(codes, DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 158,162 ---- // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:17
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2300/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance/resources Added Files: ReportPlugin.properties ReportPlugin_de.properties Log Message: Release V1.4.4 --- NEW FILE: ReportPlugin_de.properties --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ReportPlugin.properties --- MniReportFinancialTotal_text = Depreciation Report CTLinearDepreciation = Linear Depreciation CTDegressiveDepreciation = Geometric degressive Depreciation CQFactCostIncluded = (for Factcosts/Investments with depreciation-duration > 12 months) |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:05
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1878/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance/resources Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance/resources added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:05
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1878/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:04
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1878/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment/tcotool/finance added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:04
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1878/plugins/ch.softenvironment.tcotool.finance/resources/ch Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:31:04
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1878/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources/ch/softenvironment added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:30:35
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/classes In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1779/plugins/ch.softenvironment.tcotool.finance/classes Added Files: README.txt Log Message: Release V1.4.4 --- NEW FILE: README.txt --- This folder is specified in JPF manifest "plugin.xml" (see library tag) and therefore expected during application runtime. |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:30:34
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1779/plugins/ch.softenvironment.tcotool.finance Added Files: plugin.xml Log Message: Release V1.4.4 --- NEW FILE: plugin.xml --- <?xml version="1.0" ?> <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd"> <plugin id="ch.softenvironment.tcotool.finance" version="0.0.1" class="ch.softenvironment.tcotool.finance.ReportPlugin"> <requires> <import plugin-id="org.tcotool.core.runtime"/> </requires> <runtime> <library id="seFinance" path="classes/" type="code"> <export prefix="*"/> </library> <!--library type="resources" path="resources/" id="propertiesAndIcons"/--> <library type="resources" path="resources/" id="rsc"/> </runtime> <extension plugin-id="org.tcotool.core.runtime" point-id="ReportFinance" id="depreciation"> <parameter id="class" value="ch.softenvironment.tcotool.finance.ReportPlugin"/> <parameter id="textKey" value="MniReportFinancialTotal_text"/> <parameter id="icon" value="MenuIcon.png"/> <parameter id="hasLeadingSeparator" value="true"/> <parameter id="isGroupSpecific" value="true"/> </extension> </plugin> |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:30:34
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1779/plugins/ch.softenvironment.tcotool.finance/resources Added Files: MenuIcon.png ReportHeader.png Log Message: Release V1.4.4 --- NEW FILE: MenuIcon.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ReportHeader.png --- (This appears to be a binary file; contents omitted.) |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:30:02
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/classes In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1371/plugins/ch.softenvironment.tcotool.finance/classes Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/classes added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:29:44
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1353/plugins/ch.softenvironment.tcotool.finance/resources Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/resources added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:28:45
|
Update of /cvsroot/tcotool/TCO-Tool/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv915/other Modified Files: README Log Message: Release V1.4.4 Index: README =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/other/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 7 Dec 2005 12:56:31 -0000 1.4 --- README 13 Jun 2007 20:28:42 -0000 1.5 *************** *** 16,23 **** - JOMM *) -> @see http://sourceforge.net/projects/jomm (Persistency mapping Framework SQL & XML) - jta.jar -> @see http://java.sun.com/products/jta/ (Java Transaction API) ! - xerces.jar V1.4.4 -> @see http://xml.apache.org/ (XML Framework) ! - JFreeChart V0.9.21 -> @see http://www.jfree.org/jfreechart/ (Chart drawing) - JHotDraw V60b1 -> @see http://www.jhotdraw.org/ (Dependency Graph) ! - JPF V0.7 -> @see http://jpf.sourceforge.net/ (Plugin Support) - TCO-Tool -> @see http://sourceforge.net/projects/tcotool/ (source-archive) --- 16,23 ---- - JOMM *) -> @see http://sourceforge.net/projects/jomm (Persistency mapping Framework SQL & XML) - jta.jar -> @see http://java.sun.com/products/jta/ (Java Transaction API) ! - xerces.jar V2.9.0 -> @see http://xml.apache.org/ (XML Framework) ! - JFreeChart -> @see http://www.jfree.org/jfreechart/ (Chart drawing) - JHotDraw V60b1 -> @see http://www.jhotdraw.org/ (Dependency Graph) ! - JPF -> @see http://jpf.sourceforge.net/ (Plugin Support) - TCO-Tool -> @see http://sourceforge.net/projects/tcotool/ (source-archive) |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:21:38
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool/finance In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30360/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool/finance Added Files: FinancialCalculator.java ReportDepreciation.java ReportPlugin.java Log Message: Release V1.4.4 --- NEW FILE: FinancialCalculator.java --- package ch.softenvironment.tcotool.finance; /* * Copyright (C) 2004-2006 Peter Hirzel softEnvironment (http://www.softenvironment.ch). * All rights reserved. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ import java.util.ArrayList; import java.util.List; import org.tcotool.model.*; import org.tcotool.tools.Calculator; import org.tcotool.tools.ModelUtility; import ch.softenvironment.math.FinancialUtils; /** * Calculate Costs of TCO-Configuration by storing Depreciation-costs for each * Service individually. * * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2007/06/13 20:21:38 $ */ public class FinancialCalculator extends Calculator { // kind of costs public static final String DEPRECIATION_LINEAR = "DEPR_LIN_"; public static final String DEPRECIATION_GEOMETRIC_DEGRESSIVE = "DEPR_DEGR"; /** * @see #Calculator(ModelUtility, TcoObject, long, ServiceCategory, Responsibility) */ public FinancialCalculator(ModelUtility utility, TcoObject rootObject, long maxDurationMonths) { super(utility, rootObject, maxDurationMonths); } /** * Cummulate the Depreciation-Costs for given cost. * Consider FactCost's with a depreciationDuration > 1 year * * Overwrites. */ protected void calcFinances(Service service, CostDriver driver, Cost cost, double factor) { if (cost instanceof FactCost) { FactCost fCost = (FactCost)cost; if ((fCost.getDepreciationDuration() != null) && (fCost.getDepreciationDuration().longValue() > 12.0)) { // [0] total FactCost independent of depreciation double capital = fCost.getAmount().doubleValue() * factor; cummulateCodes(service, driver, cost, DEPRECIATION_LINEAR, INDEX_TOTAL, capital); cummulateCodes(service, driver, cost, DEPRECIATION_GEOMETRIC_DEGRESSIVE, INDEX_TOTAL, capital); // [1..fCost.depreciationYears] of first period of FactCost's depreciationDuration int year = calcDepreciation(service, driver, fCost, capital, INDEX_TOTAL); // [after fCost.depreciationYears years] repeatable periods if ((cost.getRepeatable() != null) && cost.getRepeatable().booleanValue() && (year < getDurationYears())) { // repeat the costs until maxDuration while (year < getDurationYears()) { //TODO Check: problably degressive depreciation costs from duration before are not calculated further on, which would go infinitely down to 0 year = calcDepreciation(service, driver, fCost, capital, year); } } } } } /** * Calc the <b>linear depreciation</b> over the whole FactCost-DepreciationDuration. * Algorithm: * - Linear Depreciation * @param costCapital * @param costDuration * @return year of last Cost-entry */ private int calcDepreciation(Service service, CostDriver driver, FactCost cost, double costCapital, int yearIndex) { int duration = cost.getDepreciationDuration().intValue(); int completeYears = duration / 12; if (duration % 12 > 0) { // consider a partial duration after last complete year as one more year completeYears++; } int year = 0; for (; year<completeYears; year++) { int period = year + 1; double amount /*[de] Buchwert*/ = FinancialUtils.calcDepreciationLinear(costCapital, completeYears, period); // depreciation over full year cummulateCodes(service, driver, cost, DEPRECIATION_LINEAR, yearIndex + period, amount); amount /*[de] Buchwert*/ = FinancialUtils.calcDepreciationGeometricDegressive(costCapital, utility.getInterestRate(), period); // depreciation over full year cummulateCodes(service, driver, cost, DEPRECIATION_GEOMETRIC_DEGRESSIVE, yearIndex + period, amount); } return year + yearIndex; } /** * Return cost-list over given object. * @param object null for all services * @return [FactCosts_Total; Depreciation_Year1;.. TCO_YearN] */ public List getDepreciationCostBlock(TcoObject object, final String type) { //TODO make method protected (@see DepreciationCalculatorTestCase) TcoObject costObject = (object == null ? rootObject : object); List costs = new ArrayList(); List totalFacts = getTotalCosts(costObject, type); costs.add(new Double(FinancialCalculator.getValue(totalFacts, FinancialCalculator.INDEX_TOTAL))); for (int i=0; i<getDurationYears(); i++) { // print Depreciation-Years int index = i + INDEX_TOTAL + 1; costs.add(new Double(FinancialCalculator.getValue(totalFacts, index))); } return costs; } } --- NEW FILE: ReportPlugin.java --- package ch.softenvironment.tcotool.finance; /* * Copyright (C) 2006 Peter Hirzel softEnvironment (http://www.softenvironment.ch). * All rights reserved. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ import javax.swing.JComponent; import javax.swing.JMenuItem; import org.java.plugin.Plugin; import org.tcotool.application.LauncherView; import org.tcotool.core.runtime.ApplicationPlugin; import org.tcotool.model.TcoObject; import org.tcotool.model.TcoPackage; import org.tcotool.pluginsupport.PluginUtility; import org.tcotool.standard.report.ReportTool; /** * Free <i>soft</i>Environment Plugins (might serve as sample). * PLUGIN_ID = "ch.softenvironment.tcotool.finance"; * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2007/06/13 20:21:38 $ */ public final class ReportPlugin extends Plugin implements org.tcotool.pluginsupport.Menu { protected static final String REPORT_HEADER = "ReportHeader.png"; /** * Constructor. */ public ReportPlugin() { super(); } /** * @see org.java.plugin.Plugin#doStart() */ protected void doStart() throws Exception { } /** * @see org.java.plugin.Plugin#doStop() */ protected void doStop() throws Exception { } /** * Menu was clicked -> generate the report. * @see org.tcotool.pluginsupport.Menu#init(javax.swing.JComponent) */ public void actionPerform(final JComponent item, final Object object) { ApplicationPlugin.showBusy(new Runnable() { public void run() { try { String actionCommand = ((JMenuItem)item).getActionCommand(); if (actionCommand.equals("depreciation" /*@see plugin.xml=>id*/)) { reportFinancialTotal(getTcoPackage(object)); } } catch(Throwable e) { LauncherView.getInstance().handleException(e); } } }); } /** * Depreciation-Report. */ private void reportFinancialTotal(TcoObject root) throws Throwable { LauncherView.getInstance().addReport(ReportDepreciation.createBlockDepreciation(getTcoPackage(root), ReportTool.getDepreciationDuration(), PluginUtility.getClassLoader(this))); } private TcoPackage getTcoPackage(Object object) { if (object == null) { return (TcoPackage)LauncherView.getInstance().getUtility().getRoot(); } else { return (TcoPackage)object; } } } --- NEW FILE: ReportDepreciation.java --- package ch.softenvironment.tcotool.finance; /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import java.io.IOException; import java.util.*; import org.tcotool.model.*; import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.Calculator; import org.tcotool.application.*; import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.serialize.AttributeList; /** * Utility to report financial depreciation (bookings) * Calculations as Plugin for TCO-Tool. * Design Pattern: Visitor * * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2007/06/13 20:21:38 $ */ class ReportDepreciation extends ReportTool { private ClassLoader loader = null; protected ReportDepreciation(String title) { super(title); } /** * Summarize all Depreciation-Costs within given object and subpackages. */ public static ReportTool createBlockDepreciation(TcoObject root, long maxDepreciation, ClassLoader loader) throws java.lang.Throwable { ReportDepreciation tool = new ReportDepreciation(ResourceManager.getResource(ReportPlugin.class, "MniReportFinancialTotal_text", loader)); tool.loader = loader; tool.calculator = new FinancialCalculator(LauncherView.getInstance().getUtility(), root, maxDepreciation); tool.totalCost(root); return tool; } /** * Overwrites. */ public void startBody(AttributeList list) throws IOException { super.startBody(list); java.net.URL url = loader.getResource(ReportPlugin.REPORT_HEADER); image(url, "", 0); } /** * Overwrites. */ protected void encodeCodes(DbObjectServer server, TcoObject root) throws Throwable { encodeDepreciation(root, ResourceManager.getResource(ReportPlugin.class, "CTLinearDepreciation", loader), FinancialCalculator.DEPRECIATION_LINEAR); encodeDepreciation(root, ResourceManager.getResource(ReportPlugin.class, "CTDegressiveDepreciation", loader), FinancialCalculator.DEPRECIATION_GEOMETRIC_DEGRESSIVE); } private void encodeDepreciation(TcoObject root, String title, final String type) throws IOException { startParagraph(); List totalCosts = ((FinancialCalculator)calculator).getDepreciationCostBlock(root, type); bold(title); simpleContent(" " + ResourceManager.getResource(ReportPlugin.class, "CQFactCostIncluded", loader) + ":" /*getRsc("CIFactCostOverAll")*/); breakLine(); startTable(1); startTableRow(); tableHeader("0. " + getRsc("CIYear")); for (int year=0; year<calculator.getDurationYears(); year++) { //TODO consider partial year /* String partialYear = ""; if ((calculator.getMaxDurationMonths() - year * 12) < 12) { partialYear = " [" + NlsUtils.formatMessage("<br>" + getRsc("CIPartialYear"), (int)calculator.getMaxDurationMonths() % 12) + "]"; } */ String tmp = (year + 1) + ". " + getRsc("CIYear"); tableHeader(tmp /*+ partialYear*/); } endTableRow(); startTableRow(); for (int i=0; i<totalCosts.size(); i++) { double amount = Calculator.getValue(totalCosts, i); tableDataAmount(amount, true); } endTableRow(); endTable(); String tmp = ""; if (type.equals(FinancialCalculator.DEPRECIATION_GEOMETRIC_DEGRESSIVE)) { tmp = "; " + ResourceManager.getResourceAsNonLabeled(SystemParameterDetailView.class, "LblDepreciationInterestRate_text") + " = " + LauncherView.getInstance().getUtility().getInterestRate() + "%"; } encodeCostUnit(tmp); endParagraph(); } } |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:20:51
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29855/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment added to the repository |
From: Hirzel P. <ph...@us...> - 2007-06-13 20:20:51
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29855/plugins/ch.softenvironment.tcotool.finance/source/ch Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch added to the repository |