Menu
▾
▴
[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/application FactCostDetailView.java,1.3,1.4 CostDriverDetailView.java,1.2,1.3 CostCauseDetailView.java,1.1,1.2 CodeDetailView.java,1.4,1.5 RoleDetailView.java,1.4,1.5 ModelDetailView.java,1.2,1.3 ServiceDetailView.java,1.2,1.3 PersonalCostDetailView.java,1.3,1.4 PackageDetailView.java,1.2,1.3
|
From: Hirzel P. <ph...@us...> - 2006-01-13 17:38:57
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23133/src/org/tcotool/application Modified Files: FactCostDetailView.java CostDriverDetailView.java CostCauseDetailView.java CodeDetailView.java RoleDetailView.java ModelDetailView.java ServiceDetailView.java PersonalCostDetailView.java PackageDetailView.java Log Message: Refactoring: NLS enhancements Index: CostDriverDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CostDriverDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CostDriverDetailView.java 20 Nov 2005 15:52:08 -0000 1.2 --- CostDriverDetailView.java 13 Jan 2006 17:38:47 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- import org.tcotool.model.*; + import org.tcotool.model.Process; import org.tcotool.tools.ModelUtility; /** *************** *** 1405,1409 **** ivjLblCycle.setText("Lebenszyklus:"); // user code begin {1} ! ivjLblCycle.setText(getResourceString("LblCycle_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1406,1410 ---- ivjLblCycle.setText("Lebenszyklus:"); // user code begin {1} ! ivjLblCycle.setText(ModelUtility.getTypeString(LifeCycle.class) + ":" /*getResourceString("LblCycle_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1494,1498 **** ivjLblPhase.setText("Projekt-Phase:"); // user code begin {1} ! ivjLblPhase.setText(getResourceString("LblPhase_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1495,1499 ---- ivjLblPhase.setText("Projekt-Phase:"); // user code begin {1} ! ivjLblPhase.setText(ModelUtility.getTypeString(ProjectPhase.class) + ":" /*getResourceString("LblPhase_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1516,1520 **** ivjLblProcess.setText("Prozess:"); // user code begin {1} ! ivjLblProcess.setText(getResourceString("LblProcess_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1517,1521 ---- ivjLblProcess.setText("Prozess:"); // user code begin {1} ! ivjLblProcess.setText(ModelUtility.getTypeString(Process.class) + ":" /*getResourceString("LblProcess_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 2496,2499 **** --- 2497,2505 ---- setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } Index: CostCauseDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CostCauseDetailView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CostCauseDetailView.java 28 Dec 2005 11:42:00 -0000 1.1 --- CostCauseDetailView.java 13 Jan 2006 17:38:47 -0000 1.2 *************** *** 840,843 **** --- 840,844 ---- if (((CostCause)object).getPersistencyState().isNew()) { ((CostCause)object).refresh(false); + ((CostCause)object).setDirect(Boolean.TRUE); } Index: ModelDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/ModelDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModelDetailView.java 20 Nov 2005 15:52:08 -0000 1.2 --- ModelDetailView.java 13 Jan 2006 17:38:47 -0000 1.3 *************** *** 1135,1138 **** --- 1135,1143 ---- getPnlImport().setVisible(false); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } Index: CodeDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CodeDetailView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CodeDetailView.java 28 Dec 2005 11:49:04 -0000 1.4 --- CodeDetailView.java 13 Jan 2006 17:38:47 -0000 1.5 *************** *** 23,27 **** --- 23,34 ---- import javax.swing.JFileChooser; + import org.tcotool.model.Activity; + import org.tcotool.model.Catalogue; import org.tcotool.model.CostCause; + import org.tcotool.model.CostCentre; + import org.tcotool.model.ProjectPhase; + import org.tcotool.model.Responsibility; + import org.tcotool.model.ServiceCategory; + import org.tcotool.model.Site; import org.tcotool.model.TcoModel; import org.tcotool.tools.ModelUtility; *************** *** 30,33 **** --- 37,41 ---- import ch.ehi.basics.view.GenericFileFilter; import ch.softenvironment.client.ResourceManager; + import ch.softenvironment.demoapp.model.Role; import ch.softenvironment.jomm.DbUserTransactionBlock; import ch.softenvironment.jomm.mvc.model.DbCode; *************** *** 129,134 **** */ public void changeObjects(Object source) { - // TODO Auto-generated method stub - } /** --- 137,140 ---- *************** *** 353,357 **** ivjLblCategory.setBounds(11, 28, 147, 14); // user code begin {1} ! ivjLblCategory.setText(getResourceString(ServiceDetailView.class, "LblCategory_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 359,363 ---- ivjLblCategory.setBounds(11, 28, 147, 14); // user code begin {1} ! ivjLblCategory.setText(ModelUtility.getTypeString(ServiceCategory.class) + ":" /*getResourceString(ServiceDetailView.class, "LblCategory_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 995,1010 **** } private void refreshCodes() throws Throwable { ! getPnlCategory().setCode(server, org.tcotool.model.ServiceCategory.class, ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false), DbObject.PROPERTY_NAME, null); ! getPnlResponsibility().setCode(server, org.tcotool.model.Responsibility.class, ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false), DbObject.PROPERTY_NAME, null); ! getPnlCostCentre().setCode(server, org.tcotool.model.CostCentre.class, ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false), DbObject.PROPERTY_NAME, null); ! getPnlPhase().setCode(server, org.tcotool.model.ProjectPhase.class, ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false), DbObject.PROPERTY_NAME, null); ! getPnlSite().setCode(server, org.tcotool.model.Site.class, ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false), DbObject.PROPERTY_NAME, SiteDetailView.class); getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text", false), DbObject.PROPERTY_NAME, null); ! getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false), DbObject.PROPERTY_NAME, CostCauseDetailView.class); ! getPnlCatalogue().setCode(server, org.tcotool.model.Catalogue.class, ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false), DbObject.PROPERTY_NAME, CatalogueDetailView.class); ! getPnlRole().setCode(server, org.tcotool.model.Role.class, ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false), DbObject.PROPERTY_NAME, RoleDetailView.class); ! getPnlActivity().setCode(server, org.tcotool.model.Activity.class, ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false), DbObject.PROPERTY_NAME, null); } /* (non-Javadoc) --- 1001,1016 ---- } private void refreshCodes() throws Throwable { ! getPnlCategory().setCode(server, org.tcotool.model.ServiceCategory.class, ModelUtility.getTypeString(ServiceCategory.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false)*/, DbObject.PROPERTY_NAME, null); ! getPnlResponsibility().setCode(server, org.tcotool.model.Responsibility.class, ModelUtility.getTypeString(Responsibility.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false)*/, DbObject.PROPERTY_NAME, null); ! getPnlCostCentre().setCode(server, org.tcotool.model.CostCentre.class, ModelUtility.getTypeString(CostCentre.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false)*/, DbObject.PROPERTY_NAME, null); ! getPnlPhase().setCode(server, ProjectPhase.class, ModelUtility.getTypeString(ProjectPhase.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false)*/, DbObject.PROPERTY_NAME, null); ! getPnlSite().setCode(server, Site.class, ModelUtility.getTypeString(Site.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblSite_text", false)*/, DbObject.PROPERTY_NAME, SiteDetailView.class); getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResource(CostDriverDetailView.class, "LblProcess_text", false), DbObject.PROPERTY_NAME, null); ! getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ModelUtility.getTypeString(CostCause.class) /*ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false)*/, DbObject.PROPERTY_NAME, CostCauseDetailView.class); ! getPnlCatalogue().setCode(server, org.tcotool.model.Catalogue.class, ModelUtility.getTypeString(Catalogue.class) /*ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, CatalogueDetailView.class); ! getPnlRole().setCode(server, org.tcotool.model.Role.class, ModelUtility.getTypeString(Role.class) /*ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, RoleDetailView.class); ! getPnlActivity().setCode(server, org.tcotool.model.Activity.class, ModelUtility.getTypeString(Activity.class) /*ResourceManager.getResource(PersonalCostDetailView.class, "LblActivity_text", false)*/, DbObject.PROPERTY_NAME, null); } /* (non-Javadoc) Index: PackageDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/PackageDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageDetailView.java 20 Nov 2005 15:52:08 -0000 1.2 --- PackageDetailView.java 13 Jan 2006 17:38:47 -0000 1.3 *************** *** 921,924 **** --- 921,929 ---- setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } Index: FactCostDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/FactCostDetailView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FactCostDetailView.java 13 Dec 2005 12:49:01 -0000 1.3 --- FactCostDetailView.java 13 Jan 2006 17:38:47 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- package org.tcotool.application; + /* * This library is free software; you can redistribute it and/or *************** *** 70,74 **** private ch.softenvironment.view.swingext.NumberTextField ivjTxtCostTotal = null; private ch.softenvironment.view.swingext.NumberTextField ivjJTextField31111 = null; - private javax.swing.JLabel ivjLblType = null; private boolean ivjConnPtoP11Aligning = false; private javax.swing.JLabel ivjLblSerialNumber = null; --- 71,74 ---- *************** *** 149,153 **** if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("estimated"))) connPtoP5SetTarget(); ! if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("type"))) connPtoP10SetTarget(); if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) --- 149,153 ---- if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("estimated"))) connPtoP5SetTarget(); ! if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("cause"))) connPtoP10SetTarget(); if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) *************** *** 197,200 **** --- 197,210 ---- }; }; + private javax.swing.JLabel ivjLblCause = null; + /** + * Constructor + * @param viewOptions Symbol + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + public FactCostDetailView(ch.softenvironment.view.ViewOptions viewOptions) { + super(viewOptions); + initialize(); + } /** * Constructor *************** *** 211,236 **** public void assignObjects(java.util.List objects) {} /** - * Refresh Costs. - */ - private void refreshTotal() { - try { - if (getCbxCatalogue().getSelectedItem() == null) { - getTxtCost().setEditable(true); - getCbxCurrency().setEnabled(true); - getChxEstimated().setEnabled(true); - } else { - getTxtCost().setEditable(false); - getCbxCurrency().setEnabled(false); - getChxEstimated().setEnabled(false); - // by default Catalogue parts are known in price - getChxEstimated().setSelected(false); - ModelUtility.updateCatalogue(getObject()); - } - getTxtCostTotal().setText(ch.softenvironment.util.AmountFormat.toString(org.tcotool.tools.Calculator.calc(getObject()))); - } catch(Throwable e) { - handleException(e); - } - } - /** * connEtoC1: (PnlStandardToolbar.currentObject --> ServiceDetailView.executeSetCurrentObject(Ljava.lang.Object;)V) * @param arg1 java.beans.PropertyChangeEvent --- 221,224 ---- *************** *** 298,302 **** ivjConnPtoP10Aligning = true; if ((getObject() != null)) { ! getObject().setType((org.tcotool.model.CostType)getCbxCostType().getSelectedItem()); } // user code begin {2} --- 286,290 ---- ivjConnPtoP10Aligning = true; if ((getObject() != null)) { ! getObject().setCause((org.tcotool.model.CostCause)getCbxCostType().getSelectedItem()); } // user code begin {2} *************** *** 323,327 **** ivjConnPtoP10Aligning = true; if ((getObject() != null)) { ! getCbxCostType().setSelectedItem(getObject().getType()); } // user code begin {2} --- 311,315 ---- ivjConnPtoP10Aligning = true; if ((getObject() != null)) { ! getCbxCostType().setSelectedItem(getObject().getCause()); } // user code begin {2} *************** *** 1475,1479 **** ivjLblAmount.setName("LblAmount"); ivjLblAmount.setText("Kosten:"); ! ivjLblAmount.setBounds(15, 159, 141, 14); // user code begin {1} ivjLblAmount.setText(ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text", true)); --- 1463,1467 ---- ivjLblAmount.setName("LblAmount"); ivjLblAmount.setText("Kosten:"); ! ivjLblAmount.setBounds(15, 159, 154, 14); // user code begin {1} ivjLblAmount.setText(ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text", true)); *************** *** 1498,1502 **** ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 131, 14); // user code begin {1} ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); --- 1486,1490 ---- ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 163, 14); // user code begin {1} ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); *************** *** 1521,1527 **** ivjLblCatalogue.setName("LblCatalogue"); ivjLblCatalogue.setText("Katalog-Teil:"); ! ivjLblCatalogue.setBounds(15, 126, 141, 14); // user code begin {1} ! ivjLblCatalogue.setText(ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", true)); // user code end } catch (java.lang.Throwable ivjExc) { --- 1509,1515 ---- ivjLblCatalogue.setName("LblCatalogue"); ivjLblCatalogue.setText("Katalog-Teil:"); ! ivjLblCatalogue.setBounds(15, 126, 154, 14); // user code begin {1} ! ivjLblCatalogue.setText(ModelUtility.getTypeString(Catalogue.class) + ":" /*ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", true)*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1534,1537 **** --- 1522,1548 ---- } /** + * Return the LblCostType property value. + * @return javax.swing.JLabel + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JLabel getLblCause() { + if (ivjLblCause == null) { + try { + ivjLblCause = new javax.swing.JLabel(); + ivjLblCause.setName("LblCause"); + ivjLblCause.setText("Kostenart:"); + ivjLblCause.setBounds(15, 21, 154, 14); + // user code begin {1} + ivjLblCause.setText(ModelUtility.getTypeString(CostCause.class) + ":" /*ch.softenvironment.client.ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", true)*/); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjLblCause; + } + /** * Return the JLabel312 property value. * @return javax.swing.JLabel *************** *** 1545,1549 **** ivjLblDepreciationDuration.setToolTipText("Buchhalterische Abschreibungsdauer"); ivjLblDepreciationDuration.setText("Abschreibung (BH):"); ! ivjLblDepreciationDuration.setBounds(15, 80, 141, 14); // user code begin {1} ivjLblDepreciationDuration.setToolTipText(getResourceString("LblDepreciationDuration_toolTipText")); --- 1556,1560 ---- ivjLblDepreciationDuration.setToolTipText("Buchhalterische Abschreibungsdauer"); ivjLblDepreciationDuration.setText("Abschreibung (BH):"); ! ivjLblDepreciationDuration.setBounds(15, 80, 154, 14); // user code begin {1} ivjLblDepreciationDuration.setToolTipText(getResourceString("LblDepreciationDuration_toolTipText")); *************** *** 1615,1619 **** ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); ! ivjLblMultitude.setBounds(17, 41, 131, 14); // user code begin {1} ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); --- 1626,1630 ---- ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); ! ivjLblMultitude.setBounds(17, 41, 163, 14); // user code begin {1} ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); *************** *** 1638,1642 **** ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); ! ivjLblName.setBounds(17, 16, 131, 14); // user code begin {1} ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); --- 1649,1653 ---- ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); ! ivjLblName.setBounds(17, 16, 163, 14); // user code begin {1} ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); *************** *** 1781,1785 **** ivjLblTotal.setToolTipText("Kosten * Menge"); ivjLblTotal.setText("Total:"); ! ivjLblTotal.setBounds(15, 188, 141, 14); ivjLblTotal.setForeground(java.awt.Color.red); // user code begin {1} --- 1792,1796 ---- ivjLblTotal.setToolTipText("Kosten * Menge"); ivjLblTotal.setText("Total:"); ! ivjLblTotal.setBounds(15, 188, 154, 14); ivjLblTotal.setForeground(java.awt.Color.red); // user code begin {1} *************** *** 1796,1822 **** } /** - * Return the LblCostType property value. - * @return javax.swing.JLabel - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private javax.swing.JLabel getLblType() { - if (ivjLblType == null) { - try { - ivjLblType = new javax.swing.JLabel(); - ivjLblType.setName("LblType"); - ivjLblType.setText("Kostenart:"); - ivjLblType.setBounds(15, 21, 141, 14); - // user code begin {1} - ivjLblType.setText(ch.softenvironment.client.ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", true)); - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjLblType; - } - /** * Return the JLabel31 property value. * @return javax.swing.JLabel --- 1807,1810 ---- *************** *** 1830,1834 **** ivjLblUsageDuration.setToolTipText("Geplante Einsatzdauer bis zur Ablösung"); ivjLblUsageDuration.setText("TCO-Nutzungsdauer:"); ! ivjLblUsageDuration.setBounds(15, 60, 141, 14); // user code begin {1} ivjLblUsageDuration.setToolTipText(getResourceString("LblUsageDuration_toolTipText")); --- 1818,1822 ---- ivjLblUsageDuration.setToolTipText("Geplante Einsatzdauer bis zur Ablösung"); ivjLblUsageDuration.setText("TCO-Nutzungsdauer:"); ! ivjLblUsageDuration.setBounds(15, 60, 154, 14); // user code begin {1} ivjLblUsageDuration.setToolTipText(getResourceString("LblUsageDuration_toolTipText")); *************** *** 1874,1878 **** getPnlDetail().add(getTxtDepreciation(), getTxtDepreciation().getName()); getPnlDetail().add(getLblMonthDepreciation(), getLblMonthDepreciation().getName()); ! getPnlDetail().add(getLblType(), getLblType().getName()); getPnlDetail().add(getCbxCostType(), getCbxCostType().getName()); getPnlDetail().add(getLblTotal(), getLblTotal().getName()); --- 1862,1866 ---- getPnlDetail().add(getTxtDepreciation(), getTxtDepreciation().getName()); getPnlDetail().add(getLblMonthDepreciation(), getLblMonthDepreciation().getName()); ! getPnlDetail().add(getLblCause(), getLblCause().getName()); getPnlDetail().add(getCbxCostType(), getCbxCostType().getName()); getPnlDetail().add(getLblTotal(), getLblTotal().getName()); *************** *** 2324,2327 **** --- 2312,2320 ---- setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } *************** *** 2338,2350 **** // set defaults according to Catalogue Catalogue catalogue = (Catalogue)getCbxCatalogue().getSelectedItem(); getObject().setName(catalogue.getNameString()); - if (catalogue.getDepreciationDuration() != null) { - getObject().setDepreciationDuration(catalogue.getDepreciationDuration()); - } - if (catalogue.getUsageDuration() != null) { - getObject().setUsageDuration(catalogue.getUsageDuration()); - } } ! refreshTotal(); if (caller != null) { ((CostDriverDetailView)caller).refreshCost(); --- 2331,2338 ---- // set defaults according to Catalogue Catalogue catalogue = (Catalogue)getCbxCatalogue().getSelectedItem(); + // other catalog assigned -> reuse name initially getObject().setName(catalogue.getNameString()); } ! refreshTotal(); // will also set catalogue changes if (caller != null) { ((CostDriverDetailView)caller).refreshCost(); *************** *** 2360,2363 **** --- 2348,2370 ---- public void redoObject() {} /** + * Refresh Costs. + */ + private void refreshTotal() { + try { + boolean catalogMissing = getCbxCatalogue().getSelectedItem() == null; + getTxtCost().setEditable(catalogMissing); + getCbxCurrency().setEnabled(catalogMissing); + getChxEstimated().setEnabled(catalogMissing); + getTxtUsage().setEditable(catalogMissing); + getTxtDepreciation().setEditable(catalogMissing); + if (!catalogMissing) { + ModelUtility.updateCatalogue(getObject()); + } + getTxtCostTotal().setText(ch.softenvironment.util.AmountFormat.toString(org.tcotool.tools.Calculator.calc(getObject()))); + } catch(Throwable e) { + handleException(e); + } + } + /** * Save an Object represented by DetailView. */ *************** *** 2432,2436 **** DbObjectServer server = ((DbObject)object).getObjectServer(); ! getCbxCostType().setModel(new DbComboBoxModel(server.retrieveCodes( CostType.class), DbObject.PROPERTY_NAME)); getCbxCurrency().setModel(new DbComboBoxModel(server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME)); getCbxCurrencyTotal().setModel(new DbComboBoxModel(server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME)); --- 2439,2443 ---- DbObjectServer server = ((DbObject)object).getObjectServer(); ! getCbxCostType().setModel(new DbComboBoxModel(server.retrieveCodes(CostCause.class), DbObject.PROPERTY_NAME)); getCbxCurrency().setModel(new DbComboBoxModel(server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME)); getCbxCurrencyTotal().setModel(new DbComboBoxModel(server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME)); *************** *** 2438,2445 **** setObject((org.tcotool.model.FactCost)object); refreshTotal(); getObject().addPropertyChangeListener(getConsistencyController()); - // to be informed to recalc sums getObject().addPropertyChangeListener(this); --- 2445,2452 ---- setObject((org.tcotool.model.FactCost)object); + refreshTotal(); getObject().addPropertyChangeListener(getConsistencyController()); // to be informed to recalc sums getObject().addPropertyChangeListener(this); Index: PersonalCostDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/PersonalCostDetailView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PersonalCostDetailView.java 14 Dec 2005 13:15:16 -0000 1.3 --- PersonalCostDetailView.java 13 Jan 2006 17:38:47 -0000 1.4 *************** *** 78,82 **** private boolean ivjConnPtoP14Aligning = false; private javax.swing.JLabel ivjLblAmount = null; - private javax.swing.JLabel ivjLblType = null; private boolean ivjConnPtoP15Aligning = false; private javax.swing.JCheckBox ivjChxRepeatable = null; --- 78,81 ---- *************** *** 147,151 **** if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) connPtoP11SetTarget(); ! if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("type"))) connPtoP14SetTarget(); if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("internal"))) --- 146,150 ---- if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) connPtoP11SetTarget(); ! if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("cause"))) connPtoP14SetTarget(); if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("internal"))) *************** *** 187,190 **** --- 186,190 ---- }; }; + private javax.swing.JLabel ivjLblCause = null; /** * Constructor *************** *** 451,455 **** ivjConnPtoP14Aligning = true; if ((getObject() != null)) { ! getObject().setType((org.tcotool.model.CostType)getCbxCostType().getSelectedItem()); } // user code begin {2} --- 451,455 ---- ivjConnPtoP14Aligning = true; if ((getObject() != null)) { ! getObject().setCause((org.tcotool.model.CostCause)getCbxCostType().getSelectedItem()); } // user code begin {2} *************** *** 476,480 **** ivjConnPtoP14Aligning = true; if ((getObject() != null)) { ! getCbxCostType().setSelectedItem(getObject().getType()); } // user code begin {2} --- 476,480 ---- ivjConnPtoP14Aligning = true; if ((getObject() != null)) { ! getCbxCostType().setSelectedItem(getObject().getCause()); } // user code begin {2} *************** *** 1403,1409 **** ivjLblActivity.setToolTipText("Workflow"); ivjLblActivity.setText("Aktivität:"); ! ivjLblActivity.setBounds(11, 39, 143, 14); // user code begin {1} ! ivjLblActivity.setText(getResourceString("LblActivity_text")); ivjLblActivity.setToolTipText(""); // user code end --- 1403,1409 ---- ivjLblActivity.setToolTipText("Workflow"); ivjLblActivity.setText("Aktivität:"); ! ivjLblActivity.setBounds(11, 39, 150, 14); // user code begin {1} ! ivjLblActivity.setText(ModelUtility.getTypeString(Activity.class) + ":" /*getResourceString("LblActivity_text")*/); ivjLblActivity.setToolTipText(""); // user code end *************** *** 1496,1500 **** ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 131, 14); // user code begin {1} ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); --- 1496,1500 ---- ivjLblBaseDate.setName("LblBaseDate"); ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 156, 14); // user code begin {1} ivjLblBaseDate.setText(getResourceString(ServiceDetailView.class, "LblBaseDate_text")); *************** *** 1509,1512 **** --- 1509,1535 ---- } /** + * Return the JLabel521132 property value. + * @return javax.swing.JLabel + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JLabel getLblCause() { + if (ivjLblCause == null) { + try { + ivjLblCause = new javax.swing.JLabel(); + ivjLblCause.setName("LblCause"); + ivjLblCause.setText("Kostenart:"); + ivjLblCause.setBounds(11, 11, 148, 14); + // user code begin {1} + ivjLblCause.setText(ModelUtility.getTypeString(CostCause.class) + ":" /*ch.softenvironment.client.ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", true)*/); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjLblCause; + } + /** * Return the JLabel1 property value. * @return javax.swing.JLabel *************** *** 1587,1591 **** ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); ! ivjLblMultitude.setBounds(17, 41, 131, 14); // user code begin {1} ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); --- 1610,1614 ---- ivjLblMultitude.setName("LblMultitude"); ivjLblMultitude.setText("Menge:"); ! ivjLblMultitude.setBounds(17, 41, 156, 14); // user code begin {1} ivjLblMultitude.setText(getResourceString(ServiceDetailView.class, "LblMultitude_text")); *************** *** 1610,1614 **** ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); ! ivjLblName.setBounds(17, 16, 131, 14); // user code begin {1} ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); --- 1633,1637 ---- ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); ! ivjLblName.setBounds(17, 16, 156, 14); // user code begin {1} ivjLblName.setText(getResourceString(ServiceDetailView.class, "LblName_text")); *************** *** 1672,1698 **** } /** - * Return the JLabel521132 property value. - * @return javax.swing.JLabel - */ - /* WARNING: THIS METHOD WILL BE REGENERATED. */ - private javax.swing.JLabel getLblType() { - if (ivjLblType == null) { - try { - ivjLblType = new javax.swing.JLabel(); - ivjLblType.setName("LblType"); - ivjLblType.setText("Kostenart:"); - ivjLblType.setBounds(11, 11, 141, 14); - // user code begin {1} - ivjLblType.setText(ch.softenvironment.client.ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", true)); - // user code end - } catch (java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjLblType; - } - /** * Return the Object property value. * @return org.tcotool.model.TcoObject --- 1695,1698 ---- *************** *** 1724,1728 **** getPnlDetail().add(getTxtCostTotal(), getTxtCostTotal().getName()); getPnlDetail().add(getCbxCurrencyTotal(), getCbxCurrencyTotal().getName()); ! getPnlDetail().add(getLblType(), getLblType().getName()); getPnlDetail().add(getCbxCostType(), getCbxCostType().getName()); getPnlDetail().add(getChxRepeatable(), getChxRepeatable().getName()); --- 1724,1728 ---- getPnlDetail().add(getTxtCostTotal(), getTxtCostTotal().getName()); getPnlDetail().add(getCbxCurrencyTotal(), getCbxCurrencyTotal().getName()); ! getPnlDetail().add(getLblCause(), getLblCause().getName()); getPnlDetail().add(getCbxCostType(), getCbxCostType().getName()); getPnlDetail().add(getChxRepeatable(), getChxRepeatable().getName()); *************** *** 1784,1788 **** // user code begin {1} getPnlRole().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ch.softenvironment.client.ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end --- 1784,1788 ---- // user code begin {1} getPnlRole().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ModelUtility.getTypeString(Role.class) /*ch.softenvironment.client.ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")*/), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end *************** *** 2082,2085 **** --- 2082,2090 ---- setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } *************** *** 2223,2227 **** DbObjectServer server = ((DbObject)object).getObjectServer(); ! getCbxCostType().setModel(new DbComboBoxModel(server.retrieveCodes(CostType.class), DbObject.PROPERTY_NAME)); getCbxRole().setModel(new DbComboBoxModel(server.retrieveCodes(Role.class), DbObject.PROPERTY_NAME)); getCbxActivity().setModel(new DbComboBoxModel(server.retrieveCodes(Activity.class), DbObject.PROPERTY_NAME)); --- 2228,2232 ---- DbObjectServer server = ((DbObject)object).getObjectServer(); ! getCbxCostType().setModel(new DbComboBoxModel(server.retrieveCodes(CostCause.class), DbObject.PROPERTY_NAME)); getCbxRole().setModel(new DbComboBoxModel(server.retrieveCodes(Role.class), DbObject.PROPERTY_NAME)); getCbxActivity().setModel(new DbComboBoxModel(server.retrieveCodes(Activity.class), DbObject.PROPERTY_NAME)); Index: ServiceDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/ServiceDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServiceDetailView.java 20 Nov 2005 15:52:08 -0000 1.2 --- ServiceDetailView.java 13 Jan 2006 17:38:47 -0000 1.3 *************** *** 1439,1443 **** ivjLblCategory.setBounds(10, 14, 139, 14); // user code begin {1} ! ivjLblCategory.setText(getResourceString("LblCategory_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1439,1443 ---- ivjLblCategory.setBounds(10, 14, 139, 14); // user code begin {1} ! ivjLblCategory.setText(ModelUtility.getTypeString(ServiceCategory.class) + ":" /*getResourceString("LblCategory_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1462,1466 **** ivjLblCostCentre.setBounds(10, 62, 139, 14); // user code begin {1} ! ivjLblCostCentre.setText(getResourceString("LblCostCentre_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1462,1466 ---- ivjLblCostCentre.setBounds(10, 62, 139, 14); // user code begin {1} ! ivjLblCostCentre.setText(ModelUtility.getTypeString(CostCentre.class) + ":" /*getResourceString("LblCostCentre_text")*/); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1555,1559 **** ivjLblResponsibility.setBounds(10, 37, 139, 14); // user code begin {1} ! ivjLblResponsibility.setText(getResourceString("LblResponsibility_text")); ivjLblResponsibility.setToolTipText(getResourceString("LblResponsibility_toolTipText")); // user code end --- 1555,1559 ---- ivjLblResponsibility.setBounds(10, 37, 139, 14); // user code begin {1} ! ivjLblResponsibility.setText(ModelUtility.getTypeString(Responsibility.class) + ":" /*getResourceString("LblResponsibility_text")*/); ivjLblResponsibility.setToolTipText(getResourceString("LblResponsibility_toolTipText")); // user code end *************** *** 2509,2512 **** --- 2509,2517 ---- setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); + + if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { + getLblBaseDate().setVisible(false); + getTxtBaseDate().setVisible(false); + } // user code end } Index: RoleDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/RoleDetailView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RoleDetailView.java 16 Dec 2005 13:34:45 -0000 1.4 --- RoleDetailView.java 13 Jan 2006 17:38:47 -0000 1.5 *************** *** 1447,1451 **** if (((Role)object).getPersistencyState().isNew()) { - // org.tcotool.model.Role code = (org.tcotool.model.Role)server.createInstance(org.tcotool.model.Role.class); ((Role)object).refresh(false); ModelUtility.initializeRole(((Role)object), LauncherView.getInstance().getUtility().getSystemParameter()); --- 1447,1450 ---- |
