Menu
▾
▴
tcotool-cvs — Inform changes in CVS-Repository.
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...> - 2007-06-13 20:20:51
|
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-serv29855/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool/finance Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool/finance 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 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29855/plugins/ch.softenvironment.tcotool.finance/source Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source 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 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29855/plugins/ch.softenvironment.tcotool.finance Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance 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/softenvironment/tcotool In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29855/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool Log Message: Directory /cvsroot/tcotool/TCO-Tool/plugins/ch.softenvironment.tcotool.finance/source/ch/softenvironment/tcotool added to the repository |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:19:50
|
Update of /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29379/test/org/tcotool/tools/test Modified Files: ModelUtilityTestCase.java TcoTestSuite.java TestModel.java CalculatorTestCase.java Log Message: Release V1.4.4 Index: ModelUtilityTestCase.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/ModelUtilityTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModelUtilityTestCase.java 7 May 2006 14:59:35 -0000 1.2 --- ModelUtilityTestCase.java 13 Jun 2007 20:19:50 -0000 1.3 *************** *** 41,45 **** --- 41,47 ---- } public void tearDown() { + // javax.jdo.PersistenceManagerFactory factory = m.server.getPersistenceManagerFactory(); m.server.close(); + // factory.close(); } public void testTcoModel() { Index: TestModel.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/TestModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestModel.java 7 May 2006 14:59:35 -0000 1.3 --- TestModel.java 13 Jun 2007 20:19:50 -0000 1.4 *************** *** 10,14 **** import ch.softenvironment.jomm.DbObjectServer; - import ch.softenvironment.util.DeveloperException; /* --- 10,13 ---- *************** *** 44,53 **** private DbObjectServer initializeDatabase() { - try { - org.tcotool.TcotoolUtility.registerClasses(); - } catch(DeveloperException e) { - //TODO hack against static re-evalution => use JUnit TestSetup instead - // ignore: re-Registering caused by TestCase#setUp() - } javax.jdo.PersistenceManagerFactory pmFactory = new ch.softenvironment.jomm.target.xml.XmlObjectServerFactory(); pmFactory.setConnectionURL("tcotool.model"); --- 43,46 ---- *************** *** 55,59 **** // pmFactory.setNontransactionalWrite(false); // NO autoCommit while writing ! return (DbObjectServer)pmFactory.getPersistenceManager(System.getProperty("user.name"), null); } public TestModel() throws Throwable { --- 48,54 ---- // pmFactory.setNontransactionalWrite(false); // NO autoCommit while writing ! DbObjectServer server = (DbObjectServer)pmFactory.getPersistenceManager(System.getProperty("user.name"), null); ! org.tcotool.TcotoolUtility.registerClasses(server); ! return server; } public TestModel() throws Throwable { Index: TcoTestSuite.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/TcoTestSuite.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TcoTestSuite.java 29 Aug 2005 09:41:17 -0000 1.1.1.1 --- TcoTestSuite.java 13 Jun 2007 20:19:50 -0000 1.2 *************** *** 16,21 **** */ ! import org.tcotool.standard.report.test.ReportToolTestCase; ! import ch.softenvironment.util.Tracer; --- 16,21 ---- */ ! import ch.softenvironment.tcotool.benchmark.test.InterviewMaschineTestCase; ! import ch.softenvironment.tcotool.vbs.test.DepreciationCalculatorTestCase; import ch.softenvironment.util.Tracer; *************** *** 48,56 **** */ public static junit.framework.Test suite() { ! TestSuite suite = new TestSuite("Tco-Tool tests"); suite.addTest(new TestSuite(ModelUtilityTestCase.class)); suite.addTest(new TestSuite(CalculatorTestCase.class)); ! suite.addTest(new TestSuite(ReportToolTestCase.class)); ! return suite; } --- 48,57 ---- */ public static junit.framework.Test suite() { ! TestSuite suite = new TestSuite("TCO-Tool tests"); suite.addTest(new TestSuite(ModelUtilityTestCase.class)); suite.addTest(new TestSuite(CalculatorTestCase.class)); ! suite.addTest(new TestSuite(DepreciationCalculatorTestCase.class)); ! suite.addTest(new TestSuite(InterviewMaschineTestCase.class)); ! //TODO include suite.addTest(new XmlMapperSuite()); return suite; } Index: CalculatorTestCase.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/test/org/tcotool/tools/test/CalculatorTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CalculatorTestCase.java 7 May 2006 14:59:35 -0000 1.2 --- CalculatorTestCase.java 13 Jun 2007 20:19:50 -0000 1.3 *************** *** 16,20 **** */ - import org.tcotool.model.FactCost; import org.tcotool.model.PersonalCost; import org.tcotool.model.TcoObject; --- 16,19 ---- *************** *** 22,27 **** import org.tcotool.tools.ModelUtility; - import ch.softenvironment.math.MathUtils; - import junit.framework.TestCase; --- 21,24 ---- *************** *** 49,53 **** --- 46,52 ---- } public void tearDown() { + // javax.jdo.PersistenceManagerFactory factory = m.server.getPersistenceManagerFactory(); m.server.close(); + // factory.close(); } public void testMultitudeFactor() { |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:17:35
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28516/src/org/tcotool/standard/report Modified Files: ReportComplete.java ReportTool.java ReportStaff.java Log Message: Release V1.4.4 Index: ReportComplete.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportComplete.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportComplete.java 13 Jan 2006 17:43:28 -0000 1.3 --- ReportComplete.java 13 Jun 2007 20:17:33 -0000 1.4 *************** *** 24,28 **** import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.util.NlsUtils; - import ch.softenvironment.util.Tracer; import ch.softenvironment.client.ResourceManager; --- 24,27 ---- *************** *** 166,170 **** if (!ch.softenvironment.util.StringUtils.isNullOrEmpty(object.getDocumentation())) { startTableRow(); ! tableData(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text", true), abstractCell); tableData(object.getDocumentation()); endTableRow(); --- 165,169 ---- if (!ch.softenvironment.util.StringUtils.isNullOrEmpty(object.getDocumentation())) { startTableRow(); ! tableData(ResourceManager.getResourceAsLabel(ServiceDetailView.class, "PnlNote_text"), abstractCell); tableData(object.getDocumentation()); endTableRow(); *************** *** 178,194 **** startTableRow(); // print header ! tableHeader(ResourceManager.getResource(ServiceDetailView.class, "LblName_text", false)); tableHeader(ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text")); ! tableHeader(ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text", false)); tableHeader(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text")); ! tableHeader(ResourceManager.getResource(FactCostDetailView.class, "LblCurrency_text", false)); if (costClass.equals(PersonalCost.class)) { tableHeader(ResourceManager.getResource(PersonalCostDetailView.class, "ChxInternal_text")); tableHeader(ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")); tableHeader("h"); // [hours] ! tableHeader(ResourceManager.getResource(RoleDetailView.class, "LblHourlyRate_text", false)); ! tableHeader(ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false)); } else if (costClass.equals(FactCost.class)) { ! tableHeader(ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false)); } tableHeader(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); --- 177,193 ---- startTableRow(); // print header ! tableHeader(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblName_text")); tableHeader(ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text")); ! tableHeader(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblMultitude_text")); tableHeader(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text")); ! tableHeader(ResourceManager.getResourceAsNonLabeled(FactCostDetailView.class, "LblCurrency_text")); if (costClass.equals(PersonalCost.class)) { tableHeader(ResourceManager.getResource(PersonalCostDetailView.class, "ChxInternal_text")); tableHeader(ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")); tableHeader("h"); // [hours] ! tableHeader(ResourceManager.getResourceAsNonLabeled(RoleDetailView.class, "LblHourlyRate_text")); ! tableHeader(ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text")); } else if (costClass.equals(FactCost.class)) { ! tableHeader(ResourceManager.getResourceAsNonLabeled(CatalogueDetailView.class, "FrmWindow_text")); } tableHeader(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); *************** *** 209,213 **** tableData(((PersonalCost)cost).getRole() == null ? "" : ((PersonalCost)cost).getRole().getNameString()); tableData(((PersonalCost)cost).getHours() == null ? "" : ((PersonalCost)cost).getHours().toString()); ! tableData(((PersonalCost)cost).getHourlyRate() == null ? "" : ch.softenvironment.util.AmountFormat.toString(((PersonalCost)cost).getHourlyRate())); tableData(((PersonalCost)cost).getActivity() == null ? "" : ((PersonalCost)cost).getActivity().getNameString()); } else if (costClass.equals(FactCost.class)) { --- 208,212 ---- tableData(((PersonalCost)cost).getRole() == null ? "" : ((PersonalCost)cost).getRole().getNameString()); tableData(((PersonalCost)cost).getHours() == null ? "" : ((PersonalCost)cost).getHours().toString()); ! tableData(((PersonalCost)cost).getHourlyRate() == null ? "" : af.format(((PersonalCost)cost).getHourlyRate().doubleValue())); tableData(((PersonalCost)cost).getActivity() == null ? "" : ((PersonalCost)cost).getActivity().getNameString()); } else if (costClass.equals(FactCost.class)) { Index: ReportTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ReportTool.java 29 Jun 2006 22:50:05 -0000 1.7 --- ReportTool.java 13 Jun 2007 20:17:33 -0000 1.8 *************** *** 27,34 **** --- 27,36 ---- import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.mvc.model.DbCodeType; + import ch.softenvironment.jomm.mvc.model.DbEnumeration; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.jomm.serialize.AttributeList; import ch.softenvironment.jomm.serialize.CsvSerializer; import ch.softenvironment.jomm.serialize.HtmlSerializer; + import ch.softenvironment.util.AmountFormat; import ch.softenvironment.util.StringUtils; import ch.softenvironment.util.Tracer; *************** *** 48,52 **** private static final long DEFAULT_DURATION = 48; protected Calculator calculator = null; ! protected String title = ""; // CSV-support --- 50,54 ---- private static final long DEFAULT_DURATION = 48; protected Calculator calculator = null; ! protected String title = ""; // CSV-support *************** *** 56,60 **** // formatting ! protected java.text.NumberFormat amountFormat = null; protected java.text.NumberFormat hourFormat = null; // private AttributeList alignRight = null; --- 58,62 ---- // formatting ! protected java.text.NumberFormat af = AmountFormat.getAmountInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); protected java.text.NumberFormat hourFormat = null; // private AttributeList alignRight = null; *************** *** 73,77 **** this.title = title; - amountFormat = ch.softenvironment.util.AmountFormat.getAmountInstance(); hourFormat = java.text.NumberFormat.getNumberInstance(); hourFormat.setMinimumFractionDigits(1); --- 75,78 ---- *************** *** 89,95 **** try { SystemParameter sysParams = LauncherView.getInstance().getUtility().getSystemParameter(); ! if (sysParams.getReportCostExponent().getIliCode().equals(CostExponent.INTHOUSAND)) { exponent = 1; ! } else if (sysParams.getReportCostExponent().getIliCode().equals(CostExponent.INMILLION)) { exponent = 2; } --- 90,96 ---- try { SystemParameter sysParams = LauncherView.getInstance().getUtility().getSystemParameter(); ! if (DbEnumeration.isIliCode(sysParams.getReportCostExponent(), CostExponent.INTHOUSAND)) { exponent = 1; ! } else if (DbEnumeration.isIliCode(sysParams.getReportCostExponent(), CostExponent.INMILLION)) { exponent = 2; } *************** *** 99,109 **** switch (exponent) { case 1: { ! return amountFormat.format(value/1000.0); } case 2: { ! return amountFormat.format(value/1000000.0); } default: { ! return amountFormat.format(value); } } --- 100,110 ---- switch (exponent) { case 1: { ! return af.format(value/1000.0); } case 2: { ! return af.format(value/1000000.0); } default: { ! return af.format(value); } } *************** *** 146,173 **** } /** ! * Encode the costs sorted <b>by CostCause</b> in a Block (HTML-Table) ! * for TCO or Depreciation. * If (printDetails==true) then all Service's (either the given * root itself or the owned services of a group represented by object) * will be printed separately in an own such block. * @param root TcoPackage or Service ! * @deprecated (redesign generic approach, cause to much overhead with CostCause-list) */ protected void encodeCostBlock(TcoObject root, List codes, final String codeUndefined, String title) throws IOException { } /** * @see #getCostUnit() */ ! protected void encodeCostUnit(String currency) throws java.io.IOException { String tmp = getRsc("CICostExponent") + " ["; ! italic(tmp + getCostUnit() + "]" + currency); try { ! // in csv costs are always as is ! getCsvWriter().cell(tmp + LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency() + "]" + currency); } catch(Throwable e) { ch.softenvironment.util.Tracer.getInstance().runtimeWarning("INGORED: SystemParameters FAILURE: " + e.getLocalizedMessage()); ! getCsvWriter().cell(tmp + UNKNOWN + "]" + currency); } } --- 147,178 ---- } /** ! * Generic method to encode a block of costs related to given codes. ! * * If (printDetails==true) then all Service's (either the given * root itself or the owned services of a group represented by object) * will be printed separately in an own such block. * @param root TcoPackage or Service ! * @deprecated (redesign evtl. not really useful in a generic way) */ protected void encodeCostBlock(TcoObject root, List codes, final String codeUndefined, String title) throws IOException { } + /** + * Write a text in what unit and currency the listed costs are represented, for e.g. + * "All costs in [kCHF]; %5.3" * @see #getCostUnit() + * @param suffix (for e.g. "; %5.3") */ ! protected void encodeCostUnit(final String suffix) throws java.io.IOException { String tmp = getRsc("CICostExponent") + " ["; ! italic(tmp + getCostUnit() + "]" + suffix); try { ! // in csv costs are always as is (without unit!) ! getCsvWriter().cell(tmp + LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString() + "]" + suffix); } catch(Throwable e) { ch.softenvironment.util.Tracer.getInstance().runtimeWarning("INGORED: SystemParameters FAILURE: " + e.getLocalizedMessage()); ! getCsvWriter().cell(tmp + UNKNOWN + "]" + suffix); } } *************** *** 308,314 **** try { SystemParameter sysParams = LauncherView.getInstance().getUtility().getSystemParameter(); ! if (sysParams.getReportCostExponent().getIliCode().equals(CostExponent.INTHOUSAND)) { unit = getRsc("CIInKilo") + " "; ! } else if (sysParams.getReportCostExponent().getIliCode().equals(CostExponent.INMILLION)) { unit = getRsc("CIInMillion") + " "; } --- 313,319 ---- try { SystemParameter sysParams = LauncherView.getInstance().getUtility().getSystemParameter(); ! if (DbEnumeration.isIliCode(sysParams.getReportCostExponent(), CostExponent.INTHOUSAND)) { unit = getRsc("CIInKilo") + " "; ! } else if (DbEnumeration.isIliCode(sysParams.getReportCostExponent(), CostExponent.INMILLION)) { unit = getRsc("CIInMillion") + " "; } *************** *** 463,467 **** nativeContent("<td>" + (bold ? "<b>" : "") + "<a href=\"" + ((DbObject)object).getId() + "\">" + encodeString(object.getNameString()) + (bold ? "</b>" : "") + "</td>"); ! getCsvWriter().cell(object.getName()); } /** --- 468,472 ---- nativeContent("<td>" + (bold ? "<b>" : "") + "<a href=\"" + ((DbObject)object).getId() + "\">" + encodeString(object.getNameString()) + (bold ? "</b>" : "") + "</td>"); ! getCsvWriter().cell(object.getNameString()); } /** *************** *** 513,517 **** * Overwrites. */ ! public void tableData(String text, AttributeList attrs) throws IOException { super.tableData(text, attrs); --- 518,522 ---- * Overwrites. */ ! public void tableData(final String text, AttributeList attrs) throws IOException { super.tableData(text, attrs); *************** *** 540,544 **** nativeContent("</td>"); ! getCsvWriter().cell(new Double(value)); } /** --- 545,549 ---- nativeContent("</td>"); ! getCsvWriter().cell(af.format(value)); } /** *************** *** 558,562 **** * */ ! protected void tableDataBold(String text) throws IOException { nativeContent("<td><b>" + encodeString(text) + "</b></td>"); --- 563,567 ---- * */ ! protected void tableDataBold(final String text) throws IOException { nativeContent("<td><b>" + encodeString(text) + "</b></td>"); *************** *** 594,598 **** * Overwrites. */ ! public void tableHeader(String text, AttributeList attrs) throws IOException { super.tableHeader(text, attrs); --- 599,603 ---- * Overwrites. */ ! public void tableHeader(final String text, AttributeList attrs) throws IOException { super.tableHeader(text, attrs); *************** *** 671,675 **** */ protected String getRsc(String property) { ! return ResourceManager.getResource(ReportTool.class, property, false); } /** --- 676,680 ---- */ protected String getRsc(String property) { ! return ResourceManager.getResourceAsNonLabeled(ReportTool.class, property); } /** Index: ReportStaff.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportStaff.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportStaff.java 29 Jun 2006 22:50:05 -0000 1.4 --- ReportStaff.java 13 Jun 2007 20:17:33 -0000 1.5 *************** *** 47,51 **** */ public static ReportTool createPersonalCosts(TcoPackage root) throws java.lang.Throwable { ! ReportStaff tool = new ReportStaff(ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text", true) + root.getName()); tool.calculator = new Calculator(LauncherView.getInstance().getUtility(), root, 0 /*irrelevant*/); tool.costPersonalEffort(root); --- 47,51 ---- */ public static ReportTool createPersonalCosts(TcoPackage root) throws java.lang.Throwable { ! ReportStaff tool = new ReportStaff(ResourceManager.getResourceAsLabel(PersonalCostDetailView.class, "FrmWindow_text") + root.getName()); tool.calculator = new Calculator(LauncherView.getInstance().getUtility(), root, 0 /*irrelevant*/); tool.costPersonalEffort(root); *************** *** 80,84 **** tableHeader(ResourceManager.getResource(PersonalCostDetailView.class, "ChxInternal_text")); tableHeader("[h]"); ! tableHeader(ResourceManager.getResource(RoleDetailView.class, "LblYearlyHours_text", false) + " ~"); endTableRow(); startTableRow(); --- 80,84 ---- tableHeader(ResourceManager.getResource(PersonalCostDetailView.class, "ChxInternal_text")); tableHeader("[h]"); ! tableHeader(ResourceManager.getResourceAsNonLabeled(RoleDetailView.class, "LblYearlyHours_text") + " ~"); endTableRow(); startTableRow(); *************** *** 132,136 **** endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Activity.class), Calculator.ACTIVITY_UNDEFINED, ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false)); endParagraph(); } --- 132,136 ---- endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Activity.class), Calculator.ACTIVITY_UNDEFINED, ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text")); endParagraph(); } *************** *** 171,175 **** // ch.softenvironment.jomm.serialize.AttributeList attrs = getAlignRight(); ! String cellName = ResourceManager.getResource(ServiceDetailView.class, "TbcTotal_text", false); // the final summarization without Dependencies --- 171,175 ---- // ch.softenvironment.jomm.serialize.AttributeList attrs = getAlignRight(); ! String cellName = ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "TbcTotal_text"); // the final summarization without Dependencies |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:17:35
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28516/src/org/tcotool/tools Modified Files: ModelUtility.java Calculator.java Log Message: Release V1.4.4 Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ModelUtility.java 29 Jun 2006 22:50:05 -0000 1.10 --- ModelUtility.java 13 Jun 2007 20:17:33 -0000 1.11 *************** *** 766,770 **** public java.lang.String getToolTip(java.lang.Object node) { // return ch.softenvironment.util.StringUtils.getPureClassName(node); ! return ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text", false) + " = " + ((TcoObject)node).getMultitude(); } /** --- 766,770 ---- public java.lang.String getToolTip(java.lang.Object node) { // return ch.softenvironment.util.StringUtils.getPureClassName(node); ! return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblMultitude_text") + " = " + ((TcoObject)node).getMultitude(); } /** *************** *** 787,814 **** // DbEnumeration's } else if (type.equals(CostCause.class)) { ! return ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false); // DbCode's } else if (type.equals(ServiceCategory.class)) { //TODO HACK //return "Clinical Symptom"; ! return ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false); } else if (type.equals(Responsibility.class)) { ! return ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false); } else if (type.equals(CostCentre.class)) { ! return ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false); } else if (type.equals(Process.class)) { ! return ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text", false); } else if (type.equals(ProjectPhase.class)) { ! return ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false); } else if (type.equals(LifeCycle.class)) { ! return ResourceManager.getResource(CostDriverDetailView.class, "LblCycle_text", false); } else if (type.equals(Site.class)) { ! return ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false); } else if (type.equals(Catalogue.class)) { ! return ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false); } else if (type.equals(Role.class)) { ! return ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false); } else if (type.equals(Activity.class)) { ! return ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false); } Tracer.getInstance().developerWarning("String for type: " + type); --- 787,814 ---- // DbEnumeration's } else if (type.equals(CostCause.class)) { ! return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "TbcCosttype_text"); // DbCode's } else if (type.equals(ServiceCategory.class)) { //TODO HACK //return "Clinical Symptom"; ! return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblCategory_text"); } else if (type.equals(Responsibility.class)) { ! return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblResponsibility_text"); } else if (type.equals(CostCentre.class)) { ! return ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblCostCentre_text"); } else if (type.equals(Process.class)) { ! return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblProcess_text"); } else if (type.equals(ProjectPhase.class)) { ! return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblPhase_text"); } else if (type.equals(LifeCycle.class)) { ! return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblCycle_text"); } else if (type.equals(Site.class)) { ! return ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblSite_text"); } else if (type.equals(Catalogue.class)) { ! return ResourceManager.getResourceAsNonLabeled(CatalogueDetailView.class, "FrmWindow_text"); } else if (type.equals(Role.class)) { ! return ResourceManager.getResourceAsNonLabeled(RoleDetailView.class, "FrmWindow_text"); } else if (type.equals(Activity.class)) { ! return ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text"); } Tracer.getInstance().developerWarning("String for type: " + type); Index: Calculator.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/Calculator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Calculator.java 29 Jun 2006 22:50:05 -0000 1.5 --- Calculator.java 13 Jun 2007 20:17:33 -0000 1.6 *************** *** 28,31 **** --- 28,32 ---- import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.math.MathUtils; import ch.softenvironment.util.AmountFormat; import ch.softenvironment.util.DeveloperException; |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:16:38
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28100/src/org/tcotool/standard/drawing Modified Files: DependencyView.java NodeFigure.java Log Message: Release V1.4.4 Index: DependencyView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DependencyView.java 29 Jun 2006 22:50:05 -0000 1.6 --- DependencyView.java 13 Jun 2007 20:16:38 -0000 1.7 *************** *** 53,57 **** // Menu Checkboxes private boolean showDependencyDistribution = true; ! private boolean showCosts = true; /** * ClassDiagramView constructor comment. --- 53,57 ---- // Menu Checkboxes private boolean showDependencyDistribution = true; ! // private boolean showCosts = true; /** * ClassDiagramView constructor comment. *************** *** 138,143 **** */ public void addViewChangeListener(ViewChangeListener vsl) { ! // TODO Auto-generated method stub ! } /** --- 138,142 ---- */ public void addViewChangeListener(ViewChangeListener vsl) { ! // nothing to do } /** *************** *** 258,262 **** */ public UndoManager getUndoManager() { - // TODO Auto-generated method stub return undoManager; } --- 257,260 ---- *************** *** 265,269 **** */ protected boolean isShowDependencyDistribution() { - //TODO return showDependencyDistribution; } --- 263,266 ---- *************** *** 360,364 **** */ public void removeViewChangeListener(ViewChangeListener vsl) { ! // TODO Auto-generated method stub } /** --- 357,361 ---- */ public void removeViewChangeListener(ViewChangeListener vsl) { ! // nothing to do } /** *************** *** 367,371 **** */ protected void showAllCosts(boolean visible) { ! showCosts = visible; FigureEnumeration enumeration = drawing().figures(); --- 364,368 ---- */ protected void showAllCosts(boolean visible) { ! // showCosts = visible; FigureEnumeration enumeration = drawing().figures(); *************** *** 381,386 **** */ public void showStatus(String string) { ! // TODO Auto-generated method stub ! } /** --- 378,382 ---- */ public void showStatus(String string) { ! // nothing to do } /** *************** *** 399,404 **** */ public void toolDone() { ! // TODO Auto-generated method stub ! } /* (non-Javadoc) --- 395,399 ---- */ public void toolDone() { ! // nothing to do } /* (non-Javadoc) *************** *** 406,410 **** */ public DrawingView view() { - // TODO Auto-generated method stub return this; } --- 401,404 ---- *************** *** 413,417 **** */ public DrawingView[] views() { - // TODO Auto-generated method stub return null; } --- 407,410 ---- Index: NodeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/NodeFigure.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NodeFigure.java 29 Jun 2006 22:50:05 -0000 1.6 --- NodeFigure.java 13 Jun 2007 20:16:38 -0000 1.7 *************** *** 49,52 **** --- 49,53 ---- private DependencyView view = null; private PresentationNode node = null; // persistent + private java.text.NumberFormat af = AmountFormat.getAmountInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); private String totalCost = null; *************** *** 452,456 **** nameFigure.setText(((TcoObject)getModelElement()).getName()); if (totalCost == null) { ! totalCost = ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text") + " = " + AmountFormat.toString(view.getCalculator().calcTcoOverall((TcoObject)getModelElement())); } costFigure.setText(totalCost); --- 453,457 ---- nameFigure.setText(((TcoObject)getModelElement()).getName()); if (totalCost == null) { ! totalCost = ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text") + " = " + af.format(view.getCalculator().calcTcoOverall((TcoObject)getModelElement())); } costFigure.setText(totalCost); |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:16:38
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28100/src/org/tcotool/standard/charts Modified Files: ChartTool.java Log Message: Release V1.4.4 Index: ChartTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/ChartTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChartTool.java 18 Mar 2006 17:10:45 -0000 1.4 --- ChartTool.java 13 Jun 2007 20:16:39 -0000 1.5 *************** *** 29,37 **** import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; ! import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; ! import org.jfree.chart.labels.StandardPieItemLabelGenerator; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.MultiplePiePlot; --- 29,38 ---- import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; ! //import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; ! //import org.jfree.chart.labels.StandardPieItemLabelGenerator; ! import org.jfree.chart.labels.StandardPieSectionLabelGenerator; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.MultiplePiePlot; *************** *** 49,55 **** import org.tcotool.tools.Calculator; import org.tcotool.tools.ModelUtility; - import org.tcotool.model.CostCause; - import org.tcotool.model.Responsibility; - import org.tcotool.model.ServiceCategory; import org.tcotool.model.TcoPackage; --- 50,53 ---- *************** *** 137,141 **** */ private JFreeChart createBarChart(CategoryDataset categorydataset, String title, String currency) { ! JFreeChart jfreechart = ChartFactory.createBarChart(title, ch.softenvironment.client.ResourceManager.getResource(FactCostDetailView.class, "LblUsageDuration_text", false), currency, categorydataset, PlotOrientation.VERTICAL, true, true, --- 135,139 ---- */ private JFreeChart createBarChart(CategoryDataset categorydataset, String title, String currency) { ! JFreeChart jfreechart = ChartFactory.createBarChart(title, ch.softenvironment.client.ResourceManager.getResourceAsNonLabeled(FactCostDetailView.class, "LblUsageDuration_text"), currency, categorydataset, PlotOrientation.VERTICAL, true, true, *************** *** 224,228 **** pieplot.setBackgroundPaint(null); pieplot.setOutlineStroke(null); ! pieplot.setLabelGenerator(new StandardPieItemLabelGenerator ("{0} ({2})", NumberFormat.getNumberInstance(), --- 222,226 ---- pieplot.setBackgroundPaint(null); pieplot.setOutlineStroke(null); ! pieplot.setLabelGenerator(new StandardPieSectionLabelGenerator// StandardPieItemLabelGenerator (in JFreeCharts V0.9.6) ("{0} ({2})", NumberFormat.getNumberInstance(), |
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; } } |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:15:00
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27231/src/org/tcotool/application/resources Modified Files: splash_de.jpg splash.jpg Log Message: Release V1.4.4 Index: splash_de.jpg =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/splash_de.jpg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs5kGA7V and /tmp/cvsiP3Reg differ Index: splash.jpg =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/splash.jpg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs0UHXeY and /tmp/cvsKhtKpi differ |
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26735/src/org/tcotool/application Modified Files: ModelDetailView.java RoleDetailView.java ServiceDetailView.java PackageDetailView.java CostDriverDetailView.java NavigationView.java Formatter.java CatalogueDetailView.java RiskDialog.java FindDialog.java FactCostDetailView.java HTMLReportFrame.java AboutDialog.java CourseDetailView.java DependencyDetailView.java SystemParameterDetailView.java SiteDetailView.java PersonalCostDetailView.java OccuranceDetailView.java LauncherView.java CostCauseDetailView.java CodeDetailView.java ApplicationOptions.java Added Files: GraphicReportFrame.java Log Message: Release V1.4.4 Index: CostDriverDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CostDriverDetailView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CostDriverDetailView.java 7 May 2006 14:17:08 -0000 1.4 --- CostDriverDetailView.java 13 Jun 2007 20:13:56 -0000 1.5 *************** *** 3,8 **** --- 3,13 ---- import java.util.EventObject; + import javax.swing.JMenuItem; + import javax.swing.JSeparator; + import ch.ehi.basics.i18n.ResourceBundle; + import ch.softenvironment.util.AmountFormat; import ch.softenvironment.view.*; + import ch.softenvironment.view.swingext.JComboBoxUtility; /* * This library is free software; you can redistribute it and/or *************** *** 257,261 **** try { if (source.equals(getMniChangeCost()) || source.equals(getTblCost())) { ! java.util.List objs = getSelectedItems(getTblCost()); if (!getViewOptions().getViewManager().activateView(objs)) { ch.softenvironment.view.BaseFrame view = null; --- 262,266 ---- try { if (source.equals(getMniChangeCost()) || source.equals(getTblCost())) { ! java.util.List objs = DbTableModel.getSelectedItems(getTblCost()); if (!getViewOptions().getViewManager().activateView(objs)) { ch.softenvironment.view.BaseFrame view = null; *************** *** 270,274 **** } } else if (source.equals(getMniChangeOccurance()) || source.equals(getTblOccurance())) { ! java.util.List objects = getSelectedItems(getTblOccurance()); if (!getViewOptions().getViewManager().activateView(objects)) { openOccurance(objects); --- 275,279 ---- } } else if (source.equals(getMniChangeOccurance()) || source.equals(getTblOccurance())) { ! java.util.List objects = DbTableModel.getSelectedItems(getTblOccurance()); if (!getViewOptions().getViewManager().activateView(objects)) { openOccurance(objects); *************** *** 723,742 **** } /** - * connPtoP3SetTarget: (CbxCurrencyFact.selectedItem <--> CbxCurrencyPersonal.selectedItem) - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private void connPtoP3SetTarget() { - /* Set the target from the source */ - try { - getCbxCurrencyPersonal().setSelectedItem(getCbxCurrencyFact().getSelectedItem()); - // user code begin {1} - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - /** * connPtoP4SetSource: (Object.multitude <--> TxtMultitude.text) */ --- 728,731 ---- *************** *** 944,963 **** } /** - * connPtoP5SetTarget: (CbxCurrencyFact.selectedItem <--> CbxCurrencyTotal.selectedItem) - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private void connPtoP5SetTarget() { - /* Set the target from the source */ - try { - getCbxCurrencyTotal().setSelectedItem(getCbxCurrencyFact().getSelectedItem()); - // user code begin {1} - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - /** * connPtoP6SetSource: (ConsistencyController.isSaveable <--> PnlStandardToolbar.tbbSaveEnabled) */ --- 933,936 ---- *************** *** 1385,1389 **** ivjLblBaseDate.setText("Bezugsdatum:"); // user code begin {1} ! ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1358,1362 ---- ivjLblBaseDate.setText("Bezugsdatum:"); // user code begin {1} ! ivjLblBaseDate.setText(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1429,1433 **** ivjLblMultitude.setText("Menge:"); // user code begin {1} ! ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1402,1406 ---- ivjLblMultitude.setText("Menge:"); // user code begin {1} ! ivjLblMultitude.setText(ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1451,1455 **** ivjLblName.setText("Bezeichnung:"); // user code begin {1} ! ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1424,1428 ---- ivjLblName.setText("Bezeichnung:"); // user code begin {1} ! ivjLblName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1543,1547 **** ivjLblTotal.setForeground(java.awt.Color.red); // user code begin {1} ! ivjLblTotal.setText(ResourceManager.getResource(ServiceDetailView.class, "TbcTotal_text", true)); ivjLblTotal.setToolTipText(getResourceString("LblTotal_toolTipText")); // user code end --- 1516,1520 ---- ivjLblTotal.setForeground(java.awt.Color.red); // user code begin {1} ! ivjLblTotal.setText(ResourceManager.getResourceAsLabel(ServiceDetailView.class, "TbcTotal_text")); ivjLblTotal.setToolTipText(getResourceString("LblTotal_toolTipText")); // user code end *************** *** 1569,1574 **** ivjLblTotalFactCost.setBounds(8, 12, 308, 14); // user code begin {1} ! ivjLblTotalFactCost.setToolTipText(getResourceString(ServiceDetailView.class, "LblTotalFactCost_toolTipText")); ! ivjLblTotalFactCost.setText(getResourceString(ServiceDetailView.class, "LblTotalFactCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1542,1547 ---- ivjLblTotalFactCost.setBounds(8, 12, 308, 14); // user code begin {1} ! ivjLblTotalFactCost.setToolTipText(ResourceManager.getResource(ServiceDetailView.class, "LblTotalFactCost_toolTipText")); ! ivjLblTotalFactCost.setText(ResourceManager.getResource(ServiceDetailView.class, "LblTotalFactCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1595,1599 **** // user code begin {1} ivjLblTotalOccurance.setToolTipText(getResourceString("LblTotalOccurance_toolTipText")); ! ivjLblTotalOccurance.setText(getResourceString(ServiceDetailView.class, "TbcTotal_text") + ":"); // user code end } catch (java.lang.Throwable ivjExc) { --- 1568,1572 ---- // user code begin {1} ivjLblTotalOccurance.setToolTipText(getResourceString("LblTotalOccurance_toolTipText")); ! ivjLblTotalOccurance.setText(ResourceManager.getResource(ServiceDetailView.class, "TbcTotal_text") + ":"); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1619,1624 **** ivjLblTotalPersonalCost.setBounds(8, 39, 308, 14); // user code begin {1} ! ivjLblTotalPersonalCost.setToolTipText(getResourceString(ServiceDetailView.class, "LblTotalPersonalCost_toolTipText")); ! ivjLblTotalPersonalCost.setText(getResourceString(ServiceDetailView.class, "LblTotalPersonalCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1592,1597 ---- ivjLblTotalPersonalCost.setBounds(8, 39, 308, 14); // user code begin {1} ! ivjLblTotalPersonalCost.setToolTipText(ResourceManager.getResource(ServiceDetailView.class, "LblTotalPersonalCost_toolTipText")); ! ivjLblTotalPersonalCost.setText(ResourceManager.getResource(ServiceDetailView.class, "LblTotalPersonalCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1715,1719 **** ivjMniNewFactCost.setText("Neu Sachkosten..."); // user code begin {1} ! ivjMniNewFactCost.setText(getResourceString(FactCostDetailView.class, "FrmWindow_text") + "..."); ivjMniNewFactCost.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "FactCost.png")); // user code end --- 1688,1692 ---- ivjMniNewFactCost.setText("Neu Sachkosten..."); // user code begin {1} ! ivjMniNewFactCost.setText(ResourceManager.getResource(FactCostDetailView.class, "FrmWindow_text") + "..."); ivjMniNewFactCost.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "FactCost.png")); // user code end *************** *** 1760,1764 **** ivjMniNewPersonalCost.setText("Neu Personalaufwand..."); // user code begin {1} ! ivjMniNewPersonalCost.setText(getResourceString(PersonalCostDetailView.class, "FrmWindow_text") + "..."); ivjMniNewPersonalCost.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "PersonalCost.png")); // user code end --- 1733,1737 ---- ivjMniNewPersonalCost.setText("Neu Personalaufwand..."); // user code begin {1} ! ivjMniNewPersonalCost.setText(ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text") + "..."); ivjMniNewPersonalCost.setIcon(ResourceBundle.getImageIcon(ModelUtility.class, "PersonalCost.png")); // user code end *************** *** 1834,1837 **** --- 1807,1821 ---- ivjMnpOccurance.add(getMniRemoveOccurance()); // user code begin {1} + ivjMnpOccurance.add(new JSeparator()); + JMenuItem item = new JMenuItem(); + item.setText(CommonUserAccess.getMniFileExportText()); + item.setToolTipText(ResourceManager.getResource(BaseFrame.class, "MniExportTableData_toolTip")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + // call after extension-points are realized of extension + exportTableData(getTblOccurance()); + } + }); + ivjMnpOccurance.add(item); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1859,1862 **** --- 1843,1857 ---- ivjMnpPersonalCosts.add(getMniRemoveCost()); // user code begin {1} + ivjMnpPersonalCosts.add(new JSeparator()); + JMenuItem item = new JMenuItem(); + item.setText(CommonUserAccess.getMniFileExportText()); + item.setToolTipText(ResourceManager.getResource(BaseFrame.class, "MniExportTableData_toolTip")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + // call after extension-points are realized of extension + exportTableData(getTblCost()); + } + }); + ivjMnpPersonalCosts.add(item); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 2264,2270 **** ivjTbpGeneral.insertTab("Notiz", null, getPnlNote(), null, 2); // user code begin {1} ! ivjTbpGeneral.setTitleAt(0, getResourceString(ServiceDetailView.class, "PnlDetail_text")); ivjTbpGeneral.setTitleAt(1, getResourceString("PnlSite_text")); ! ivjTbpGeneral.setTitleAt(2, getResourceString(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 2259,2265 ---- ivjTbpGeneral.insertTab("Notiz", null, getPnlNote(), null, 2); // user code begin {1} ! ivjTbpGeneral.setTitleAt(0, ResourceManager.getResource(ServiceDetailView.class, "PnlDetail_text")); ivjTbpGeneral.setTitleAt(1, getResourceString("PnlSite_text")); ! ivjTbpGeneral.setTitleAt(2, ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 2522,2543 **** DbTableModel tm = new DbTableModel(); tm.addColumnEvaluated(getResourceString("TbcType_text"), Formatter.COST_TYPE, 40, null, evaluator); ! tm.addColumn(ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "LblName_text", false), "name", 100);//$NON-NLS-1$ tm.addColumn(getResourceString("TbcCosttype_text"), "cause", 100);//$NON-NLS-1$ // tm.addColumn("Rolle", "role", 100); // tm.addColumn("Aktivität", "activity", 100); ! tm.addColumn(ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text", false), "multitude", 50); ! tm.addColumnAmount(getResourceString(ServiceDetailView.class, "PnlCost_text"), "amount", 100); ! tm.addColumnEvaluated(getResourceString(ServiceDetailView.class, "TbcTotal_text"), Formatter.COST_TOTAL, 100, new ch.softenvironment.view.table.AmountTableCellRenderer(), evaluator); ! tm.addColumn(getResourceString(FactCostDetailView.class, "LblCurrency_text"), "currency", 40); ! tm.addColumn(getResourceString(FactCostDetailView.class, "LblRepeatable_text"), "repeatable", 40); tm.addColumnEvaluated("%", Formatter.COST_PERCENTAGE, 40, new ch.softenvironment.view.table.PercentTableCellRenderer(), evaluator); ! tm.addColumn(getResourceString(ServiceDetailView.class, "PnlNote_text"), "documentation", 100); tm.adjustTable(getTblCost()); tm = new DbTableModel(); ! tm.addColumn(ch.softenvironment.client.ResourceManager.getResource(OccuranceDetailView.class, "LblSite_text", false), "site", 100);//$NON-NLS-1$ // tm.addFormattedColumn("Adresse", TcoFormatter.SERVICE_ADDRESS, 100);//$NON-NLS-1$ ! tm.addColumn(ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text", false), "multitude", 50); ! tm.addColumn(getResourceString(ServiceDetailView.class, "PnlNote_text"), "documentation", 50); tm.adjustTable(getTblOccurance()); } --- 2517,2538 ---- DbTableModel tm = new DbTableModel(); tm.addColumnEvaluated(getResourceString("TbcType_text"), Formatter.COST_TYPE, 40, null, evaluator); ! tm.addColumn(ch.softenvironment.client.ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblName_text"), "name", 100);//$NON-NLS-1$ tm.addColumn(getResourceString("TbcCosttype_text"), "cause", 100);//$NON-NLS-1$ // tm.addColumn("Rolle", "role", 100); // tm.addColumn("Aktivität", "activity", 100); ! tm.addColumn(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblMultitude_text"), "multitude", 50); ! tm.addColumnAmount(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text"), "amount", 100); ! tm.addColumnEvaluated(ResourceManager.getResource(ServiceDetailView.class, "TbcTotal_text"), Formatter.COST_TOTAL, 100, new ch.softenvironment.view.table.AmountTableCellRenderer(), evaluator); ! tm.addColumn(ResourceManager.getResource(FactCostDetailView.class, "LblCurrency_text"), "currency", 40); ! tm.addColumn(ResourceManager.getResource(FactCostDetailView.class, "LblRepeatable_text"), "repeatable", 40); tm.addColumnEvaluated("%", Formatter.COST_PERCENTAGE, 40, new ch.softenvironment.view.table.PercentTableCellRenderer(), evaluator); ! tm.addColumn(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text"), "documentation", 100); tm.adjustTable(getTblCost()); tm = new DbTableModel(); ! tm.addColumn(ResourceManager.getResourceAsNonLabeled(OccuranceDetailView.class, "LblSite_text"), "site", 100);//$NON-NLS-1$ // tm.addFormattedColumn("Adresse", TcoFormatter.SERVICE_ADDRESS, 100);//$NON-NLS-1$ ! tm.addColumn(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblMultitude_text"), "multitude", 50); ! tm.addColumn(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text"), "documentation", 50); tm.adjustTable(getTblOccurance()); } *************** *** 2630,2637 **** evaluator.setTotalCost(total, getObject().getMultitude()); ! NumberFormat frmt = ch.softenvironment.util.AmountFormat.getAmountInstance(); ! getTxtSumFact().setText(frmt.format(sums[0])); ! getTxtSumPersonal().setText(frmt.format(sums[1])); ! getTxtSumTotal().setText(frmt.format(total)); ((DbTableModel)getTblCost().getModel()).setAll(getObject().getCost()); --- 2625,2632 ---- evaluator.setTotalCost(total, getObject().getMultitude()); ! java.text.NumberFormat af = AmountFormat.getAmountInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); ! getTxtSumFact().setText(af.format(sums[0])); ! getTxtSumPersonal().setText(af.format(sums[1])); ! getTxtSumTotal().setText(af.format(total)); ((DbTableModel)getTblCost().getModel()).setAll(getObject().getCost()); *************** *** 2763,2767 **** try { if (getObject() != null) { ! ((DbChangeableBean)getObject()).removePropertyChangeListener(getConsistencyController()); getObject().removePropertyChangeListener(this); setObject(null); --- 2758,2762 ---- try { if (getObject() != null) { ! getObject().removePropertyChangeListener(getConsistencyController()); getObject().removePropertyChangeListener(this); setObject(null); *************** *** 2770,2779 **** DbObjectServer server = (((DbObject)object).getObjectServer()); // 1) common settings ! getCbxCurrencyFact().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME)); ! getCbxCurrencyPersonal().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME)); ! getCbxCurrencyTotal().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME)); ! getCbxProjectPhase().setModel(new DbComboBoxModel(server.retrieveCodes(ProjectPhase.class), DbObject.PROPERTY_NAME)); ! getCbxLifeCycle().setModel(new DbComboBoxModel(server.retrieveCodes(LifeCycle.class), DbObject.PROPERTY_NAME)); ! getCbxProcess().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Process.class), DbObject.PROPERTY_NAME)); setObject((CostDriver)object); --- 2765,2774 ---- DbObjectServer server = (((DbObject)object).getObjectServer()); // 1) common settings ! JComboBoxUtility.initComboBox(getCbxCurrencyFact(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyPersonal(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyTotal(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxProjectPhase(), server.retrieveCodes(ProjectPhase.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(), JComboBoxUtility.SORT_KEEP_ORDER); ! JComboBoxUtility.initComboBox(getCbxLifeCycle(), server.retrieveCodes(LifeCycle.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(), JComboBoxUtility.SORT_KEEP_ORDER); ! JComboBoxUtility.initComboBox(getCbxProcess(), server.retrieveCodes(org.tcotool.model.Process.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); setObject((CostDriver)object); Index: FindDialog.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/FindDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FindDialog.java 7 May 2006 14:24:02 -0000 1.6 --- FindDialog.java 13 Jun 2007 20:13:56 -0000 1.7 *************** *** 47,53 **** import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.model.DbCodeType; - import ch.softenvironment.jomm.serialize.HtmlSerializer; import ch.softenvironment.util.StringUtils; - import ch.softenvironment.util.Tracer; import ch.softenvironment.view.TriStatePanel; import ch.softenvironment.view.ViewOptions; --- 47,51 ---- *************** *** 167,173 **** * @see ch.softenvironment.view.SearchView#assignObjects() */ ! public void assignObjects() { ! // TODO Auto-generated method stub ! } /* (non-Javadoc) --- 165,169 ---- * @see ch.softenvironment.view.SearchView#assignObjects() */ ! public void assignObjects() { } /* (non-Javadoc) *************** *** 175,180 **** */ public void changeObjects(Object source) { - // TODO Auto-generated method stub - } /** --- 171,174 ---- *************** *** 218,223 **** */ public void copyObject(Object source) { - // TODO Auto-generated method stub - } private void addHit(TcoObject object) { --- 212,215 ---- *************** *** 462,466 **** ivjChxDocumentation.setBounds(152, 45, 102, 22); // user code begin {1} ! ivjChxDocumentation.setText(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text", false)); // user code end } catch (java.lang.Throwable ivjExc) { --- 454,458 ---- ivjChxDocumentation.setBounds(152, 45, 102, 22); // user code begin {1} ! ivjChxDocumentation.setText(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 486,490 **** ivjChxName.setBounds(152, 19, 102, 22); // user code begin {1} ! ivjChxName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text", false)); //TODO //ivjChxName.setEnabled(false); --- 478,482 ---- ivjChxName.setBounds(152, 19, 102, 22); // user code begin {1} ! ivjChxName.setText(ResourceManager.getResourceAsNonLabeled(ServiceDetailView.class, "LblName_text")); //TODO //ivjChxName.setEnabled(false); *************** *** 691,695 **** ivjRbtAll.setBounds(10, 19, 135, 22); // user code begin {1} ! ivjRbtAll.setText(getResourceString(TriStatePanel.class, "CI_All_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 683,687 ---- ivjRbtAll.setBounds(10, 19, 135, 22); // user code begin {1} ! ivjRbtAll.setText(ResourceManager.getResource(TriStatePanel.class, "CI_All_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 714,718 **** ivjRbtCost.setBounds(10, 123, 135, 22); // user code begin {1} ! ivjRbtCost.setText(getResourceString(CostDriverDetailView.class, "PnlCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 706,710 ---- ivjRbtCost.setBounds(10, 123, 135, 22); // user code begin {1} ! ivjRbtCost.setText(ResourceManager.getResource(CostDriverDetailView.class, "PnlCost_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 865,868 **** --- 857,861 ---- setSize(475, 520); setTitle(getResourceString("FrmWindow_text")); + //TODO setFrameIcon(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png") /*.getImage()*/); editor = new JEditorPane(); *************** *** 891,903 **** */ public void newObject(Object source) { - // TODO Auto-generated method stub - } /* (non-Javadoc) * @see ch.softenvironment.view.ListMenuChoice#removeObjects(java.lang.Object) */ ! public void removeObjects(Object source) { ! // TODO Auto-generated method stub ! } /* (non-Javadoc) --- 884,892 ---- */ public void newObject(Object source) { } /* (non-Javadoc) * @see ch.softenvironment.view.ListMenuChoice#removeObjects(java.lang.Object) */ ! public void removeObjects(Object source) { } /* (non-Javadoc) *************** *** 905,910 **** */ public void resetSearchArguments() { - // TODO Auto-generated method stub - } /** --- 894,897 ---- Index: DependencyDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/DependencyDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DependencyDetailView.java 7 May 2006 14:17:08 -0000 1.2 --- DependencyDetailView.java 13 Jun 2007 20:13:56 -0000 1.3 *************** *** 2,9 **** --- 2,14 ---- import org.tcotool.model.*; + import org.tcotool.tools.ModelUtility; + import ch.ehi.basics.i18n.ResourceBundle; import ch.softenvironment.util.AmountFormat; + import ch.softenvironment.view.swingext.JComboBoxUtility; import ch.softenvironment.view.tree.*; import java.util.Iterator; + + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.*; import ch.softenvironment.jomm.mvc.controller.*; *************** *** 165,175 **** getSliClient().setValue(0); } else { getTxtSupplierName().setText(supplier.getName()); org.tcotool.tools.Calculator calculator = new org.tcotool.tools.Calculator(LauncherView.getInstance().getUtility()); supplierCost = calculator.calcTcoOverall(supplier); ! getTxtSupplierCost().setText(AmountFormat.toString(supplierCost)); // Client-Distriution ! getTxtClientCost().setText(AmountFormat.toString(supplierCost / 100.0 * getObject().getDistribution().doubleValue())); getSliClient().setValue(getObject().getDistribution().intValue()); --- 170,181 ---- getSliClient().setValue(0); } else { + java.text.NumberFormat af = AmountFormat.getInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); getTxtSupplierName().setText(supplier.getName()); org.tcotool.tools.Calculator calculator = new org.tcotool.tools.Calculator(LauncherView.getInstance().getUtility()); supplierCost = calculator.calcTcoOverall(supplier); ! getTxtSupplierCost().setText(af.format(supplierCost)); // Client-Distriution ! getTxtClientCost().setText(af.format(supplierCost / 100.0 * getObject().getDistribution().doubleValue())); getSliClient().setValue(getObject().getDistribution().intValue()); *************** *** 867,871 **** ivjLblClientName.setBounds(12, 23, 140, 14); // user code begin {1} ! ivjLblClientName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 873,877 ---- ivjLblClientName.setBounds(12, 23, 140, 14); // user code begin {1} ! ivjLblClientName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 938,942 **** ivjLblNote.setBounds(12, 142, 140, 14); // user code begin {1} ! ivjLblNote.setText(getResourceString(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 944,948 ---- ivjLblNote.setBounds(12, 142, 140, 14); // user code begin {1} ! ivjLblNote.setText(ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1008,1012 **** ivjLblSupplierName.setBounds(10, 24, 137, 14); // user code begin {1} ! ivjLblSupplierName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1014,1018 ---- ivjLblSupplierName.setBounds(10, 24, 137, 14); // user code begin {1} ! ivjLblSupplierName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1031,1035 **** ivjLblSupplierTotal.setBounds(10, 49, 137, 14); // user code begin {1} ! ivjLblSupplierTotal.setText(getResourceString(ServiceDetailView.class, "PnlCost_text") + ":"); ivjLblSupplierTotal.setToolTipText(getResourceString("LblSupplierCost_text")); // user code end --- 1037,1041 ---- ivjLblSupplierTotal.setBounds(10, 49, 137, 14); // user code begin {1} ! ivjLblSupplierTotal.setText(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text") + ":"); ivjLblSupplierTotal.setToolTipText(getResourceString("LblSupplierCost_text")); // user code end *************** *** 1433,1436 **** --- 1439,1443 ---- // user code begin {2} setTitle(getResourceString("FrmWindow_text")); + setIconImage(ResourceBundle.getImageIcon(ModelUtility.class, "Dependency.png").getImage()); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(Dependency.class)); *************** *** 1543,1549 **** setObject(null); DbObjectServer server = ((Dependency)object).getObjectServer(); ! getCbxCurrencySupplier().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME)); ! getCbxCurrencyDistribution().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME)); ! getCbxDegree().setModel(new DbComboBoxModel(server.retrieveCodes(org.tcotool.model.SupplierInfluence.class), DbObject.PROPERTY_NAME)); setObject((org.tcotool.model.Dependency)object); --- 1550,1556 ---- setObject(null); DbObjectServer server = ((Dependency)object).getObjectServer(); ! JComboBoxUtility.initComboBox(getCbxCurrencySupplier(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyDistribution(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxDegree(), server.retrieveCodes(org.tcotool.model.SupplierInfluence.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(), JComboBoxUtility.SORT_KEEP_ORDER); setObject((org.tcotool.model.Dependency)object); --- NEW FILE: GraphicReportFrame.java --- package org.tcotool.application; /* * 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 javax.swing.JInternalFrame; import javax.swing.JScrollPane; import java.awt.Dimension; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.print.PageFormat; import ch.ehi.basics.i18n.ResourceBundle; import ch.softenvironment.view.BaseFrame; import ch.softenvironment.view.ToolBar; import ch.softenvironment.view.swingext.JPanelPrintable; /** * InternalFrame to show graphical reports. * * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2007/06/13 20:13:56 $ */ public class GraphicReportFrame extends JInternalFrame { private JPanel pnlContent = null; private JPanel graph = null; private ToolBar tlbToolbar = null; /** * This method initializes * */ public GraphicReportFrame(final String title, JPanel graph) { super(title, true, true, true, true); initialize(); setFrameIcon(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png") /*.getImage()*/); this.graph = graph; graph.setAutoscrolls(true); JScrollPane spc = new JScrollPane(graph); spc.setAutoscrolls(true); spc.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); spc.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); getPnlContent().add(spc, "Center"); } /** * This method initializes this * */ private void initialize() { try { this.setSize(new Dimension(442, 188)); this.setContentPane(getPnlContent()); } catch (java.lang.Throwable e) { BaseFrame.showException(this, e); } } /** * This method initializes pnlContent * * @return javax.swing.JPanel */ private JPanel getPnlContent() { if (pnlContent == null) { try { pnlContent = new JPanel(); pnlContent.setLayout(new BorderLayout()); pnlContent.add(getTlbToolbar(), BorderLayout.NORTH); } catch (java.lang.Throwable e) { BaseFrame.showException(this, e); } } return pnlContent; } /** * This method initializes tlbToolbar * * @return ch.softenvironment.view.ToolBar */ private ToolBar getTlbToolbar() { if (tlbToolbar == null) { try { tlbToolbar = new ToolBar(); tlbToolbar.addToolBarListener(new ch.softenvironment.view.ToolBarListener() { public void tbbPrintAction_actionPerformed(java.util.EventObject e) { printObject(); } public void tbbCopyAction_actionPerformed(java.util.EventObject e) { } public void tbbCutAction_actionPerformed(java.util.EventObject e) { } public void tbbDeleteAction_actionPerformed(java.util.EventObject e) { } public void tbbFindAction_actionPerformed(java.util.EventObject e) { } public void tbbNewAction_actionPerformed(java.util.EventObject e) { } public void tbbOpenAction_actionPerformed(java.util.EventObject e) { } public void tbbPasteAction_actionPerformed(java.util.EventObject e) { } public void tbbRedoAction_actionPerformed(java.util.EventObject e) { } public void tbbSaveAction_actionPerformed(java.util.EventObject e) { } public void tbbUndoAction_actionPerformed(java.util.EventObject e) { } }); tlbToolbar.setTbbPrintEnabled(true); } catch (java.lang.Throwable e) { BaseFrame.showException(this, e); } } return tlbToolbar; } /** * Print the Report to print-device. */ private void printObject() { java.awt.print.PrinterJob printJob = java.awt.print.PrinterJob.getPrinterJob(); printJob.setJobName(getTitle()); PageFormat pf = new PageFormat(); //printJob.pageDialog(printJob.defaultPage()); pf.setOrientation(java.awt.print.PageFormat.PORTRAIT); printJob.setPrintable(new JPanelPrintable(graph), pf); if (printJob.printDialog()) { try { printJob.print(); } catch(java.awt.print.PrinterException ex) { BaseFrame.showException(this, ex); } } } } // @jve:decl-index=0:visual-constraint="10,10" Index: RiskDialog.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/RiskDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RiskDialog.java 29 Aug 2005 09:40:24 -0000 1.1.1.1 --- RiskDialog.java 13 Jun 2007 20:13:56 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package org.tcotool.application; + import ch.ehi.basics.i18n.ResourceBundle; + /* * This library is free software; you can redistribute it and/or *************** *** 20,24 **** * Dialog for Risk-Parameter settings. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 22,26 ---- * Dialog for Risk-Parameter settings. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 325,328 **** --- 327,331 ---- } // user code begin {2} + //TODO setIconImage(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png").getImage()); // user code end } Index: CodeDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CodeDetailView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CodeDetailView.java 7 May 2006 14:17:08 -0000 1.6 --- CodeDetailView.java 13 Jun 2007 20:13:56 -0000 1.7 *************** *** 27,31 **** import org.tcotool.model.CostCause; import org.tcotool.model.CostCentre; - import org.tcotool.model.LifeCycle; import org.tcotool.model.ProjectPhase; import org.tcotool.model.Responsibility; --- 27,30 ---- *************** *** 316,320 **** ivjLblActivity.setBounds(11, 112, 150, 14); // user code begin {1} ! ivjLblActivity.setText(getResourceString(PersonalCostDetailView.class, "LblActivity_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 315,319 ---- ivjLblActivity.setBounds(11, 112, 150, 14); // user code begin {1} ! ivjLblActivity.setText(ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 339,343 **** ivjLblCatalogue.setBounds(11, 51, 150, 14); // user code begin {1} ! ivjLblCatalogue.setText(ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", true)); // user code end } catch (java.lang.Throwable ivjExc) { --- 338,342 ---- ivjLblCatalogue.setBounds(11, 51, 150, 14); // user code begin {1} ! ivjLblCatalogue.setText(ResourceManager.getResourceAsLabel(CatalogueDetailView.class, "FrmWindow_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 385,389 **** ivjLblCostCause.setBounds(11, 21, 150, 14); // user code begin {1} ! ivjLblCostCause.setText(ch.softenvironment.client.ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", true)); // user code end } catch (java.lang.Throwable ivjExc) { --- 384,388 ---- ivjLblCostCause.setBounds(11, 21, 150, 14); // user code begin {1} ! ivjLblCostCause.setText(ResourceManager.getResourceAsLabel(CostDriverDetailView.class, "TbcCosttype_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 408,412 **** ivjLblCostCentre.setBounds(11, 86, 147, 14); // user code begin {1} ! ivjLblCostCentre.setText(getResourceString(ServiceDetailView.class, "LblCostCentre_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 407,411 ---- ivjLblCostCentre.setBounds(11, 86, 147, 14); // user code begin {1} ! ivjLblCostCentre.setText(ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 432,436 **** ivjLblPhase.setBounds(10, 56, 148, 14); // user code begin {1} ! ivjLblPhase.setText(getResourceString(CostDriverDetailView.class, "LblPhase_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 431,435 ---- ivjLblPhase.setBounds(10, 56, 148, 14); // user code begin {1} ! ivjLblPhase.setText(ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 455,459 **** ivjLblProcess.setBounds(10, 28, 148, 14); // user code begin {1} ! ivjLblProcess.setText(getResourceString(CostDriverDetailView.class, "LblProcess_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 454,458 ---- ivjLblProcess.setBounds(10, 28, 148, 14); // user code begin {1} ! ivjLblProcess.setText(ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 478,482 **** ivjLblResponsibility.setBounds(11, 60, 147, 14); // user code begin {1} ! ivjLblResponsibility.setText(getResourceString(ServiceDetailView.class, "LblResponsibility_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 477,481 ---- ivjLblResponsibility.setBounds(11, 60, 147, 14); // user code begin {1} ! ivjLblResponsibility.setText(ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 502,506 **** ivjLblRole.setBounds(11, 80, 150, 14); // user code begin {1} ! ivjLblRole.setText(ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", true)); // user code end } catch (java.lang.Throwable ivjExc) { --- 501,505 ---- ivjLblRole.setBounds(11, 80, 150, 14); // user code begin {1} ! ivjLblRole.setText(ResourceManager.getResourceAsLabel(RoleDetailView.class, "FrmWindow_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 525,529 **** ivjLblSite.setBounds(10, 86, 148, 14); // user code begin {1} ! ivjLblSite.setText(getResourceString(CostDriverDetailView.class, "LblSite_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 524,528 ---- ivjLblSite.setBounds(10, 86, 148, 14); // user code begin {1} ! ivjLblSite.setText(ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1016,1020 **** getPnlPhase().setCode(server, ProjectPhase.class, ModelUtility.getTypeString(ProjectPhase.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlSite().setCode(server, Site.class, ModelUtility.getTypeString(Site.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false)*/, DbObject.PROPERTY_NAME, SiteDetailView.class, getViewOptions()); ! getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text", false), DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ModelUtility.getTypeString(CostCause.class) /*ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false)*/, DbObject.PROPERTY_NAME, CostCauseDetailView.class, getViewOptions()); --- 1015,1019 ---- getPnlPhase().setCode(server, ProjectPhase.class, ModelUtility.getTypeString(ProjectPhase.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlSite().setCode(server, Site.class, ModelUtility.getTypeString(Site.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false)*/, DbObject.PROPERTY_NAME, SiteDetailView.class, getViewOptions()); ! getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblProcess_text"), DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ModelUtility.getTypeString(CostCause.class) /*ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false)*/, DbObject.PROPERTY_NAME, CostCauseDetailView.class, getViewOptions()); Index: HTMLReportFrame.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/HTMLReportFrame.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** HTMLReportFrame.java 7 May 2006 14:41:14 -0000 1.6 --- HTMLReportFrame.java 13 Jun 2007 20:13:56 -0000 1.7 *************** *** 17,20 **** --- 17,22 ---- import javax.swing.*; + + import ch.ehi.basics.i18n.ResourceBundle; import ch.ehi.basics.view.FileChooser; import ch.softenvironment.client.ResourceManager; *************** *** 24,29 **** --- 26,33 ---- import ch.softenvironment.util.StringUtils; import ch.softenvironment.view.BaseDialog; + import ch.softenvironment.view.swingext.JEditorPanePrintUtility; import org.tcotool.standard.report.ReportTool; + import java.io.*; import java.util.Iterator; *************** *** 50,54 **** public void tbbOpenAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbPasteAction_actionPerformed(java.util.EventObject newEvent) {}; ! public void tbbPrintAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbRedoAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbSaveAction_actionPerformed(java.util.EventObject newEvent) { --- 54,61 ---- public void tbbOpenAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbPasteAction_actionPerformed(java.util.EventObject newEvent) {}; ! public void tbbPrintAction_actionPerformed(java.util.EventObject newEvent) { ! if (newEvent.getSource() == HTMLReportFrame.this.getTlbToolbar()) ! printObject(); ! }; public void tbbRedoAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbSaveAction_actionPerformed(java.util.EventObject newEvent) { *************** *** 228,234 **** --- 235,267 ---- getJInternalFrameContentPane().add(sp); // editor.setSize(new Dimension(100, 150)); + setFrameIcon(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png") /*.getImage()*/); // user code end } /** + * Print the Report to print-device. + */ + private void printObject() { + //HTMLDocument doc = (HTMLDocument)editor.getDocument(); + (new JEditorPanePrintUtility(getTitle())).print(/*doc*/ editor); + /* + java.awt.print.PrinterJob printJob = java.awt.print.PrinterJob.getPrinterJob(); + printJob.setJobName(getTitle()); + + java.awt.print.PageFormat pf = printJob.pageDialog(printJob.defaultPage()); + //pf.setOrientation(java.awt.print.PageFormat.PORTRAIT); + //printJob.setPrintable(new PrintWrapper(classDiagram),pf); + + if (printJob.printDialog()) { + // Print the job if the user didn't cancel printing + // Ask user for page format (e.g., portrait/landscape) + try { + printJob.print(); + } catch(java.awt.print.PrinterException ex) { + handleException(ex); + } + } + */ + } + /** * Save HTML-Report into MyFile.csv/html. */ *************** *** 285,288 **** --- 318,322 ---- editor.setEditable(false); getTlbToolbar().setTbbSaveEnabled(true); + getTlbToolbar().setTbbPrintEnabled(true); // make sure report is scrolled to the beginning editor.select(0,0); Index: PackageDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/PackageDetailView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PackageDetailView.java 5 Jul 2006 10:13:44 -0000 1.5 --- PackageDetailView.java 13 Jun 2007 20:13:56 -0000 1.6 *************** *** 13,17 **** --- 13,19 ---- */ import org.tcotool.model.TcoPackage; + import org.tcotool.tools.ModelUtility; + import ch.ehi.basics.i18n.ResourceBundle; import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.*; *************** *** 964,967 **** --- 966,970 ---- // user code begin {2} setTitle(getResourceString("FrmWindow_text")); + setIconImage(ResourceBundle.getImageIcon(ModelUtility.class, "TcoPackage.png").getImage()); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(TcoPackage.class)); Index: AboutDialog.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/AboutDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AboutDialog.java 29 Aug 2005 09:40:52 -0000 1.1.1.1 --- AboutDialog.java 13 Jun 2007 20:13:56 -0000 1.2 *************** *** 1,5 **** package org.tcotool.application; - import ch.softenvironment.view.ViewOptions; /* --- 1,4 ---- Index: ApplicationOptions.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/ApplicationOptions.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ApplicationOptions.java 7 May 2006 14:17:08 -0000 1.2 --- ApplicationOptions.java 13 Jun 2007 20:13:56 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- import java.awt.Color; + import java.util.Locale; /** * Keep Settings in a <user.home>/.tcoTool file. *************** *** 33,42 **** */ protected ApplicationOptions() { ! super(); setChartBackground(Color.lightGray); setChartDomainGridLine(Color.white); setChartRangeGridLine(Color.white); } ! protected ApplicationOptions(String filename) { super(filename, new ApplicationOptions()); } --- 34,43 ---- */ protected ApplicationOptions() { ! super(); setChartBackground(Color.lightGray); setChartDomainGridLine(Color.white); setChartRangeGridLine(Color.white); } ! protected ApplicationOptions(final String filename) { super(filename, new ApplicationOptions()); } Index: CostCauseDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CostCauseDetailView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CostCauseDetailView.java 7 May 2006 14:17:08 -0000 1.3 --- CostCauseDetailView.java 13 Jun 2007 20:13:56 -0000 1.4 *************** *** 16,19 **** --- 16,21 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + import ch.ehi.basics.i18n.ResourceBundle; + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.*; *************** *** 580,584 **** ivjLblName.setBounds(11, 16, 131, 14); // user code begin {1} ! ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 582,586 ---- ivjLblName.setBounds(11, 16, 131, 14); // user code begin {1} ! ivjLblName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 754,757 **** --- 756,760 ---- // user code begin {2} setTitle(ModelUtility.getTypeString(CostCause.class)); + setIconImage(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png").getImage()); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(CostCause.class)); Index: Formatter.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/Formatter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Formatter.java 29 Jun 2006 22:50:05 -0000 1.3 --- Formatter.java 13 Jun 2007 20:13:56 -0000 1.4 *************** *** 27,31 **** * @version $Revision$ $Date$ */ ! class Formatter implements ch.softenvironment.jomm.mvc.controller.Evaluator { protected static final String COSTDRIVER_FACT_COST = "_factCost"; protected static final String COSTDRIVER_PERSONAL_COST = "_personalCost"; --- 27,31 ---- * @version $Revision$ $Date$ */ ! class Formatter implements ch.softenvironment.util.Evaluator { protected static final String COSTDRIVER_FACT_COST = "_factCost"; protected static final String COSTDRIVER_PERSONAL_COST = "_personalCost"; *************** *** 56,60 **** * The given owner's property will be formatted for Table-Cell displayment and returned. */ ! public Object evaluate(Object owner, String property) { if (owner instanceof org.tcotool.model.CostDriver) { // @see ServiceDetailView#initializeView() --- 56,60 ---- * The given owner's property will be formatted for Table-Cell displayment and returned. */ ! public Object evaluate(Object owner, final String property) { if (owner instanceof org.tcotool.model.CostDriver) { // @see ServiceDetailView#initializeView() Index: ModelDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/ModelDetailView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ModelDetailView.java 7 May 2006 14:17:08 -0000 1.4 --- ModelDetailView.java 13 Jun 2007 20:13:56 -0000 1.5 *************** *** 16,27 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import org.tcotool.model.Catalogue; import org.tcotool.model.TcoModel; import ch.softenvironment.jomm.mvc.controller.*; /** * DetailView of a TcoPackage. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 16,29 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import org.tcotool.model.TcoModel; + import ch.ehi.basics.i18n.ResourceBundle; + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.*; /** * DetailView of a TcoPackage. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 675,680 **** ivjJTabbedPane1.insertTab("Notiz", null, getPnlNote(), null, 1); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, getResourceString(ServiceDetailView.class, "PnlDetail_text")); ! ivjJTabbedPane1.setTitleAt(1, getResourceString(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 677,682 ---- ivjJTabbedPane1.insertTab("Notiz", null, getPnlNote(), null, 1); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, ResourceManager.getResource(ServiceDetailView.class, "PnlDetail_text")); ! ivjJTabbedPane1.setTitleAt(1, ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 723,727 **** ivjLblBaseDate.setBounds(17, 63, 131, 14); // user code begin {1} ! ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 725,729 ---- ivjLblBaseDate.setBounds(17, 63, 131, 14); // user code begin {1} ! ivjLblBaseDate.setText(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 771,775 **** ivjLblMultitude.setBounds(17, 41, 131, 14); // user code begin {1} ! ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 773,777 ---- ivjLblMultitude.setBounds(17, 41, 131, 14); // user code begin {1} ! ivjLblMultitude.setText(ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 794,798 **** ivjLblName.setBounds(17, 16, 131, 14); // user code begin {1} ! ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 796,800 ---- ivjLblName.setBounds(17, 16, 131, 14); // user code begin {1} ! ivjLblName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1134,1137 **** --- 1136,1140 ---- // user code begin {2} setTitle(getResourceString("FrmWindow_text")); + setIconImage(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png").getImage()); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(TcoModel.class)); Index: OccuranceDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/OccuranceDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OccuranceDetailView.java 7 May 2006 14:17:08 -0000 1.2 --- OccuranceDetailView.java 13 Jun 2007 20:13:56 -0000 1.3 *************** *** 17,25 **** import java.beans.PropertyChangeEvent; - import org.tcotool.model.Catalogue; import org.tcotool.model.Occurance; import ch.softenvironment.jomm.mvc.controller.*; import ch.softenvironment.view.DetailView; /** * DetailView of a TcoPackage. --- 17,27 ---- import java.beans.PropertyChangeEvent; import org.tcotool.model.Occurance; + import ch.ehi.basics.i18n.ResourceBundle; + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.*; import ch.softenvironment.view.DetailView; + import ch.softenvironment.view.swingext.JComboBoxUtility; /** * DetailView of a TcoPackage. *************** *** 537,541 **** ivjJTabbedPane1.insertTab("Notiz", null, getPnlDocumentation(), null, 0); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, getResourceString(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 539,543 ---- ivjJTabbedPane1.insertTab("Notiz", null, getPnlDocumentation(), null, 0); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 559,563 **** ivjLblMultitude.setText("Menge:"); // user code begin {1} ! ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 561,565 ---- ivjLblMultitude.setText("Menge:"); // user code begin {1} ! ivjLblMultitude.setText(ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 727,730 **** --- 729,733 ---- // user code begin {2} setTitle(getResourceString("FrmWindow_title")); + setIconImage(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Icon.png").getImage()); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(Occurance.class)); *************** *** 733,737 **** } public void initializeView() throws Throwable { - getCbxSite().setModel(new DbComboBoxModel(getDefaultServer(getObject()).retrieveCodes(org.tcotool.model.Site.class), ch.so... [truncated message content] |
|
From: Hirzel P. <ph...@us...> - 2007-06-13 20:13:57
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26735/src/org/tcotool Modified Files: TcotoolUtility.java Log Message: Release V1.4.4 Index: TcotoolUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/TcotoolUtility.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TcotoolUtility.java 18 Mar 2006 17:06:11 -0000 1.4 --- TcotoolUtility.java 13 Jun 2007 20:13:56 -0000 1.5 *************** *** 16,20 **** */ ! import ch.softenvironment.jomm.DbObjectRegistry; /** * Registry of all persistent Classes for JOMM. --- 16,20 ---- */ ! import ch.softenvironment.jomm.DbObjectServer; /** * Registry of all persistent Classes for JOMM. *************** *** 22,66 **** * @version $Revision$ $Date$ */ ! public class TcotoolUtility { ! private TcotoolUtility() {} ! public static void registerClasses() { // Basket MODEL ! DbObjectRegistry.registerClass(org.tcotool.model.TcoObject.class,"tcotool.model.TcoObject"); ! DbObjectRegistry.registerClass(org.tcotool.model.SystemParameter.class,"tcotool.model.SystemParameter"); ! DbObjectRegistry.registerClass(org.tcotool.model.FactCost.class,"tcotool.model.FactCost"); ! DbObjectRegistry.registerClass(org.tcotool.model.ImportReference.class,"tcotool.model.ImportReference"); ! DbObjectRegistry.registerClass(org.tcotool.model.Cost.class,"tcotool.model.Cost"); ! DbObjectRegistry.registerClass(org.tcotool.model.Service.class,"tcotool.model.Service"); ! DbObjectRegistry.registerClass(org.tcotool.model.Dependency.class,"tcotool.model.Dependency"); ! DbObjectRegistry.registerClass(org.tcotool.model.TcoPackage.class,"tcotool.model.TcoPackage"); ! DbObjectRegistry.registerClass(org.tcotool.model.TcoModel.class,"tcotool.model.TcoModel"); ! DbObjectRegistry.registerClass(org.tcotool.model.CostDriver.class,"tcotool.model.CostDriver"); ! DbObjectRegistry.registerClass(org.tcotool.model.PersonalCost.class,"tcotool.model.PersonalCost"); ! DbObjectRegistry.registerClass(org.tcotool.model.Site.class,"tcotool.model.Site"); ! DbObjectRegistry.registerClass(org.tcotool.model.Currency.class,"tcotool.model.Currency"); ! DbObjectRegistry.registerClass(org.tcotool.model.CostCause.class,"tcotool.model.CostCause"); ! DbObjectRegistry.registerClass(org.tcotool.model.CostType.class,"tcotool.model.CostType"); ! DbObjectRegistry.registerClass(org.tcotool.model.CostExponent.class,"tcotool.model.CostExponent"); ! DbObjectRegistry.registerClass(org.tcotool.model.CostCentre.class,"tcotool.model.CostCentre"); ! DbObjectRegistry.registerClass(org.tcotool.model.LifeCycle.class,"tcotool.model.LifeCycle"); ! DbObjectRegistry.registerClass(org.tcotool.model.ProjectPhase.class,"tcotool.model.ProjectPhase"); ! DbObjectRegistry.registerClass(org.tcotool.model.ServiceCategory.class,"tcotool.model.ServiceCategory"); ! DbObjectRegistry.registerClass(org.tcotool.model.Activity.class,"tcotool.model.Activity"); ! DbObjectRegistry.registerClass(org.tcotool.model.Role.class,"tcotool.model.Role"); ! DbObjectRegistry.registerClass(org.tcotool.model.Catalogue.class,"tcotool.model.Catalogue"); ! DbObjectRegistry.registerClass(org.tcotool.model.Process.class,"tcotool.model.Process"); ! DbObjectRegistry.registerClass(org.tcotool.model.SupplierInfluence.class,"tcotool.model.SupplierInfluence"); ! DbObjectRegistry.registerClass(org.tcotool.model.Responsibility.class,"tcotool.model.Responsibility"); ! DbObjectRegistry.registerClass(org.tcotool.model.Occurance.class,"tcotool.model.Occurance"); ! DbObjectRegistry.registerClass(org.tcotool.model.Branch.class,"tcotool.model.Branch"); ! DbObjectRegistry.registerClass(org.tcotool.model.Course.class,"tcotool.model.Course"); // Basket PRESENTATION ! DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationNode.class,"tcotool.presentation.PresentationNode"); ! // DbObjectRegistry.registerClass(org.tcotool.presentation.EdgeEnd.class,"tcotool.presentation.EdgeEnd"); ! // DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationElement.class,"tcotool.presentation.PresentationElement"); ! DbObjectRegistry.registerClass(org.tcotool.presentation.Diagram.class,"tcotool.presentation.Diagram"); ! DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationEdge.class,"tcotool.presentation.PresentationEdge"); ! DbObjectRegistry.registerClass(org.tcotool.presentation.WayPoint.class,"tcotool.presentation.WayPoint"); } } \ No newline at end of file --- 22,65 ---- * @version $Revision$ $Date$ */ ! public abstract class TcotoolUtility { ! public static void registerClasses(DbObjectServer server) { // Basket MODEL ! server.register(org.tcotool.model.TcoObject.class,"tcotool.model.TcoObject"); ! server.register(org.tcotool.model.SystemParameter.class,"tcotool.model.SystemParameter"); ! server.register(org.tcotool.model.Cost.class,"tcotool.model.Cost"); ! server.register(org.tcotool.model.FactCost.class,"tcotool.model.FactCost"); ! server.register(org.tcotool.model.ConfigurationTag.class,"tcotool.model.ImportReference"); ! server.register(org.tcotool.model.Service.class,"tcotool.model.Service"); ! server.register(org.tcotool.model.Dependency.class,"tcotool.model.Dependency"); ! server.register(org.tcotool.model.TcoPackage.class,"tcotool.model.TcoPackage"); ! server.register(org.tcotool.model.TcoModel.class,"tcotool.model.TcoModel"); ! server.register(org.tcotool.model.CostDriver.class,"tcotool.model.CostDriver"); ! server.register(org.tcotool.model.PersonalCost.class,"tcotool.model.PersonalCost"); ! server.register(org.tcotool.model.Site.class,"tcotool.model.Site"); ! server.register(org.tcotool.model.Currency.class,"tcotool.model.Currency"); ! server.register(org.tcotool.model.CostCause.class,"tcotool.model.CostCause"); ! server.register(org.tcotool.model.CostType.class,"tcotool.model.CostType"); ! server.register(org.tcotool.model.CostExponent.class,"tcotool.model.CostExponent"); ! server.register(org.tcotool.model.CostCentre.class,"tcotool.model.CostCentre"); ! server.register(org.tcotool.model.LifeCycle.class,"tcotool.model.LifeCycle"); ! server.register(org.tcotool.model.ProjectPhase.class,"tcotool.model.ProjectPhase"); ! server.register(org.tcotool.model.ServiceCategory.class,"tcotool.model.ServiceCategory"); ! server.register(org.tcotool.model.Activity.class,"tcotool.model.Activity"); ! server.register(org.tcotool.model.Role.class,"tcotool.model.Role"); ! server.register(org.tcotool.model.Catalogue.class,"tcotool.model.Catalogue"); ! server.register(org.tcotool.model.Process.class,"tcotool.model.Process"); ! server.register(org.tcotool.model.SupplierInfluence.class,"tcotool.model.SupplierInfluence"); ! server.register(org.tcotool.model.Responsibility.class,"tcotool.model.Responsibility"); ! server.register(org.tcotool.model.Occurance.class,"tcotool.model.Occurance"); ! server.register(org.tcotool.model.Branch.class,"tcotool.model.Branch"); ! server.register(org.tcotool.model.Course.class,"tcotool.model.Course"); // Basket PRESENTATION ! server.register(org.tcotool.presentation.PresentationNode.class,"tcotool.presentation.PresentationNode"); ! // server.register(org.tcotool.presentation.EdgeEnd.class,"tcotool.presentation.EdgeEnd"); ! // server.register(org.tcotool.presentation.PresentationElement.class,"tcotool.presentation.PresentationElement"); ! server.register(org.tcotool.presentation.Diagram.class,"tcotool.presentation.Diagram"); ! server.register(org.tcotool.presentation.PresentationEdge.class,"tcotool.presentation.PresentationEdge"); ! server.register(org.tcotool.presentation.WayPoint.class,"tcotool.presentation.WayPoint"); } } \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2007-05-30 08:36:48
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv373/src/org/tcotool/tools/resources Added Files: Dependency.png Log Message: New --- NEW FILE: Dependency.png --- (This appears to be a binary file; contents omitted.) |
|
From: Hirzel P. <ph...@us...> - 2006-07-05 10:15:22
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25397/src/org/tcotool/application Modified Files: CourseDetailView.java Log Message: NLS correction of Popup Menu Index: CourseDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CourseDetailView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CourseDetailView.java 7 May 2006 14:17:08 -0000 1.1 --- CourseDetailView.java 5 Jul 2006 10:15:19 -0000 1.2 *************** *** 20,24 **** import java.util.List; - import org.tcotool.model.Catalogue; import org.tcotool.model.Course; import org.tcotool.model.SystemParameter; --- 20,23 ---- *************** *** 31,34 **** --- 30,34 ---- import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.NlsUtils; + import ch.softenvironment.view.CommonUserAccess; /** * DetailView of a TcoPackage. *************** *** 819,823 **** // user code begin {1} ivjLblSource.setText(getResourceString("LblSource_text")); ! ivjLblSource.setToolTipText(NlsUtils.formatMessage(getResourceString("LblSource_toolTipText"), getResourceString(SystemParameterDetailView.class, "FrmWindow_text"))); // user code end } catch (java.lang.Throwable ivjExc) { --- 819,823 ---- // user code begin {1} ivjLblSource.setText(getResourceString("LblSource_text")); ! ivjLblSource.setToolTipText(NlsUtils.formatMessage(getResourceString("LblSource_toolTipText"), ResourceManager.getResource(SystemParameterDetailView.class, "FrmWindow_text"))); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 864,867 **** --- 864,868 ---- ivjMniNew.setText("Neu"); // user code begin {1} + ivjMniNew.setText(CommonUserAccess.getMniFileNewText()); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 885,888 **** --- 886,890 ---- ivjMniRemove.setText("Löschen"); // user code begin {1} + ivjMniRemove.setText(CommonUserAccess.getMniEditRemoveText()); // user code end } catch (java.lang.Throwable ivjExc) { |
|
From: Hirzel P. <ph...@us...> - 2006-07-05 10:13:51
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24571/src/org/tcotool/application Modified Files: PackageDetailView.java Log Message: Cosmetics: Resize of Tabbed Pane Index: PackageDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/PackageDetailView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PackageDetailView.java 7 May 2006 14:17:08 -0000 1.4 --- PackageDetailView.java 5 Jul 2006 10:13:44 -0000 1.5 *************** *** 1,5 **** package org.tcotool.application; ! /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public --- 1,5 ---- package org.tcotool.application; ! /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public *************** *** 11,27 **** * 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 org.tcotool.model.Catalogue; import org.tcotool.model.TcoPackage; import ch.softenvironment.jomm.mvc.controller.*; /** * DetailView of a TcoPackage. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 11,23 ---- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. */ import org.tcotool.model.TcoPackage; + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.*; /** * DetailView of a TcoPackage. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 48,51 **** --- 44,51 ---- private boolean ivjConnPtoP4Aligning = false; private boolean ivjConnPtoP9Aligning = false; + private javax.swing.JButton ivjBtnFile = null; + private javax.swing.JLabel ivjLblFile = null; + private ch.softenvironment.view.SimpleEditorPanel ivjPnlNote = null; + private javax.swing.JTextField ivjTxtFile = null; class IvjEventHandler implements ch.softenvironment.view.SimpleEditorPanelListener, ch.softenvironment.view.ToolBarListener, java.awt.event.KeyListener, java.beans.PropertyChangeListener { *************** *** 59,68 **** public void keyTyped(java.awt.event.KeyEvent e) {}; public void propertyChange(java.beans.PropertyChangeEvent evt) { - if (evt.getSource() == PackageDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("isSaveable"))) - connPtoP6SetTarget(); - if (evt.getSource() == PackageDetailView.this.getPnlStandardToolbar() && (evt.getPropertyName().equals("tbbSaveEnabled"))) - connPtoP6SetSource(); - if (evt.getSource() == PackageDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("inconsistencies"))) - connEtoM1(evt); if (evt.getSource() == PackageDetailView.this.getPnlStandardToolbar() && (evt.getPropertyName().equals("currentObject"))) connEtoC1(evt); --- 59,62 ---- *************** *** 77,80 **** --- 71,80 ---- if (evt.getSource() == PackageDetailView.this.getTxtBaseDate() && (evt.getPropertyName().equals("date"))) connPtoP9SetSource(); + if (evt.getSource() == PackageDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("inconsistencies"))) + connEtoM1(evt); + if (evt.getSource() == PackageDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("isSaveable"))) + connPtoP6SetTarget(); + if (evt.getSource() == PackageDetailView.this.getPnlStandardToolbar() && (evt.getPropertyName().equals("tbbSaveEnabled"))) + connPtoP6SetSource(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; *************** *** 97,104 **** }; }; - private javax.swing.JButton ivjBtnFile = null; - private javax.swing.JLabel ivjLblFile = null; - private ch.softenvironment.view.SimpleEditorPanel ivjPnlNote = null; - private javax.swing.JTextField ivjTxtFile = null; /** * Constructor --- 97,100 ---- *************** *** 511,515 **** /** * Return the ConsistencyController property value. ! * @return ch.softenvironment.jomm.controls.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ --- 507,511 ---- /** * Return the ConsistencyController property value. ! * @return ch.softenvironment.jomm.mvc.controller.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ *************** *** 529,540 **** ivjJPanel1 = new javax.swing.JPanel(); ivjJPanel1.setName("JPanel1"); ! ivjJPanel1.setLayout(null); ! getJPanel1().add(getLblName(), getLblName().getName()); ! getJPanel1().add(getTxtName(), getTxtName().getName()); ! getJPanel1().add(getJTabbedPane1(), getJTabbedPane1().getName()); ! getJPanel1().add(getLblMultitude(), getLblMultitude().getName()); ! getJPanel1().add(getLblBaseDate(), getLblBaseDate().getName()); ! getJPanel1().add(getTxtMultitude(), getTxtMultitude().getName()); ! getJPanel1().add(getTxtBaseDate(), getTxtBaseDate().getName()); // user code begin {1} // user code end --- 525,589 ---- ivjJPanel1 = new javax.swing.JPanel(); ivjJPanel1.setName("JPanel1"); ! ivjJPanel1.setLayout(new java.awt.GridBagLayout()); ! ! java.awt.GridBagConstraints constraintsLblName = new java.awt.GridBagConstraints(); ! constraintsLblName.gridx = 1; constraintsLblName.gridy = 1; ! constraintsLblName.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsLblName.ipadx = 55; ! constraintsLblName.insets = new java.awt.Insets(16, 17, 4, 7); ! getJPanel1().add(getLblName(), constraintsLblName); ! ! java.awt.GridBagConstraints constraintsTxtName = new java.awt.GridBagConstraints(); ! constraintsTxtName.gridx = 2; constraintsTxtName.gridy = 1; ! constraintsTxtName.fill = java.awt.GridBagConstraints.HORIZONTAL; ! constraintsTxtName.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsTxtName.weightx = 1.0; ! constraintsTxtName.ipadx = 349; ! constraintsTxtName.insets = new java.awt.Insets(13, 8, 1, 12); ! getJPanel1().add(getTxtName(), constraintsTxtName); ! ! java.awt.GridBagConstraints constraintsJTabbedPane1 = new java.awt.GridBagConstraints(); ! constraintsJTabbedPane1.gridx = 1; constraintsJTabbedPane1.gridy = 4; ! constraintsJTabbedPane1.gridwidth = 2; ! constraintsJTabbedPane1.fill = java.awt.GridBagConstraints.BOTH; ! constraintsJTabbedPane1.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsJTabbedPane1.weightx = 1.0; ! constraintsJTabbedPane1.weighty = 1.0; ! constraintsJTabbedPane1.ipadx = 480; ! constraintsJTabbedPane1.ipady = 227; ! constraintsJTabbedPane1.insets = new java.awt.Insets(8, 9, 19, 12); ! getJPanel1().add(getJTabbedPane1(), constraintsJTabbedPane1); ! ! java.awt.GridBagConstraints constraintsLblMultitude = new java.awt.GridBagConstraints(); ! constraintsLblMultitude.gridx = 1; constraintsLblMultitude.gridy = 2; ! constraintsLblMultitude.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsLblMultitude.ipadx = 90; ! constraintsLblMultitude.insets = new java.awt.Insets(7, 17, 3, 7); ! getJPanel1().add(getLblMultitude(), constraintsLblMultitude); ! ! java.awt.GridBagConstraints constraintsLblBaseDate = new java.awt.GridBagConstraints(); ! constraintsLblBaseDate.gridx = 1; constraintsLblBaseDate.gridy = 3; ! constraintsLblBaseDate.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsLblBaseDate.ipadx = 50; ! constraintsLblBaseDate.insets = new java.awt.Insets(5, 17, 11, 7); ! getJPanel1().add(getLblBaseDate(), constraintsLblBaseDate); ! ! java.awt.GridBagConstraints constraintsTxtMultitude = new java.awt.GridBagConstraints(); ! constraintsTxtMultitude.gridx = 2; constraintsTxtMultitude.gridy = 2; ! constraintsTxtMultitude.fill = java.awt.GridBagConstraints.HORIZONTAL; ! constraintsTxtMultitude.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsTxtMultitude.weightx = 1.0; ! constraintsTxtMultitude.ipadx = 69; ! constraintsTxtMultitude.insets = new java.awt.Insets(2, 8, 2, 292); ! getJPanel1().add(getTxtMultitude(), constraintsTxtMultitude); ! ! java.awt.GridBagConstraints constraintsTxtBaseDate = new java.awt.GridBagConstraints(); ! constraintsTxtBaseDate.gridx = 2; constraintsTxtBaseDate.gridy = 3; ! constraintsTxtBaseDate.fill = java.awt.GridBagConstraints.HORIZONTAL; ! constraintsTxtBaseDate.anchor = java.awt.GridBagConstraints.NORTHWEST; ! constraintsTxtBaseDate.weightx = 1.0; ! constraintsTxtBaseDate.ipadx = 91; ! constraintsTxtBaseDate.insets = new java.awt.Insets(2, 8, 8, 270); ! getJPanel1().add(getTxtBaseDate(), constraintsTxtBaseDate); // user code begin {1} // user code end *************** *** 557,566 **** ivjJTabbedPane1 = new javax.swing.JTabbedPane(); ivjJTabbedPane1.setName("JTabbedPane1"); - ivjJTabbedPane1.setBounds(9, 96, 507, 262); ivjJTabbedPane1.insertTab("Detail", null, getPnlDetail(), null, 0); ivjJTabbedPane1.insertTab("Notiz", null, getPnlNote(), null, 1); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, getResourceString(ServiceDetailView.class, "PnlDetail_text")); ! ivjJTabbedPane1.setTitleAt(1, getResourceString(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 606,614 ---- ivjJTabbedPane1 = new javax.swing.JTabbedPane(); ivjJTabbedPane1.setName("JTabbedPane1"); ivjJTabbedPane1.insertTab("Detail", null, getPnlDetail(), null, 0); ivjJTabbedPane1.insertTab("Notiz", null, getPnlNote(), null, 1); // user code begin {1} ! ivjJTabbedPane1.setTitleAt(0, ResourceManager.getResource(ServiceDetailView.class, "PnlDetail_text")); ! ivjJTabbedPane1.setTitleAt(1, ResourceManager.getResource(ServiceDetailView.class, "PnlNote_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 583,589 **** ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); - ivjLblBaseDate.setBounds(17, 63, 131, 14); // user code begin {1} ! ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 631,636 ---- ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); // user code begin {1} ! ivjLblBaseDate.setText(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 609,614 **** ivjLblFile.setBounds(12, 26, 119, 14); // user code begin {1} ! ivjLblFile.setToolTipText(getResourceString(ModelDetailView.class, "LblFile_toolTipText")); ! ivjLblFile.setText(getResourceString(ModelDetailView.class, "LblFile_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 656,661 ---- ivjLblFile.setBounds(12, 26, 119, 14); // user code begin {1} ! ivjLblFile.setToolTipText(ResourceManager.getResource(ModelDetailView.class, "LblFile_toolTipText")); ! ivjLblFile.setText(ResourceManager.getResource(ModelDetailView.class, "LblFile_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 631,637 **** ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); - ivjLblMultitude.setBounds(17, 41, 131, 14); // user code begin {1} ! ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 678,683 ---- ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); // user code begin {1} ! ivjLblMultitude.setText(ResourceManager.getResource(ServiceDetailView.class, "LblMultitude_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 654,660 **** ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); - ivjLblName.setBounds(17, 16, 131, 14); // user code begin {1} ! ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 700,705 ---- ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); // user code begin {1} ! ivjLblName.setText(ResourceManager.getResource(ServiceDetailView.class, "LblName_text")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 716,720 **** // user code begin {1} getPnlImport().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(getResourceString(ModelDetailView.class, "PnlImport_title")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end --- 761,765 ---- // user code begin {1} getPnlImport().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ResourceManager.getResource(ModelDetailView.class, "PnlImport_title")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end *************** *** 797,801 **** ivjTxtBaseDate = new ch.softenvironment.view.swingext.DateTextField(); ivjTxtBaseDate.setName("TxtBaseDate"); - ivjTxtBaseDate.setBounds(163, 60, 95, 20); ivjTxtBaseDate.setEditable(false); // user code begin {1} --- 842,845 ---- *************** *** 842,846 **** ivjTxtMultitude = new ch.softenvironment.view.swingext.NumberTextField(); ivjTxtMultitude.setName("TxtMultitude"); - ivjTxtMultitude.setBounds(163, 36, 73, 20); // user code begin {1} // user code end --- 886,889 ---- *************** *** 863,867 **** ivjTxtName = new javax.swing.JTextField(); ivjTxtName.setName("TxtName"); - ivjTxtName.setBounds(163, 13, 328, 20); // user code begin {1} // user code end --- 906,909 ---- *************** *** 895,899 **** getTxtMultitude().addKeyListener(ivjEventHandler); getTxtBaseDate().addPropertyChangeListener(ivjEventHandler); - connPtoP6SetTarget(); connPtoP1SetTarget(); connPtoP2SetTarget(); --- 937,940 ---- *************** *** 901,904 **** --- 942,946 ---- connPtoP4SetTarget(); connPtoP9SetTarget(); + connPtoP6SetTarget(); } /** *************** *** 947,951 **** /** * Set the ConsistencyController to a new value. ! * @param newValue ch.softenvironment.jomm.controls.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ --- 989,993 ---- /** * Set the ConsistencyController to a new value. ! * @param newValue ch.softenvironment.jomm.mvc.controller.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:51:39
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31230/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime Modified Files: ApplicationPlugin.java Log Message: Refactoring: Log-API adapted Index: ApplicationPlugin.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime/source/org/tcotool/core/runtime/ApplicationPlugin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ApplicationPlugin.java 7 May 2006 14:58:59 -0000 1.5 --- ApplicationPlugin.java 29 Jun 2006 22:51:36 -0000 1.6 *************** *** 121,125 **** } if (entryMenu == null) { ! Tracer.getInstance().developerWarning(this, "loadPlugins()", "Menu not found in Launcher for: " + menu); return; } --- 121,125 ---- } if (entryMenu == null) { ! Tracer.getInstance().developerWarning("Menu not found in Launcher for: " + menu); return; } *************** *** 142,146 **** } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(this, "loadPlugins()", "Could not load Plugin for menu <" + ext.getId() + ">: " + e.getLocalizedMessage()); } } --- 142,146 ---- } } catch(Throwable e) { ! Tracer.getInstance().runtimeError("Could not load Plugin for menu <" + ext.getId() + ">", e); } } *************** *** 167,171 **** } } catch (Throwable e) { ! Tracer.getInstance().runtimeError(this, "activate()", "Plugin not started: " + e.getLocalizedMessage()); return; } --- 167,171 ---- } } catch (Throwable e) { ! Tracer.getInstance().runtimeError("Plugin not started", e); return; } *************** *** 222,226 **** text = ResourceManager.getResource(toolClass, text, loader); if (StringUtils.isNullOrEmpty(text)) { ! Tracer.getInstance().runtimeWarning(this, "getResourceString()", "No property for: " + key); return ""; } else { --- 222,226 ---- text = ResourceManager.getResource(toolClass, text, loader); if (StringUtils.isNullOrEmpty(text)) { ! Tracer.getInstance().runtimeWarning("No property for: " + key); return ""; } else { *************** *** 228,232 **** } } catch (Throwable e) { ! Tracer.getInstance().runtimeWarning(this, "getResourceString()", "Key: " + key + " failed (evtl. optional only): " + e.getLocalizedMessage()); return ""; } --- 228,232 ---- } } catch (Throwable e) { ! Tracer.getInstance().runtimeWarning("Key: " + key + " failed (evtl. optional only): " + e.getLocalizedMessage()); return ""; } |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:10
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/model Modified Files: CostCause.java Log Message: Refactoring: Log-API adapted Index: CostCause.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostCause.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CostCause.java 18 Mar 2006 17:09:29 -0000 1.2 --- CostCause.java 29 Jun 2006 22:50:05 -0000 1.3 *************** *** 51,55 **** public final void setIliCode(String iliCode) { if (getIliCode() != null) { ! throw new DeveloperException(this, "setIliCode()", "IliCode must not be changed!"); } --- 51,55 ---- public final void setIliCode(String iliCode) { if (getIliCode() != null) { ! throw new DeveloperException("IliCode must not be changed!"); } |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:10
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/application Modified Files: LauncherView.java Formatter.java Log Message: Refactoring: Log-API adapted Index: Formatter.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/Formatter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Formatter.java 7 May 2006 14:41:14 -0000 1.2 --- Formatter.java 29 Jun 2006 22:50:05 -0000 1.3 *************** *** 1,13 **** package org.tcotool.application; import ch.softenvironment.client.ResourceManager; import ch.softenvironment.math.MathUtils; import org.tcotool.model.*; - import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.*; /** * Formatt-Tool for Table's in *DetailView. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 1,28 ---- package org.tcotool.application; + + /* + * 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 ch.softenvironment.client.ResourceManager; import ch.softenvironment.math.MathUtils; import org.tcotool.model.*; import org.tcotool.tools.*; /** * Formatt-Tool for Table's in *DetailView. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 66,70 **** return LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency(); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().developerError(this, "format()", "IGNORE: SystemParameters.defaultCurrency reference"); return "<" + ResourceManager.getResource(FactCostDetailView.class, "LblCurrency_text") + ">"; } --- 81,85 ---- return LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency(); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().developerError("IGNORE: SystemParameters.defaultCurrency reference"); return "<" + ResourceManager.getResource(FactCostDetailView.class, "LblCurrency_text") + ">"; } Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LauncherView.java 22 Dec 2005 12:26:37 -0000 1.9 --- LauncherView.java 29 Jun 2006 22:50:05 -0000 1.10 *************** *** 15,20 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import org.tcotool.standard.charts.CostTypeBarChart; ! import org.tcotool.standard.charts.CostTypePieChart; import org.tcotool.standard.drawing.Layout; import org.tcotool.standard.report.ReportComplete; --- 15,21 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! ! ! import org.tcotool.standard.charts.ChartTool; import org.tcotool.standard.drawing.Layout; import org.tcotool.standard.report.ReportComplete; *************** *** 29,32 **** --- 30,34 ---- import java.awt.event.KeyEvent; import java.io.FileNotFoundException; + import java.util.Iterator; import java.util.List; *************** *** 39,47 **** --- 41,52 ---- import ch.softenvironment.util.*; import ch.softenvironment.view.*; + import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.*; import ch.softenvironment.jomm.mvc.model.DbChangeableBean; + import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.target.xml.*; import org.tcotool.model.*; + import org.tcotool.model.Process; import org.tcotool.pluginsupport.PluginUtility; import org.tcotool.presentation.Diagram; *************** *** 65,69 **** private JMenu mnuEdit = null; private JMenuItem mniFind = null; - private JMenuItem mniTcoCostTypePieChart = null; private JPanel ivjBaseFrameContentPane = null; IvjEventHandler ivjEventHandler = new IvjEventHandler(); --- 70,73 ---- *************** *** 103,107 **** private JMenuItem ivjMniDependencyGraph = null; private JMenuItem ivjMniTcoChart = null; - private JMenuItem ivjMniTcoCostTypeChart = null; private JMenu ivjMnuReports = null; private JMenu ivjMnuFont = null; --- 107,110 ---- *************** *** 144,149 **** if (e.getSource() == LauncherView.this.getMniTcoChart()) connEtoC27(e); - if (e.getSource() == LauncherView.this.getMniTcoCostTypeChart()) - connEtoC28(e); if (e.getSource() == LauncherView.this.getRbtFontDefault()) connEtoC29(e); --- 147,150 ---- *************** *** 191,194 **** --- 192,204 ---- */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ + public LauncherView(ch.softenvironment.view.ViewOptions viewOptions) { + super(viewOptions); + initialize(); + } + /** + * Constructor + * @param viewOptions Symbol + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ public LauncherView(ch.softenvironment.view.ViewOptions viewOptions, ApplicationOptions settings) { super(viewOptions); *************** *** 198,201 **** --- 208,317 ---- } /** + * Add a MenuItem to create a Bar- & Pie-Chart for given dbCodeType. + * @param menu + * @param dbCodeType + */ + private void addMenuChartReports(JMenu menu, final Class dbCodeType) { + final String title = ModelUtility.getTypeString(dbCodeType); + + // Bar-Chart + JMenuItem item = new JMenuItem(); + item.setText(title); + item.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "bar_chart.png")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + showBusy(new Runnable() { + public void run() { + try { + ChartTool tool = new ChartTool((TcoPackage)getUtility().getRoot()); + addReport(tool.createTcoBarChart(dbCodeType), title /*getResourceString("MniTcoCostTypePieChart_text")*/, getDtpRoot().getWidth(), getDtpRoot().getHeight()); + } catch(Throwable ex) { + handleException(ex); + } + } + }); + } + }); + menu.add(item); + + // Pie-Chart + item = new JMenuItem(); + item.setText(title); + item.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "pie_chart.png")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + showBusy(new Runnable() { + public void run() { + try { + ChartTool tool = new ChartTool((TcoPackage)getUtility().getRoot()); + addReport(tool.createTcoPieChart(dbCodeType), title /*getResourceString("MniTcoCostTypePieChart_text")*/, getDtpRoot().getWidth(), getDtpRoot().getHeight()); + } catch(Throwable ex) { + handleException(ex); + } + } + }); + } + }); + menu.add(item); + } + /** + * Add a MenuItem to create a bar- & pie-chart of a (sub/second)-code within another code attached to a Service. + * @param menu + * @param dbCodeTypeSecond (for e.g. CostCause.class) + * @param dbCodeTypePrimary (for e.g. ServiceCategory.class) + */ + private void addMenuChartReports(JMenu menu, final Class dbCodeTypeSecond, final Class dbCodeTypePrimary) { + Object tokens[] = { ModelUtility.getTypeString(dbCodeTypeSecond), ModelUtility.getTypeString(dbCodeTypePrimary)}; + final String title = NlsUtils.formatMessage(getResourceString("MniSubordinateCodesWithin_text"), tokens); + JMenuItem item = new JMenuItem(); + item.setText(title); + item.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "bar_chart.png")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + showBusy(new Runnable() { + public void run() { + try { + Iterator it = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary).iterator(); + //TODO if (!it.hasNext()) { showNoDataFor(dbCodeType) } + while (it.hasNext()) { + DbCodeType maskCode = (DbCodeType)it.next(); + ChartTool tool = new ChartTool((TcoPackage)getUtility().getRoot(), maskCode); + JPanel panel = tool.createTcoBarChart(dbCodeTypeSecond); + addReport(panel, title + ": " + maskCode.getNameString(), getDtpRoot().getWidth(), getDtpRoot().getHeight()/2); + } + } catch(Throwable ex) { + handleException(ex); + } + } + }); + } + }); + menu.add(item); + + item = new JMenuItem(); + item.setText(title); + item.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "pie_chart.png")); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + showBusy(new Runnable() { + public void run() { + try { + Iterator it = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary).iterator(); + while (it.hasNext()) { + DbCodeType maskCode = (DbCodeType)it.next(); + ChartTool tool = new ChartTool((TcoPackage)getUtility().getRoot(), maskCode); + JPanel panel = tool.createTcoPieChart(dbCodeTypeSecond); + addReport(panel, title + ": " + maskCode.getNameString(), getDtpRoot().getWidth(), getDtpRoot().getHeight()/2); + } + } catch(Throwable ex) { + handleException(ex); + } + } + }); + } + }); + menu.add(item); + } + /** * Adds an internal Frame to DesktopPane. */ *************** *** 206,210 **** internalFrame.setSelected(true); } catch (java.beans.PropertyVetoException e) { ! Tracer.getInstance().runtimeWarning(this, "addReport(..)", "PropertyVetoEception ignored"); } --- 322,326 ---- internalFrame.setSelected(true); } catch (java.beans.PropertyVetoException e) { ! Tracer.getInstance().runtimeWarning("PropertyVetoEception ignored"); } *************** *** 217,221 **** public void addReport(JPanel panel, String title, int width, int height) { JInternalFrame internalFrame = new JInternalFrame(title, true, true, true, true); - // internalFrame.setDrawingView(view); panel.setAutoscrolls(true); JScrollPane spc = new JScrollPane(panel); --- 333,336 ---- *************** *** 524,545 **** } /** - * connEtoC28: (MniTcoCostTypeChart.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.mniTcoCostTypeChart()V) - * @param arg1 java.awt.event.ActionEvent - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private void connEtoC28(java.awt.event.ActionEvent arg1) { - try { - // user code begin {1} - // user code end - this.mniTcoCostTypeChart(); - // user code begin {2} - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - /** * connEtoC29: (RbtFontDefault.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.setFont()V) * @param arg1 java.awt.event.ActionEvent --- 639,642 ---- *************** *** 721,733 **** } } - private void saveSettings() { - getSettings().setLastFiles(mnuFileHistory.getHistory()); - // getSettings().setNavigationSort(NavigationTreeModel.SORT_BY_KIND_NAME); - getSettings().setWindowHeight(new Integer(getHeight())); - getSettings().setWindowWidth(new Integer(getWidth())); - // getSettings().setWindowX(new Integer(getX())); - // getSettings().setWindowY(new Integer(getY())); - getSettings().save(); - } /** * Find a given Menu in MenuBar. --- 818,821 ---- *************** *** 791,795 **** ivjDtpRoot.setName("DtpRoot"); // user code begin {1} ! image = ResourceBundle.getImageIcon(LauncherView.class, "TCO_Tool.jpg").getImage(); ivjDtpRoot = new javax.swing.JDesktopPane() { public void paintComponent(java.awt.Graphics g) { --- 879,883 ---- ivjDtpRoot.setName("DtpRoot"); // user code begin {1} ! setBackgroundImage(ResourceBundle.getImageIcon(LauncherView.class, "TCO_Tool.jpg").getImage()); ivjDtpRoot = new javax.swing.JDesktopPane() { public void paintComponent(java.awt.Graphics g) { *************** *** 905,909 **** ivjMniCodes.setText("Codes ändern..."); // user code begin {1} ! ivjMniCodes.setText(getResourceString("MinCodes_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 993,997 ---- ivjMniCodes.setText("Codes ändern..."); // user code begin {1} ! ivjMniCodes.setText(getResourceString("MinCodes_text") + "..."); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1243,1246 **** --- 1331,1335 ---- // user code begin {1} ivjMniTcoChart.setText(getResourceString("MniTcoChart_text")); + ivjMniTcoChart.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "bar_chart.png")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1252,1303 **** return ivjMniTcoChart; } - /** - * Return the MniTcoCostTypeChart property value. - * @return javax.swing.JMenuItem - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private javax.swing.JMenuItem getMniTcoCostTypeChart() { - if (ivjMniTcoCostTypeChart == null) { - try { - ivjMniTcoCostTypeChart = new javax.swing.JMenuItem(); - ivjMniTcoCostTypeChart.setName("MniTcoCostTypeChart"); - ivjMniTcoCostTypeChart.setText("Gesamtkosten TCO-Kostenarten (Balkendiagramm)"); - // user code begin {1} - ivjMniTcoCostTypeChart.setText(getResourceString("MniTcoCostTypeChart_text")); - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjMniTcoCostTypeChart; - } - private javax.swing.JMenuItem getMniTcoCostTypePieChart() { - if (mniTcoCostTypePieChart == null) { - try { - mniTcoCostTypePieChart = new javax.swing.JMenuItem(); - mniTcoCostTypePieChart.setName("MniTcoCostTypePieChart"); - mniTcoCostTypePieChart.setText(getResourceString("MniTcoCostTypePieChart_text")); - mniTcoCostTypePieChart.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent e) { - showBusy(new Runnable() { - public void run() { - try { - CostTypePieChart chartTool = new CostTypePieChart((TcoPackage)getUtility().getRoot()); - addReport(chartTool.createPieChartTcoCostType(), getResourceString("MniTcoCostTypePieChart_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight()); - } catch(Throwable ex) { - handleException(ex); - } - } - }); - } - }); - } catch (java.lang.Throwable ivjExc) { - handleException(ivjExc); - } - } - return mniTcoCostTypePieChart; - } private javax.swing.JMenu getMnuEdit() { if (mnuEdit == null) { --- 1341,1344 ---- *************** *** 1406,1409 **** --- 1447,1459 ---- // user code begin {1} ivjMnuHelp.setText(CommonUserAccess.getMnuHelpText()); + + ivjMnuHelp.add(new JSeparator()); + JMenuItem item = new JMenuItem("Platform Info..."); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + (PlatformInfoPanel.createDialog(getInstance())).show(); + } + }); + ivjMnuHelp.add(item); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1549,1558 **** ivjMnuReportTco.add(getMniReportTotalTcoCost()); ivjMnuReportTco.add(getMniTcoChart()); - ivjMnuReportTco.add(getMniTcoCostTypeChart()); // user code begin {1} ! ivjMnuReportTco.add(getMniTcoCostTypePieChart()); ! ! ivjMnuReportTco.setText(getResourceString("MnuReportTco_text")); ! ivjMnuReportTco.setToolTipText(getResourceString("MnuReportTco_toolTipText")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1599,1639 ---- ivjMnuReportTco.add(getMniReportTotalTcoCost()); ivjMnuReportTco.add(getMniTcoChart()); // user code begin {1} ! ivjMnuReportTco.setText(getResourceString("MnuReportTco_text")); ! ivjMnuReportTco.setToolTipText(getResourceString("MnuReportTco_toolTipText")); ! ! JMenu codeCharts = new JMenu(); ! codeCharts.setText(getResourceString("MinCodes_text")); ! codeCharts.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "bar_chart.png")); ! ivjMnuReportTco.add(codeCharts); ! // Service charts ! addMenuChartReports(codeCharts, ServiceCategory.class); ! addMenuChartReports(codeCharts, Responsibility.class); ! addMenuChartReports(codeCharts, CostCentre.class); ! codeCharts.add(new JSeparator()); ! // CostDriver charts ! addMenuChartReports(codeCharts, Process.class); ! //TODO unwanted for CAB ! //addMenuChartReports(codeCharts, ProjectPhase.class); ! //addMenuChartReports(codeCharts, LifeCycle.class); ! addMenuChartReports(codeCharts, Site.class); ! codeCharts.add(new JSeparator()); ! // *Cost charts ! addMenuChartReports(codeCharts, CostCause.class); ! addMenuChartReports(codeCharts, Activity.class); ! addMenuChartReports(codeCharts, Role.class); ! ! // Subordinate-Codes within Service-codes ! codeCharts = new JMenu(); ! codeCharts.setText(NlsUtils.formatMessage(getResourceString("MniSubordinateCodes_text"), getResourceString("MinCodes_text"))); ! codeCharts.setIcon(ResourceBundle.getImageIcon(LauncherView.class, "bar_chart.png")); ! ivjMnuReportTco.add(codeCharts); ! addMenuChartReports(codeCharts, CostCause.class, Responsibility.class); ! codeCharts.add(new JSeparator()); ! addMenuChartReports(codeCharts, CostCause.class, ServiceCategory.class); ! codeCharts.add(new JSeparator()); ! addMenuChartReports(codeCharts, CostCause.class, CostCentre.class); ! codeCharts.add(new JSeparator()); ! addMenuChartReports(codeCharts, Process.class, ServiceCategory.class); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1907,1911 **** */ public static String getVersion() { ! return "V1.4.0"; } /** --- 1988,1992 ---- */ public static String getVersion() { ! return "V1.4.3"; } /** *************** *** 1944,1948 **** getMniDependencyGraph().addActionListener(ivjEventHandler); getMniTcoChart().addActionListener(ivjEventHandler); - getMniTcoCostTypeChart().addActionListener(ivjEventHandler); getRbtFontDefault().addActionListener(ivjEventHandler); getRbtFontBig().addActionListener(ivjEventHandler); --- 2025,2028 ---- *************** *** 1976,1980 **** getSppLeft().setDividerLocation(450); // height of Tree getTlbStandard().setTbbNewEnabled(true); ! getTlbStandard().setTbbOpenEnabled(true); mnuFileHistory = new FileHistoryMenu(this, 9, getSettings().getLastFiles()); --- 2056,2060 ---- getSppLeft().setDividerLocation(450); // height of Tree getTlbStandard().setTbbNewEnabled(true); ! getTlbStandard().setTbbChangeEnabled(true); mnuFileHistory = new FileHistoryMenu(this, 9, getSettings().getLastFiles()); *************** *** 2005,2008 **** --- 2085,2106 ---- getRbtFontBig().setSelected(true); } + + JMenuItem item = new JMenuItem(); + item.setText(ResourceManager.getResource(CourseDetailView.class, "FrmWindow_text") + "..."); + item.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent e) { + try { + if (!getViewOptions().getViewManager().activateView(CourseDetailView.class)) { + BaseFrame view = new CourseDetailView(getViewOptions(), ListUtils.createList(getUtility().getSystemParameter())); + getViewOptions().getViewManager().checkIn(null, view); + view.setRelativeLocation(getInstance()); + view.setVisible(true); + } + } catch(Throwable ex) { + handleException(ex); + } + } + }); + getMnuSettings().add(item); // user code end } *************** *** 2083,2103 **** } } - private static void showInstance(ViewOptions viewOptions, ModelUtility utility, ApplicationOptions options) throws Throwable { - new LauncherView(viewOptions, options); - // getInstance().addDefaultClosingListener(); - // getInstance().setLookAndFeel(settings.getLookAndFeel()); - java.awt.Insets insets = getInstance().getInsets(); - getInstance().setSize(getInstance().getWidth() + insets.left + insets.right, getInstance().getHeight() + insets.top + insets.bottom); - getInstance().setVisible(true); - getInstance().setUtility(utility); - - try { - //TODO Future use: instantiate LauncherView in ApplicationPlugin#createAndShowGUI() - /*getInstance().pluginManager =*/ PluginUtility.invokePlugins("org.tcotool.core.runtime"); - } catch(Exception e) { - //TODO NLS - BaseDialog.showError(getInstance(), "Plugin-Initialisierung", "Es ist ein Fehler beim Laden allfälliger Plugins aufgetreten.\nMöglicherweise sind nicht alle Plugin-Optionen verfügbar.", e); - } - } /** * Show About Dialog. --- 2181,2184 ---- *************** *** 2105,2109 **** private void mniAbout() { try { ! new AboutDialog(this, getResourceString("FrmWindow_text"), getVersion(), "by Peter Hirzel (softEnvironment) 2004-2005"); } catch(Throwable e) { handleException(e); --- 2186,2190 ---- private void mniAbout() { try { ! new AboutDialog(this, getResourceString("FrmWindow_text"), getVersion(), "by Peter Hirzel (softEnvironment) 2004-2006"); } catch(Throwable e) { handleException(e); *************** *** 2224,2228 **** } /** ! * Comment */ private void mniRisk() { --- 2305,2309 ---- } /** ! * */ private void mniRisk() { *************** *** 2302,2322 **** public void run() { try { ! CostTypeBarChart chartTool = new CostTypeBarChart((TcoPackage)getUtility().getRoot()); ! addReport(chartTool.createBarChartTcoTotal(), getResourceString("MniTcoChart_text"), 500, 500); ! } catch(Throwable e) { ! handleException(e); ! } ! } ! }); ! } ! /** ! * Comment ! */ ! private void mniTcoCostTypeChart() { ! showBusy(new Runnable() { ! public void run() { ! try { ! CostTypeBarChart chartTool = new CostTypeBarChart((TcoPackage)getUtility().getRoot()); ! addReport(chartTool.createBarChartTcoCostType(), getResourceString("MniTcoCostTypeChart_text"), 900, 600); } catch(Throwable e) { handleException(e); --- 2383,2388 ---- public void run() { try { ! ChartTool tool = new ChartTool((TcoPackage)getUtility().getRoot()); ! addReport(tool.createTcoBarChart(), getResourceString("MniTcoChart_text"), 500, 500); } catch(Throwable e) { handleException(e); *************** *** 2360,2364 **** } catch(javax.jdo.JDODataStoreException e) { if (e.getCause() instanceof FileNotFoundException) { ! BaseDialog.showWarning((java.awt.Component)this, getResourceString(FileHistoryMenu.class, "CTFileMissing"), getResourceString(FileHistoryMenu.class, "CWFileMissing")); mnuFileHistory.removeRecent(filename); } else { --- 2426,2430 ---- } catch(javax.jdo.JDODataStoreException e) { if (e.getCause() instanceof FileNotFoundException) { ! BaseDialog.showWarning((java.awt.Component)this, ResourceManager.getResource(FileHistoryMenu.class, "CTFileMissing"), ResourceManager.getResource(FileHistoryMenu.class, "CWFileMissing")); mnuFileHistory.removeRecent(filename); } else { *************** *** 2449,2464 **** if (getTlbStandard().getTbbSaveEnabled()) { Boolean answer = BaseDialog.showConfirmExit((java.awt.Component)this); ! if (answer == Boolean.TRUE) { return mniSaveFile(); - } else { - return answer != null; } - } else { - return true; } } catch(Throwable e) { handleException(e); - return false; } } /** --- 2515,2531 ---- if (getTlbStandard().getTbbSaveEnabled()) { Boolean answer = BaseDialog.showConfirmExit((java.awt.Component)this); ! if (answer == null) { ! // canceled -> do nothing yet! ! return false; ! } else if (answer.booleanValue()) { ! // depends whether save is ok! return mniSaveFile(); } } } catch(Throwable e) { handleException(e); } + // discard (if answer==false) or nothing changed yet + return true; } /** *************** *** 2523,2526 **** --- 2590,2602 ---- }); } + private void saveSettings() { + getSettings().setLastFiles(mnuFileHistory.getHistory()); + // getSettings().setNavigationSort(NavigationTreeModel.SORT_BY_KIND_NAME); + getSettings().setWindowHeight(new Integer(getHeight())); + getSettings().setWindowWidth(new Integer(getWidth())); + // getSettings().setWindowX(new Integer(getX())); + // getSettings().setWindowY(new Integer(getY())); + getSettings().save(); + } /** * Register currently selected treeNode in NavigationTree *************** *** 2586,2600 **** } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(this, "setLanguage()", e.getLocalizedMessage()); } } /** * Keep changes of Model in mind. - * @deprecated (Nasty Hack-method) */ public void setModelChanged(boolean changed) { // hasModelChanged = changed; ! getMniFileSave().setEnabled(changed); ! getTlbStandard().setTbbSaveEnabled(changed); } /** --- 2662,2677 ---- } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } } /** * Keep changes of Model in mind. */ public void setModelChanged(boolean changed) { // hasModelChanged = changed; ! boolean saveable = getViewOptions().getViewManager().getRights(TcoModel.class).isSaveObjectAllowed(); ! getMniFileSave().setEnabled(saveable && changed); ! getMniFileSaveAs().setEnabled(saveable); ! getTlbStandard().setTbbSaveEnabled(saveable && changed); } /** *************** *** 2621,2626 **** --- 2698,2730 ---- setModelChanged(false); } + private static void showInstance(ViewOptions viewOptions, ModelUtility utility, ApplicationOptions options) throws Throwable { + new LauncherView(viewOptions, options); + // getInstance().addDefaultClosingListener(); + // getInstance().setLookAndFeel(settings.getLookAndFeel()); + java.awt.Insets insets = getInstance().getInsets(); + getInstance().setSize(getInstance().getWidth() + insets.left + insets.right, getInstance().getHeight() + insets.top + insets.bottom); + getInstance().setVisible(true); + getInstance().setUtility(utility); + + //viewOptions.getViewManager().setRights(new UserActionRights(UserActionRights.READONLY)); // Read-Only Version + getInstance().getStbStatus().setRights(viewOptions.getViewManager().getRights(TcoModel.class)); + + try { + //TODO Future use: instantiate LauncherView in ApplicationPlugin#createAndShowGUI() + /*getInstance().pluginManager =*/ PluginUtility.invokePlugins("org.tcotool.core.runtime"); + } catch(Exception e) { + //TODO NLS + BaseDialog.showError(getInstance(), "Plugin-Initialisierung", "Es ist ein Fehler beim Laden allfälliger Plugins aufgetreten.\nMöglicherweise sind nicht alle Plugin-Optionen verfügbar.", e); + } + } public void showStatus(String status) { getStbStatus().setStatus(status); } + /** + * Set the image to be displayed in the Report-Desktop-Pane. + * @param image + */ + public void setBackgroundImage(Image image) { + this.image = image; + } } |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:08
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/standard/drawing Modified Files: NodeFigure.java DependencyView.java EdgeFigure.java DependencyLineConnection.java Layout.java Log Message: Refactoring: Log-API adapted Index: EdgeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/EdgeFigure.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdgeFigure.java 17 Sep 2005 17:19:44 -0000 1.3 --- EdgeFigure.java 29 Jun 2006 22:50:05 -0000 1.4 *************** *** 114,118 **** start = getDiagram().findNodeConnector(getStartElement(), x, y); if (start == null) { ! Tracer.getInstance().developerWarning(this, "connectNodes()", "AUTO-CORRECT: Missing StartNode->there must have been an improper deletion of nodes/edges before=>" + getSourceName(getStartElement()));//$NON-NLS-2$//$NON-NLS-1$ // shouldWarn(NlsUtils.formatMessage(resEdgeFigure.getString("CWMissingStartNode"), getSourceName(getStartElement()))); //$NON-NLS-1$ // removeVisually(); --- 114,118 ---- start = getDiagram().findNodeConnector(getStartElement(), x, y); if (start == null) { ! Tracer.getInstance().developerWarning("AUTO-CORRECT: Missing StartNode->there must have been an improper deletion of nodes/edges before=>" + getSourceName(getStartElement()));//$NON-NLS-2$//$NON-NLS-1$ // shouldWarn(NlsUtils.formatMessage(resEdgeFigure.getString("CWMissingStartNode"), getSourceName(getStartElement()))); //$NON-NLS-1$ // removeVisually(); *************** *** 121,125 **** Connector end = getDiagram().findNodeConnector(getEndElement(), x, y); if (end == null) { ! Tracer.getInstance().developerWarning(this, "connectNodes()", "AUTO-CORRECT: Missing EndNode->there must have been an improper deletion of nodes/edges before=>" + getSourceName(getEndElement()));//$NON-NLS-2$//$NON-NLS-1$ //shouldWarn(NlsUtils.formatMessage(resEdgeFigure.getString("CWMissingEndNode"), getSourceName(getEndElement()))); //$NON-NLS-1$ // removeVisually(); --- 121,125 ---- Connector end = getDiagram().findNodeConnector(getEndElement(), x, y); if (end == null) { ! Tracer.getInstance().developerWarning("AUTO-CORRECT: Missing EndNode->there must have been an improper deletion of nodes/edges before=>" + getSourceName(getEndElement()));//$NON-NLS-2$//$NON-NLS-1$ //shouldWarn(NlsUtils.formatMessage(resEdgeFigure.getString("CWMissingEndNode"), getSourceName(getEndElement()))); //$NON-NLS-1$ // removeVisually(); *************** *** 141,145 **** } } catch(Throwable e) { ! Tracer.getInstance().debug(this, "connectNodes()", e.toString()); } } --- 141,145 ---- } } catch(Throwable e) { ! Tracer.getInstance().debug(e.toString()); } } Index: DependencyView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DependencyView.java 18 Mar 2006 17:11:32 -0000 1.5 --- DependencyView.java 29 Jun 2006 22:50:05 -0000 1.6 *************** *** 125,129 **** return add(new PackageFigure(this, element)); } else { ! throw new DeveloperException(this, "add(TcoObject)", "wrong type", element.toString()); } } --- 125,129 ---- return add(new PackageFigure(this, element)); } else { ! throw new DeveloperException("wrong type", element.toString()); } } *************** *** 160,166 **** */ protected ServiceFigure findServiceFigure(int x, int y) { ! FigureEnumeration enum = drawing().figures(); ! while (enum.hasNextFigure()) { ! Figure figure = enum.nextFigure(); if ((figure instanceof ServiceFigure) && (figure.containsPoint(x, y))) { --- 160,166 ---- */ protected ServiceFigure findServiceFigure(int x, int y) { ! FigureEnumeration enumeration = drawing().figures(); ! while (enumeration.hasNextFigure()) { ! Figure figure = enumeration.nextFigure(); if ((figure instanceof ServiceFigure) && (figure.containsPoint(x, y))) { *************** *** 212,218 **** //TUNE THIS METHOD! if (element != null) { ! FigureEnumeration enum = drawing().figures(); ! while (enum.hasNextFigure()) { ! Figure figure = enum.nextFigure(); /* if ((figure instanceof RoleDefFigure) || (figure instanceof AssociationAttributeFigure)) { --- 212,218 ---- //TUNE THIS METHOD! if (element != null) { ! FigureEnumeration enumeration = drawing().figures(); ! while (enumeration.hasNextFigure()) { ! Figure figure = enumeration.nextFigure(); /* if ((figure instanceof RoleDefFigure) || (figure instanceof AssociationAttributeFigure)) { *************** *** 274,279 **** */ public void keyPressed(KeyEvent e) { - int code = e.getKeyCode(); /* addToSelection(figure); Command cmd = new DeleteCommand("Delete", this); --- 274,280 ---- */ public void keyPressed(KeyEvent e) { /* + int code = e.getKeyCode(); + addToSelection(figure); Command cmd = new DeleteCommand("Delete", this); *************** *** 368,374 **** showCosts = visible; ! FigureEnumeration enum = drawing().figures(); ! while (enum.hasNextFigure()) { ! Figure figure = enum.nextFigure(); if (figure instanceof NodeFigure) { ((NodeFigure)figure).updateView(); --- 369,375 ---- showCosts = visible; ! FigureEnumeration enumeration = drawing().figures(); ! while (enumeration.hasNextFigure()) { ! Figure figure = enumeration.nextFigure(); if (figure instanceof NodeFigure) { ((NodeFigure)figure).updateView(); Index: Layout.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/Layout.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Layout.java 17 Sep 2005 17:19:44 -0000 1.3 --- Layout.java 29 Jun 2006 22:50:05 -0000 1.4 *************** *** 113,117 **** max_trials=nodev_size; // TODO should throw an exception ! Tracer.getInstance().runtimeWarning(this, "doit()", "stop layout; would run for to long"); return; } --- 113,117 ---- max_trials=nodev_size; // TODO should throw an exception ! Tracer.getInstance().runtimeWarning("stop layout; would run for to long"); return; } *************** *** 159,165 **** */ // Var.II: collect by Figure's ! FigureEnumeration enum = view.drawing().figures(); ! while (enum.hasNextFigure()) { ! Figure figure = enum.nextFigure(); if (figure instanceof EdgeFigure) { edgev.add(figure); --- 159,165 ---- */ // Var.II: collect by Figure's ! FigureEnumeration enumeration = view.drawing().figures(); ! while (enumeration.hasNextFigure()) { ! Figure figure = enumeration.nextFigure(); if (figure instanceof EdgeFigure) { edgev.add(figure); *************** *** 186,191 **** TcoObject object = (TcoObject) node.getModelElement(); Rectangle rect = node.displayBox(); ! Tracer.getInstance().debug(Layout.class, "dumpNodes()", ! "DumpNode: " + object.getName() + "\nx0=" + rect.getX() --- 186,190 ---- TcoObject object = (TcoObject) node.getModelElement(); Rectangle rect = node.displayBox(); ! Tracer.getInstance().debug("DumpNode: " + object.getName() + "\nx0=" + rect.getX() Index: NodeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/NodeFigure.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NodeFigure.java 21 Sep 2005 11:34:15 -0000 1.5 --- NodeFigure.java 29 Jun 2006 22:50:05 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- import org.tcotool.presentation.PresentationElement; import org.tcotool.presentation.PresentationNode; + import org.tcotool.tools.ModelUtility; import org.jhotdraw.standard.*; *************** *** 67,71 **** PresentationElement tmp = (PresentationElement)iterator.next(); if (tmp.getSubject() == null) { ! throw new DeveloperException(this, "NodeFigure()", "XML does not contain Subject-REF or reading failure"); } if (tmp.getSubject().equals(element)) { --- 68,72 ---- PresentationElement tmp = (PresentationElement)iterator.next(); if (tmp.getSubject() == null) { ! throw new DeveloperException("XML does not contain Subject-REF or reading failure"); } if (tmp.getSubject().equals(element)) { *************** *** 76,80 **** if (node == null) { // not yet displayed ! node = (PresentationNode)LauncherView.getInstance().getUtility().createDbObject(((TcoObject)element).getObjectServer(), PresentationNode.class); node.setSubject(element); } --- 77,81 ---- if (node == null) { // not yet displayed ! node = (PresentationNode)ModelUtility.createDbObject(((TcoObject)element).getObjectServer(), PresentationNode.class); node.setSubject(element); } *************** *** 283,287 **** protected void handleException(java.lang.Throwable exception) { try { ! Tracer.getInstance().developerWarning(this, "handleException()", exception.getLocalizedMessage()); LauncherView.getInstance().handleException(exception); } finally { --- 284,288 ---- protected void handleException(java.lang.Throwable exception) { try { ! Tracer.getInstance().developerWarning(exception.getLocalizedMessage()); LauncherView.getInstance().handleException(exception); } finally { *************** *** 436,440 **** */ public void updateView() { ! // TUNE!!! // show the saved colors -> should precede setNode(node) ! --- 437,441 ---- */ public void updateView() { ! //TODO TUNE!!! // show the saved colors -> should precede setNode(node) ! Index: DependencyLineConnection.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyLineConnection.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DependencyLineConnection.java 18 Mar 2006 17:11:32 -0000 1.4 --- DependencyLineConnection.java 29 Jun 2006 22:50:05 -0000 1.5 *************** *** 18,22 **** import org.tcotool.model.Dependency; - import org.tcotool.model.TcoObject; import org.jhotdraw.figures.ArrowTip; --- 18,21 ---- *************** *** 62,66 **** /*supplier = (TcoObject)*/ ((NodeFigure)end).getModelElement(); } catch(ClassCastException e) { ! Tracer.getInstance().developerWarning(this, "canConnect()", "Wrong dependency"); return false; } --- 61,65 ---- /*supplier = (TcoObject)*/ ((NodeFigure)end).getModelElement(); } catch(ClassCastException e) { ! Tracer.getInstance().developerWarning("Wrong dependency"); return false; } |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:08
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/standard/report Modified Files: ReportTco.java ReportInvestment.java ReportTool.java ReportStaff.java Log Message: Refactoring: Log-API adapted Index: ReportInvestment.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportInvestment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportInvestment.java 13 Jan 2006 17:43:28 -0000 1.3 --- ReportInvestment.java 29 Jun 2006 22:50:05 -0000 1.4 *************** *** 1,4 **** --- 1,19 ---- package org.tcotool.standard.report; + /* + * 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.Iterator; *************** *** 13,17 **** import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator; - import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.Tracer; --- 28,31 ---- *************** *** 77,81 **** encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(this, "encodeCostBlock()", e.getLocalizedMessage()); } --- 91,95 ---- encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } Index: ReportTco.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTco.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportTco.java 18 Mar 2006 17:12:56 -0000 1.4 --- ReportTco.java 29 Jun 2006 22:50:05 -0000 1.5 *************** *** 90,94 **** encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(this, "encodeCostBlock()", e.getLocalizedMessage()); } --- 90,94 ---- encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } Index: ReportTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReportTool.java 7 May 2006 14:41:16 -0000 1.6 --- ReportTool.java 29 Jun 2006 22:50:05 -0000 1.7 *************** *** 1,3 **** --- 1,19 ---- package org.tcotool.standard.report; + + /* + * 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.net.URL; *************** *** 79,83 **** } } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().developerError(this, "amount()", "INGORED: SystemParameter's FAILURE"); } switch (exponent) { --- 95,99 ---- } } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().developerError("INGORED: SystemParameter's FAILURE"); } switch (exponent) { *************** *** 152,156 **** getCsvWriter().cell(tmp + LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency() + "]" + currency); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeError(this, "encodeCostUnit()", "INGORED: SystemParameters FAILURE"); getCsvWriter().cell(tmp + UNKNOWN + "]" + currency); } --- 168,172 ---- getCsvWriter().cell(tmp + LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency() + "]" + currency); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeWarning("INGORED: SystemParameters FAILURE: " + e.getLocalizedMessage()); getCsvWriter().cell(tmp + UNKNOWN + "]" + currency); } *************** *** 281,285 **** return getCostUnit(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency()); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeError(this, "getCostUnit()", "INGORED: SystemParameters FAILURE"); return UNKNOWN; } --- 297,301 ---- return getCostUnit(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency()); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeWarning("INGORED: SystemParameters FAILURE: " + e.getLocalizedMessage()); return UNKNOWN; } *************** *** 299,303 **** return unit + (currency == null ? UNKNOWN : currency.getNameString()); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeError(this, "getCostUnit()", "INGORED: SystemParameters FAILURE"); return ""; } --- 315,319 ---- return unit + (currency == null ? UNKNOWN : currency.getNameString()); } catch(Throwable e) { ! ch.softenvironment.util.Tracer.getInstance().runtimeWarning("INGORED: SystemParameters FAILURE: " + e.getLocalizedMessage()); return ""; } *************** *** 322,326 **** } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(ReportTool.class, "getDepreciationDuration()", e.getLocalizedMessage()); } return duration.longValue(); --- 338,342 ---- } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } return duration.longValue(); *************** *** 351,355 **** } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(ReportTool.class, "getUsageDuration()", e.getLocalizedMessage()); } return duration.longValue(); --- 367,371 ---- } } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } return duration.longValue(); Index: ReportStaff.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportStaff.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReportStaff.java 13 Jan 2006 17:43:28 -0000 1.3 --- ReportStaff.java 29 Jun 2006 22:50:05 -0000 1.4 *************** *** 25,29 **** import ch.softenvironment.jomm.mvc.controller.DbCodeTypeComparator; - import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.NlsUtils; --- 25,28 ---- *************** *** 164,168 **** encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(this, "encodeCostBlock()", e.getLocalizedMessage()); } --- 163,167 ---- encodeCostBlockColumns(root, codeUndefined); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(null, e); } *************** *** 202,231 **** endTableRow(); } ! /** ! * Write one cell in HTML-Stream and two cells in CSV-Stream ! * => <label> = <value> ! * @param label ! * @param value ! * @throws IOException ! */ ! private void boldValuePair(String label, double value) throws IOException { ! boldValuePair(label, value, false); ! } ! private void boldValuePair(String label, double value, boolean includingCurrency) throws IOException { ! String val = ""; ! String curr = ""; ! if (includingCurrency) { ! val = amount(value); ! curr = includingCurrency ? " " + getCostUnit() : ""; ! } else { ! val = hourFormat.format(value); ! } ! ! bold(label + "= " + val + curr); ! getCsvWriter().cell(label + "= "); ! getCsvWriter().cell(val); ! if (includingCurrency) { ! getCsvWriter().cell(curr); ! } ! } ! } \ No newline at end of file --- 201,203 ---- endTableRow(); } ! } \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:08
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/tools Modified Files: ModelUtility.java Calculator.java CourseUtils.java Log Message: Refactoring: Log-API adapted Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ModelUtility.java 7 May 2006 14:57:27 -0000 1.9 --- ModelUtility.java 29 Jun 2006 22:50:05 -0000 1.10 *************** *** 432,436 **** if (parent == null) { // possible, for e.g. if drop to empty space in NavTree ! ch.softenvironment.util.Tracer.getInstance().developerWarning(this, "findParent(Object)", "parent not found!"); } //ch.softenvironment.util.Tracer.getInstance().debug("findParent(" + node + ") => " + parent); --- 432,436 ---- if (parent == null) { // possible, for e.g. if drop to empty space in NavTree ! ch.softenvironment.util.Tracer.getInstance().developerWarning("parent not found!"); } //ch.softenvironment.util.Tracer.getInstance().debug("findParent(" + node + ") => " + parent); *************** *** 569,573 **** CostCause code = (CostCause)itCauses.next(); if (iliCode.equals(code.getIliCode())) { ! Tracer.getInstance().debug(this, "fixModel()", "Morph enum: " + cost.getType().getNameString() + " => code: " + code.getNameString()); cost.setCause(code); cost.setType(null); --- 569,573 ---- CostCause code = (CostCause)itCauses.next(); if (iliCode.equals(code.getIliCode())) { ! Tracer.getInstance().debug("Morph enum: " + cost.getType().getNameString() + " => code: " + code.getNameString()); cost.setCause(code); cost.setType(null); *************** *** 685,689 **** return new ImageIcon(url); } catch (Exception e) { ! ch.softenvironment.util.Tracer.getInstance().developerError(this, "getIcon(..)", "image not found for =>" + type); } } --- 685,689 ---- return new ImageIcon(url); } catch (Exception e) { ! ch.softenvironment.util.Tracer.getInstance().developerError("image not found for =>" + type); } } *************** *** 713,717 **** } } catch(Exception e) { ! ch.softenvironment.util.Tracer.getInstance().developerError(this, "getImageURL(..)", "image not found for =>" + key); return null; } --- 713,717 ---- } } catch(Exception e) { ! ch.softenvironment.util.Tracer.getInstance().developerError("image not found for =>" + key); return null; } *************** *** 812,816 **** return ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false); } ! Tracer.getInstance().developerWarning(ModelUtility.class, "getTypeString()", "String for type: " + type); return "NYI"; } --- 812,816 ---- return ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false); } ! Tracer.getInstance().developerWarning("String for type: " + type); return "NYI"; } *************** *** 1092,1096 **** LauncherView.getInstance().getPnlNavigation().selectElement(object); } else { ! throw new UserException(ModelUtility.class, "relocateElement()", msg); } } --- 1092,1096 ---- LauncherView.getInstance().getPnlNavigation().selectElement(object); } else { ! throw new UserException(msg, "Move fault"); } } *************** *** 1300,1304 **** interest = getSystemParameter().getDepreciationInterestRate(); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(ReportTool.class, "getInterestRate()", e.getLocalizedMessage()); interest = new Double(4.0); } --- 1300,1304 ---- interest = getSystemParameter().getDepreciationInterestRate(); } catch(Throwable e) { ! Tracer.getInstance().runtimeWarning("IGNORE: set default: " + e.getLocalizedMessage()); interest = new Double(4.0); } *************** *** 1316,1320 **** hours = getSystemParameter().getManYearHoursInternal(); } catch(Throwable e) { ! Tracer.getInstance().runtimeError(ReportTool.class, "getManYearHoursInternal()", e.getLocalizedMessage()); hours = new Long(1700); } --- 1316,1320 ---- hours = getSystemParameter().getManYearHoursInternal(); } catch(Throwable e) { ! Tracer.getInstance().runtimeWarning("IGNORE: set default: " + e.getLocalizedMessage()); hours = new Long(1700); } Index: CourseUtils.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/CourseUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CourseUtils.java 7 May 2006 14:55:32 -0000 1.1 --- CourseUtils.java 29 Jun 2006 22:50:05 -0000 1.2 *************** *** 74,78 **** } ! throw new UserException(CourseUtils.class, "getCourse()", "No course defined for <" + source.getNameString() + "> to <" + target.getNameString() + ">"); } } --- 74,78 ---- } ! throw new UserException("No course defined for <" + source.getNameString() + "> to <" + target.getNameString() + ">", "Course missing"); } } Index: Calculator.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/Calculator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Calculator.java 7 May 2006 14:41:16 -0000 1.4 --- Calculator.java 29 Jun 2006 22:50:05 -0000 1.5 *************** *** 352,356 **** calc((Service)object, multitude); } else { ! throw new DeveloperException(this, "walkPackage()", "TcoObject kind not implemented!"); } } --- 352,356 ---- calc((Service)object, multitude); } else { ! throw new DeveloperException("TcoObject kind not implemented!"); } } *************** *** 386,390 **** } else { if (cost.getAmount() == null) { ! Tracer.getInstance().developerWarning(this,"calc(Service)", "Autocorrection: cost#amount set to 0.0"); cost.setAmount(new Double(0.0)); } --- 386,390 ---- } else { if (cost.getAmount() == null) { ! Tracer.getInstance().developerWarning("Autocorrection: cost#amount set to 0.0"); cost.setAmount(new Double(0.0)); } *************** *** 528,532 **** } else { // should not happen ! Tracer.getInstance().developerWarning(this, "cummulateCodes()", "Occurance without Site[1] or Multitude[1]"); } } --- 528,532 ---- } else { // should not happen ! Tracer.getInstance().developerWarning("Occurance without Site[1] or Multitude[1]"); } } *************** *** 655,659 **** cummulateLists(results, getCosts(object, kind, COST_CAUSE_UNDEFINED)); } catch(Throwable e) { ! throw new UserException(this, "getTotal()", "Kostentyp-Code: " + e.getLocalizedMessage(), "Fehler bei der Berechnung", e); } return results; --- 655,659 ---- cummulateLists(results, getCosts(object, kind, COST_CAUSE_UNDEFINED)); } catch(Throwable e) { ! throw new UserException("Kostentyp-Code: " + e.getLocalizedMessage(), "Fehler bei der Berechnung", e); } return results; |
|
From: Hirzel P. <ph...@us...> - 2006-06-29 22:50:08
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/pluginsupport In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30229/src/org/tcotool/pluginsupport Modified Files: PluginUtility.java Log Message: Refactoring: Log-API adapted Index: PluginUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/pluginsupport/PluginUtility.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PluginUtility.java 20 Jan 2006 15:22:02 -0000 1.5 --- PluginUtility.java 29 Jun 2006 22:50:05 -0000 1.6 *************** *** 53,57 **** if (!folder.isDirectory()) { ! Tracer.getInstance().runtimeInfo(PluginUtility.class, "invokePlugins()", "no Plugins-Folder yet"); return null; } --- 53,57 ---- if (!folder.isDirectory()) { ! Tracer.getInstance().runtimeInfo("no Plugins-Folder yet"); return null; } *************** *** 66,70 **** File manifestFile = getManifestFile(pluginFolder); if (manifestFile != null) { ! Tracer.getInstance().debug(PluginUtility.class, "invokePlugins()", "Found Plugin-Manifest: " + manifestFile.toString()); //V0.5: pluginLocations.put(manifestFile, pluginFolder); final URL manifestUrl = manifestFile.toURL(); --- 66,70 ---- File manifestFile = getManifestFile(pluginFolder); if (manifestFile != null) { ! Tracer.getInstance().debug("Found Plugin-Manifest: " + manifestFile.toString()); //V0.5: pluginLocations.put(manifestFile, pluginFolder); final URL manifestUrl = manifestFile.toURL(); *************** *** 92,101 **** if (integrityCheckReport.countErrors() != 0) { // Something wrong in plug-ins set ! Tracer.getInstance().runtimeError(PluginUtility.class, "invokePlugins()", ! "integrity check done: errors - " + integrityCheckReport.countErrors() + ", warnings - " + integrityCheckReport.countWarnings()); ! Tracer.getInstance().runtimeError(PluginUtility.class, "invokePlugins()", integrityCheckReport2str(integrityCheckReport)); // throw new Exception("plug-ins integrity check failed"); } --- 92,100 ---- if (integrityCheckReport.countErrors() != 0) { // Something wrong in plug-ins set ! Tracer.getInstance().runtimeError("integrity check done: errors - " + integrityCheckReport.countErrors() + ", warnings - " + integrityCheckReport.countWarnings()); ! Tracer.getInstance().runtimeError(integrityCheckReport2str(integrityCheckReport)); // throw new Exception("plug-ins integrity check failed"); } |
|
From: Hirzel P. <ph...@us...> - 2006-05-17 07:50:49
|
Update of /cvsroot/tcotool/TCO-Tool/test/org/tcotool/standard/report/test In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11009/test/org/tcotool/standard/report/test Removed Files: ReportToolTestCase.java Log Message: Refactoring: remove obsolete classes --- ReportToolTestCase.java DELETED --- |
|
From: Hirzel P. <ph...@us...> - 2006-05-17 07:49:19
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10594/src/org/tcotool/model/resources Removed Files: CostType_de.properties CostType.properties Log Message: Refactoring: remove obsolete classes --- CostType_de.properties DELETED --- --- CostType.properties DELETED --- |
