Menu
▾
▴
[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/application PersonalCostDetailView.java, 1.6, 1.7 FactCostDetailView.java, 1.6, 1.7
|
From: Hirzel P. <ph...@us...> - 2008-05-18 14:55:32
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20540/src/org/tcotool/application Modified Files: PersonalCostDetailView.java FactCostDetailView.java Log Message: Feature: Cost#baseOffset, #expendable Index: PersonalCostDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/PersonalCostDetailView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PersonalCostDetailView.java 13 Jun 2007 20:13:56 -0000 1.6 --- PersonalCostDetailView.java 18 May 2008 14:55:35 -0000 1.7 *************** *** 36,44 **** private boolean ivjConnPtoP4Aligning = false; private javax.swing.JLabel ivjLblMultitude = null; - private boolean ivjConnPtoP9Aligning = false; private ch.softenvironment.view.SimpleEditorPanel ivjPnlNote = null; - private javax.swing.JLabel ivjLblBaseDate = null; private javax.swing.JLabel ivjLblName = null; - private ch.softenvironment.view.swingext.DateTextField ivjTxtBaseDate = null; private ch.softenvironment.view.swingext.NumberTextField ivjTxtMultitude = null; private javax.swing.JTextField ivjTxtName = null; --- 36,41 ---- *************** *** 78,81 **** --- 75,81 ---- private ch.softenvironment.view.swingext.NumberTextField ivjTxtAvailableHours = null; private javax.swing.JLabel ivjLblCause = null; + private javax.swing.JLabel ivjLblBaseOffset = null; + private ch.softenvironment.view.swingext.NumberTextField ivjTxtBaseOffset = null; + private javax.swing.JLabel ivjLblMonthBaseOffset = null; class IvjEventHandler implements ch.softenvironment.view.SimpleEditorPanelListener, ch.softenvironment.view.ToolBarListener, java.awt.event.ItemListener, java.awt.event.KeyListener, java.beans.PropertyChangeListener { *************** *** 110,113 **** --- 110,115 ---- if (e.getSource() == PersonalCostDetailView.this.getTxtMultitude()) connPtoP4SetSource(); + if (e.getSource() == PersonalCostDetailView.this.getTxtBaseOffset()) + connPtoP9SetSource(); }; public void keyTyped(java.awt.event.KeyEvent e) {}; *************** *** 147,156 **** if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("multitude"))) connPtoP4SetTarget(); - if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("baseDate"))) - connPtoP9SetTarget(); - if (evt.getSource() == PersonalCostDetailView.this.getTxtBaseDate() && (evt.getPropertyName().equals("date"))) - connPtoP9SetSource(); if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) connPtoP18SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; --- 149,156 ---- if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("multitude"))) connPtoP4SetTarget(); if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("currency"))) connPtoP18SetTarget(); + if (evt.getSource() == PersonalCostDetailView.this.getObject() && (evt.getPropertyName().equals("baseOffset"))) + connPtoP9SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; *************** *** 173,176 **** --- 173,177 ---- }; }; + private boolean ivjConnPtoP9Aligning = false; /** * Constructor *************** *** 1025,1029 **** } /** ! * connPtoP9SetSource: (Object.baseDate <--> TxtDate.date) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ --- 1026,1030 ---- } /** ! * connPtoP9SetSource: (Object.baseOffset <--> TxtBaseOffset.text) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ *************** *** 1036,1040 **** ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getObject().setBaseDate(getTxtBaseDate().getDate()); } // user code begin {2} --- 1037,1041 ---- ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getObject().setBaseOffset(new java.lang.Long(getTxtBaseOffset().getText())); } // user code begin {2} *************** *** 1050,1054 **** } /** ! * connPtoP9SetTarget: (Object.baseDate <--> TxtDate.date) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ --- 1051,1055 ---- } /** ! * connPtoP9SetTarget: (Object.baseOffset <--> TxtBaseOffset.text) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ *************** *** 1061,1065 **** ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getTxtBaseDate().setDate(getObject().getBaseDate()); } // user code begin {2} --- 1062,1066 ---- ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getTxtBaseOffset().setText(String.valueOf(getObject().getBaseOffset())); } // user code begin {2} *************** *** 1339,1345 **** 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 --- 1340,1347 ---- getJPanel1().add(getJTabbedPane1(), getJTabbedPane1().getName()); getJPanel1().add(getLblMultitude(), getLblMultitude().getName()); ! getJPanel1().add(getLblBaseOffset(), getLblBaseOffset().getName()); getJPanel1().add(getTxtMultitude(), getTxtMultitude().getName()); ! getJPanel1().add(getTxtBaseOffset(), getTxtBaseOffset().getName()); ! getJPanel1().add(getLblMonthBaseOffset(), getLblMonthBaseOffset().getName()); // user code begin {1} // user code end *************** *** 1476,1488 **** */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private javax.swing.JLabel getLblBaseDate() { ! if (ivjLblBaseDate == null) { try { ! ivjLblBaseDate = new javax.swing.JLabel(); ! ivjLblBaseDate.setName("LblBaseDate"); ! ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 156, 14); // user code begin {1} ! ivjLblBaseDate.setText(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1478,1491 ---- */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private javax.swing.JLabel getLblBaseOffset() { ! if (ivjLblBaseOffset == null) { try { ! ivjLblBaseOffset = new javax.swing.JLabel(); ! ivjLblBaseOffset.setName("LblBaseOffset"); ! ivjLblBaseOffset.setText("Bezugsdatum:"); ! ivjLblBaseOffset.setBounds(17, 63, 156, 14); // user code begin {1} ! ivjLblBaseOffset.setText(ResourceManager.getResource(FactCostDetailView.class, "LblBaseOffset_text")); ! ivjLblBaseOffset.setToolTipText(ResourceManager.getResource(FactCostDetailView.class, "LblBaseOffset_toolTipText")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1492,1496 **** } } ! return ivjLblBaseDate; } /** --- 1495,1499 ---- } } ! return ivjLblBaseOffset; } /** *************** *** 1587,1590 **** --- 1590,1617 ---- } /** + * Return the LblMonthBaseOffset property value. + * @return javax.swing.JLabel + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JLabel getLblMonthBaseOffset() { + if (ivjLblMonthBaseOffset == null) { + try { + ivjLblMonthBaseOffset = new javax.swing.JLabel(); + ivjLblMonthBaseOffset.setName("LblMonthBaseOffset"); + ivjLblMonthBaseOffset.setText("Monate"); + ivjLblMonthBaseOffset.setBounds(263, 63, 73, 14); + // user code begin {1} + ivjLblMonthBaseOffset.setText(ResourceManager.getResource(FactCostDetailView.class, "LblMonths_text")); + ivjLblMonthBaseOffset.setBounds(263, 63, 73, 14); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjLblMonthBaseOffset; + } + /** * Return the LblMultitude property value. * @return javax.swing.JLabel *************** *** 1846,1861 **** } /** ! * Return the TxtBaseDate property value. ! * @return ch.softenvironment.view.swingext.DateTextField */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private ch.softenvironment.view.swingext.DateTextField getTxtBaseDate() { ! if (ivjTxtBaseDate == null) { try { ! ivjTxtBaseDate = new ch.softenvironment.view.swingext.DateTextField(); ! ivjTxtBaseDate.setName("TxtBaseDate"); ! ivjTxtBaseDate.setBounds(180, 60, 95, 20); ! ivjTxtBaseDate.setEditable(false); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { --- 1873,1889 ---- } /** ! * Return the TxtBaseOffset property value. ! * @return ch.softenvironment.view.swingext.NumberTextField */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private ch.softenvironment.view.swingext.NumberTextField getTxtBaseOffset() { ! if (ivjTxtBaseOffset == null) { try { ! ivjTxtBaseOffset = new ch.softenvironment.view.swingext.NumberTextField(); ! ivjTxtBaseOffset.setName("TxtBaseOffset"); ! ivjTxtBaseOffset.setBounds(180, 60, 73, 20); ! ivjTxtBaseOffset.setEditable(true); // user code begin {1} + ivjTxtBaseOffset.setBounds(180, 60, 73, 20); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1865,1869 **** } } ! return ivjTxtBaseDate; } /** --- 1893,1897 ---- } } ! return ivjTxtBaseOffset; } /** *************** *** 2026,2030 **** getTxtHours().addKeyListener(ivjEventHandler); getTxtMultitude().addKeyListener(ivjEventHandler); ! getTxtBaseDate().addPropertyChangeListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP1SetTarget(); --- 2054,2058 ---- getTxtHours().addKeyListener(ivjEventHandler); getTxtMultitude().addKeyListener(ivjEventHandler); ! getTxtBaseOffset().addKeyListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP1SetTarget(); *************** *** 2043,2048 **** connPtoP7SetTarget(); connPtoP4SetTarget(); - connPtoP9SetTarget(); connPtoP18SetTarget(); } /** --- 2071,2076 ---- connPtoP7SetTarget(); connPtoP4SetTarget(); connPtoP18SetTarget(); + connPtoP9SetTarget(); } /** *************** *** 2070,2078 **** getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(PersonalCost.class)); getPnlStandardToolbar().setObjects(getObjects()); - - if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { - getLblBaseDate().setVisible(false); - getTxtBaseDate().setVisible(false); - } // user code end } --- 2098,2101 ---- *************** *** 2220,2229 **** DbObjectServer server = ((DbObject)object).getObjectServer(); ! JComboBoxUtility.initComboBox(getCbxCostType(), server.retrieveCodes(CostCause.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxRole(), server.retrieveCodes(Role.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxActivity(), server.retrieveCodes(Activity.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyRole(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrency(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyTotal(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); setObject((org.tcotool.model.PersonalCost)object); --- 2243,2252 ---- DbObjectServer server = ((DbObject)object).getObjectServer(); ! JComboBoxUtility.initComboBox(getCbxCostType(), server.retrieveCodes(CostCause.class), "nameString", false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxRole(), server.retrieveCodes(Role.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxActivity(), server.retrieveCodes(Activity.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCurrencyRole(), server.retrieveCodes(org.tcotool.model.Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCurrency(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCurrencyTotal(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); setObject((org.tcotool.model.PersonalCost)object); *************** *** 2270,2275 **** connPtoP7SetTarget(); connPtoP4SetTarget(); - connPtoP9SetTarget(); connPtoP18SetTarget(); // user code begin {1} // user code end --- 2293,2298 ---- connPtoP7SetTarget(); connPtoP4SetTarget(); connPtoP18SetTarget(); + connPtoP9SetTarget(); // user code begin {1} // user code end Index: FactCostDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/FactCostDetailView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FactCostDetailView.java 13 Jun 2007 20:13:56 -0000 1.6 --- FactCostDetailView.java 18 May 2008 14:55:35 -0000 1.7 *************** *** 51,57 **** private boolean ivjConnPtoP9Aligning = false; private ch.softenvironment.view.SimpleEditorPanel ivjPnlNote = null; - private javax.swing.JLabel ivjLblBaseDate = null; private javax.swing.JLabel ivjLblName = null; - private ch.softenvironment.view.swingext.DateTextField ivjTxtBaseDate = null; private ch.softenvironment.view.swingext.NumberTextField ivjTxtMultitude = null; private javax.swing.JTextField ivjTxtName = null; --- 51,55 ---- *************** *** 97,100 **** --- 95,104 ---- private boolean ivjConnPtoP19Aligning = false; private javax.swing.JComboBox ivjCbxCatalogue = null; + private javax.swing.JLabel ivjLblCause = null; + private javax.swing.JLabel ivjLblBaseOffset = null; + private ch.softenvironment.view.swingext.NumberTextField ivjTxtBaseOffset = null; + private javax.swing.JLabel ivjLblMonthBaseOffset = null; + private javax.swing.JCheckBox ivjChxExpendable = null; + private boolean ivjConnPtoP20Aligning = false; class IvjEventHandler implements ch.softenvironment.view.SimpleEditorPanelListener, ch.softenvironment.view.ToolBarListener, java.awt.event.ItemListener, java.awt.event.KeyListener, java.beans.PropertyChangeListener { *************** *** 112,115 **** --- 116,121 ---- if (e.getSource() == FactCostDetailView.this.getCbxCurrency()) connPtoP12SetTarget(); + if (e.getSource() == FactCostDetailView.this.getChxExpendable()) + connPtoP20SetSource(); }; public void keyPressed(java.awt.event.KeyEvent e) {}; *************** *** 133,136 **** --- 139,144 ---- if (e.getSource() == FactCostDetailView.this.getTxtMultitude()) connPtoP4SetSource(); + if (e.getSource() == FactCostDetailView.this.getTxtBaseOffset()) + connPtoP9SetSource(); }; public void keyTyped(java.awt.event.KeyEvent e) {}; *************** *** 172,181 **** if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("multitude"))) connPtoP4SetTarget(); - if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("baseDate"))) - connPtoP9SetTarget(); - if (evt.getSource() == FactCostDetailView.this.getTxtBaseDate() && (evt.getPropertyName().equals("date"))) - connPtoP9SetSource(); if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("catalogue"))) connPtoP19SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; --- 180,189 ---- if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("multitude"))) connPtoP4SetTarget(); if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("catalogue"))) connPtoP19SetTarget(); + if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("baseOffset"))) + connPtoP9SetTarget(); + if (evt.getSource() == FactCostDetailView.this.getObject() && (evt.getPropertyName().equals("expendable"))) + connPtoP20SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; *************** *** 198,202 **** }; }; - private javax.swing.JLabel ivjLblCause = null; /** * Constructor --- 206,209 ---- *************** *** 775,778 **** --- 782,835 ---- } /** + * connPtoP20SetSource: (Object.expendable <--> ChxExpendable.selected) + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connPtoP20SetSource() { + /* Set the source from the target */ + try { + if (ivjConnPtoP20Aligning == false) { + // user code begin {1} + // user code end + ivjConnPtoP20Aligning = true; + if ((getObject() != null)) { + getObject().setExpendable(new java.lang.Boolean(getChxExpendable().isSelected())); + } + // user code begin {2} + // user code end + ivjConnPtoP20Aligning = false; + } + } catch (java.lang.Throwable ivjExc) { + ivjConnPtoP20Aligning = false; + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** + * connPtoP20SetTarget: (Object.expendable <--> ChxExpendable.selected) + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connPtoP20SetTarget() { + /* Set the target from the source */ + try { + if (ivjConnPtoP20Aligning == false) { + // user code begin {1} + // user code end + ivjConnPtoP20Aligning = true; + if ((getObject() != null)) { + getChxExpendable().setSelected((getObject().getExpendable()).booleanValue()); + } + // user code begin {2} + // user code end + ivjConnPtoP20Aligning = false; + } + } catch (java.lang.Throwable ivjExc) { + ivjConnPtoP20Aligning = false; + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** * connPtoP2SetSource: (object.name <--> JTextField1.text) */ *************** *** 1153,1157 **** ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getObject().setBaseDate(getTxtBaseDate().getDate()); } // user code begin {2} --- 1210,1214 ---- ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getObject().setBaseOffset(new java.lang.Long(getTxtBaseOffset().getText())); } // user code begin {2} *************** *** 1178,1182 **** ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getTxtBaseDate().setDate(getObject().getBaseDate()); } // user code begin {2} --- 1235,1239 ---- ivjConnPtoP9Aligning = true; if ((getObject() != null)) { ! getTxtBaseOffset().setText(String.valueOf(getObject().getBaseOffset())); } // user code begin {2} *************** *** 1325,1329 **** ivjChxEstimated.setName("ChxEstimated"); ivjChxEstimated.setText("Geschätzt (!)"); ! ivjChxEstimated.setBounds(460, 154, 139, 22); ivjChxEstimated.setEnabled(true); // user code begin {1} --- 1382,1386 ---- ivjChxEstimated.setName("ChxEstimated"); ivjChxEstimated.setText("Geschätzt (!)"); ! ivjChxEstimated.setBounds(460, 154, 182, 22); ivjChxEstimated.setEnabled(true); // user code begin {1} *************** *** 1339,1342 **** --- 1396,1424 ---- } /** + * Return the ChxEstimated1 property value. + * @return javax.swing.JCheckBox + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JCheckBox getChxExpendable() { + if (ivjChxExpendable == null) { + try { + ivjChxExpendable = new javax.swing.JCheckBox(); + ivjChxExpendable.setName("ChxExpendable"); + ivjChxExpendable.setText("Verbrauchsmaterial"); + ivjChxExpendable.setBounds(460, 127, 182, 22); + ivjChxExpendable.setEnabled(true); + // user code begin {1} + ivjChxExpendable.setText(ResourceManager.getResource(CatalogueDetailView.class, "ChxExpendable_text")); + ivjChxExpendable.setToolTipText(ResourceManager.getResource(CatalogueDetailView.class, "ChxExpendable_toolTipText")); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjChxExpendable; + } + /** * Return the JCheckBox1 property value. * @return javax.swing.JCheckBox *************** *** 1388,1394 **** 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 --- 1470,1477 ---- getJPanel1().add(getJTabbedPane1(), getJTabbedPane1().getName()); getJPanel1().add(getLblMultitude(), getLblMultitude().getName()); ! getJPanel1().add(getLblBaseOffset(), getLblBaseOffset().getName()); getJPanel1().add(getTxtMultitude(), getTxtMultitude().getName()); ! getJPanel1().add(getTxtBaseOffset(), getTxtBaseOffset().getName()); ! getJPanel1().add(getLblMonthBaseOffset(), getLblMonthBaseOffset().getName()); // user code begin {1} // user code end *************** *** 1481,1493 **** */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private javax.swing.JLabel getLblBaseDate() { ! if (ivjLblBaseDate == null) { try { ! ivjLblBaseDate = new javax.swing.JLabel(); ! ivjLblBaseDate.setName("LblBaseDate"); ! ivjLblBaseDate.setText("Bezugsdatum:"); ! ivjLblBaseDate.setBounds(17, 63, 163, 14); // user code begin {1} ! ivjLblBaseDate.setText(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text")); // user code end } catch (java.lang.Throwable ivjExc) { --- 1564,1577 ---- */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private javax.swing.JLabel getLblBaseOffset() { ! if (ivjLblBaseOffset == null) { try { ! ivjLblBaseOffset = new javax.swing.JLabel(); ! ivjLblBaseOffset.setName("LblBaseOffset"); ! ivjLblBaseOffset.setText("Bezugsdatum:"); ! ivjLblBaseOffset.setBounds(17, 63, 163, 14); // user code begin {1} ! ivjLblBaseOffset.setText(ResourceManager.getResource(FactCostDetailView.class, "LblBaseOffset_text")); ! ivjLblBaseOffset.setToolTipText(ResourceManager.getResource(FactCostDetailView.class, "LblBaseOffset_toolTipText")); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 1497,1501 **** } } ! return ivjLblBaseDate; } /** --- 1581,1585 ---- } } ! return ivjLblBaseOffset; } /** *************** *** 1572,1575 **** --- 1656,1682 ---- } /** + * Return the LblMonthBaseOffset property value. + * @return javax.swing.JLabel + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JLabel getLblMonthBaseOffset() { + if (ivjLblMonthBaseOffset == null) { + try { + ivjLblMonthBaseOffset = new javax.swing.JLabel(); + ivjLblMonthBaseOffset.setName("LblMonthBaseOffset"); + ivjLblMonthBaseOffset.setText("Monate"); + ivjLblMonthBaseOffset.setBounds(266, 64, 73, 14); + // user code begin {1} + ivjLblMonthBaseOffset.setText(getResourceString("LblMonths_text")); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjLblMonthBaseOffset; + } + /** * Return the JLabel413 property value. * @return javax.swing.JLabel *************** *** 1872,1875 **** --- 1979,1983 ---- getPnlDetail().add(getLblCatalogue(), getLblCatalogue().getName()); getPnlDetail().add(getCbxCatalogue(), getCbxCatalogue().getName()); + getPnlDetail().add(getChxExpendable(), getChxExpendable().getName()); // user code begin {1} // user code end *************** *** 2000,2014 **** } /** ! * Return the TxtBaseDate property value. ! * @return ch.softenvironment.view.swingext.DateTextField */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private ch.softenvironment.view.swingext.DateTextField getTxtBaseDate() { ! if (ivjTxtBaseDate == null) { try { ! ivjTxtBaseDate = new ch.softenvironment.view.swingext.DateTextField(); ! ivjTxtBaseDate.setName("TxtBaseDate"); ! ivjTxtBaseDate.setBounds(188, 60, 95, 20); ! ivjTxtBaseDate.setEditable(false); // user code begin {1} // user code end --- 2108,2122 ---- } /** ! * Return the TxtBaseOffset property value. ! * @return ch.softenvironment.view.swingext.NumberTextField */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! private ch.softenvironment.view.swingext.NumberTextField getTxtBaseOffset() { ! if (ivjTxtBaseOffset == null) { try { ! ivjTxtBaseOffset = new ch.softenvironment.view.swingext.NumberTextField(); ! ivjTxtBaseOffset.setName("TxtBaseOffset"); ! ivjTxtBaseOffset.setBounds(188, 60, 73, 20); ! ivjTxtBaseOffset.setEditable(true); // user code begin {1} // user code end *************** *** 2019,2023 **** } } ! return ivjTxtBaseDate; } /** --- 2127,2131 ---- } } ! return ivjTxtBaseOffset; } /** *************** *** 2269,2274 **** getTxtPortsServer().addKeyListener(ivjEventHandler); getTxtMultitude().addKeyListener(ivjEventHandler); - getTxtBaseDate().addPropertyChangeListener(ivjEventHandler); getCbxCatalogue().addItemListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP1SetTarget(); --- 2377,2383 ---- getTxtPortsServer().addKeyListener(ivjEventHandler); getTxtMultitude().addKeyListener(ivjEventHandler); getCbxCatalogue().addItemListener(ivjEventHandler); + getTxtBaseOffset().addKeyListener(ivjEventHandler); + getChxExpendable().addItemListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP1SetTarget(); *************** *** 2287,2293 **** connPtoP16SetTarget(); connPtoP4SetTarget(); - connPtoP9SetTarget(); connPtoP19SetTarget(); connPtoP12SetTarget(); } /** --- 2396,2403 ---- connPtoP16SetTarget(); connPtoP4SetTarget(); connPtoP19SetTarget(); connPtoP12SetTarget(); + connPtoP9SetTarget(); + connPtoP20SetTarget(); } /** *************** *** 2315,2323 **** getPnlStandardToolbar().adaptRights(getViewOptions().getViewManager().getRights(FactCost.class)); getPnlStandardToolbar().setObjects(getObjects()); - - if (!LauncherView.getInstance().getSettings().isModeAdvanced()) { - getLblBaseDate().setVisible(false); - getTxtBaseDate().setVisible(false); - } // user code end } --- 2425,2428 ---- *************** *** 2335,2339 **** Catalogue catalogue = (Catalogue)getCbxCatalogue().getSelectedItem(); // other catalog assigned -> reuse name initially ! getObject().setName(catalogue.getNameString()); } refreshTotal(); // will also set catalogue changes --- 2440,2444 ---- Catalogue catalogue = (Catalogue)getCbxCatalogue().getSelectedItem(); // other catalog assigned -> reuse name initially ! getObject().setName(catalogue.getNameString()); } refreshTotal(); // will also set catalogue changes *************** *** 2361,2368 **** getTxtUsage().setEditable(catalogMissing); getTxtDepreciation().setEditable(catalogMissing); if (!catalogMissing) { ModelUtility.updateCatalogue(getObject()); } ! java.text.NumberFormat af = AmountFormat.getInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); getTxtCostTotal().setText(af.format(org.tcotool.tools.Calculator.calc(getObject()))); } catch(Throwable e) { --- 2466,2474 ---- getTxtUsage().setEditable(catalogMissing); getTxtDepreciation().setEditable(catalogMissing); + getChxExpendable().setEnabled(catalogMissing); if (!catalogMissing) { ModelUtility.updateCatalogue(getObject()); } ! java.text.NumberFormat af = AmountFormat.getAmountInstance(LauncherView.getInstance().getSettings().getPlattformLocale()); getTxtCostTotal().setText(af.format(org.tcotool.tools.Calculator.calc(getObject()))); } catch(Throwable e) { *************** *** 2443,2450 **** DbObjectServer server = ((DbObject)object).getObjectServer(); ! JComboBoxUtility.initComboBox(getCbxCostType(), server.retrieveCodes(CostCause.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrency(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCurrencyTotal(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); ! JComboBoxUtility.initComboBox(getCbxCatalogue(), server.retrieveCodes(Catalogue.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator()); setObject((org.tcotool.model.FactCost)object); --- 2549,2556 ---- DbObjectServer server = ((DbObject)object).getObjectServer(); ! JComboBoxUtility.initComboBox(getCbxCostType(), server.retrieveCodes(CostCause.class), "nameString", false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCurrency(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCurrencyTotal(), server.retrieveCodes(Currency.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); ! JComboBoxUtility.initComboBox(getCbxCatalogue(), server.retrieveCodes(Catalogue.class), DbObject.PROPERTY_NAME, false, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale())); setObject((org.tcotool.model.FactCost)object); *************** *** 2500,2505 **** connPtoP16SetTarget(); connPtoP4SetTarget(); - connPtoP9SetTarget(); connPtoP19SetTarget(); // user code begin {1} // user code end --- 2606,2612 ---- connPtoP16SetTarget(); connPtoP4SetTarget(); connPtoP19SetTarget(); + connPtoP9SetTarget(); + connPtoP20SetTarget(); // user code begin {1} // user code end |
