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...> - 2006-01-13 17:41:28
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24262/src/org/tcotool/model Modified Files: Catalogue.java Log Message: Schema-change: new field "expendable" Index: Catalogue.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Catalogue.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Catalogue.java 13 Dec 2005 12:50:53 -0000 1.2 --- Catalogue.java 13 Jan 2006 17:41:20 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- package org.tcotool.model; import ch.softenvironment.jomm.descriptor.DbDescriptor; + import ch.softenvironment.jomm.descriptor.DbFieldTypeDescriptor; import ch.softenvironment.jomm.descriptor.DbMultiplicityRange; import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor; *************** *** 66,71 **** firePropertyChange("documentation", oldValue, fieldDocumentation); } ! public static DbDescriptor createDescriptor() { ! DbDescriptor descriptor = new DbDescriptor(Catalogue.class); descriptor.add("price","price",new DbNumericFieldDescriptor(java.lang.Double.class,0.0,9.99999999999E11,2),new DbMultiplicityRange(1,1)); descriptor.addCode("currency", "currency", new DbMultiplicityRange(1,1)); --- 67,72 ---- firePropertyChange("documentation", oldValue, fieldDocumentation); } ! public static DbDescriptor createDescriptor(Class dbCode) { ! DbDescriptor descriptor = DbCode.createDescriptor(dbCode); descriptor.add("price","price",new DbNumericFieldDescriptor(java.lang.Double.class,0.0,9.99999999999E11,2),new DbMultiplicityRange(1,1)); descriptor.addCode("currency", "currency", new DbMultiplicityRange(1,1)); *************** *** 73,78 **** descriptor.add("orderNumber","orderNumber",new DbTextFieldDescriptor(20),new DbMultiplicityRange(0,1)); descriptor.add("documentation","documentation",new DbTextFieldDescriptor(1024),new DbMultiplicityRange(0,1)); ! descriptor.add("depreciationDuration","depreciationDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(0,1)); ! descriptor.add("usageDuration","usageDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(0,1)); return descriptor; --- 74,80 ---- descriptor.add("orderNumber","orderNumber",new DbTextFieldDescriptor(20),new DbMultiplicityRange(0,1)); descriptor.add("documentation","documentation",new DbTextFieldDescriptor(1024),new DbMultiplicityRange(0,1)); ! descriptor.add("depreciationDuration","depreciationDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(1,1)); ! descriptor.add("usageDuration","usageDuration",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,9999999.0,0),new DbMultiplicityRange(1,1)); ! descriptor.add("expendable","expendable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1)); return descriptor; *************** *** 98,100 **** --- 100,115 ---- firePropertyChange("usageDuration", oldValue, fieldUsageDuration); } + private Boolean fieldExpendable; + /** + * If expendable (de "Verbrauchsmaterial") then UsageDuration and + * DepreciationDuration is fixed to one year . + */ + public void setExpendable(Boolean expendable) { + Boolean oldValue = fieldExpendable; + fieldExpendable = expendable; + firePropertyChange("expendable", oldValue, expendable); + } + public final Boolean getExpendable() { + return fieldExpendable; + } } |
|
From: Hirzel P. <ph...@us...> - 2006-01-13 17:40:47
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24017/src/org/tcotool/application Modified Files: CatalogueDetailView.java Log Message: Feature: Expendable, update-influence on assigned FactCost Index: CatalogueDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CatalogueDetailView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CatalogueDetailView.java 13 Dec 2005 12:48:16 -0000 1.2 --- CatalogueDetailView.java 13 Jan 2006 17:40:36 -0000 1.3 *************** *** 20,33 **** import ch.softenvironment.jomm.mvc.controller.*; import ch.softenvironment.jomm.mvc.model.DbObject; import org.tcotool.model.*; /** * DetailView of Catalogue. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! public class CatalogueDetailView extends ch.softenvironment.jomm.mvc.view.DbBaseFrame implements ch.softenvironment.view.DetailView { private ch.softenvironment.view.DetailView caller = null; private javax.swing.JPanel ivjBaseDialogContentPane = null; private javax.swing.JTabbedPane ivjJTabbedPane1 = null; --- 20,38 ---- import ch.softenvironment.jomm.mvc.controller.*; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.view.BaseDialog; import org.tcotool.model.*; + import org.tcotool.tools.ModelUtility; + import org.tcotool.tools.TreeTool; + import org.tcotool.tools.TreeToolListener; /** * DetailView of Catalogue. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! public class CatalogueDetailView extends ch.softenvironment.jomm.mvc.view.DbBaseFrame implements ch.softenvironment.view.DetailView, org.tcotool.tools.TreeToolListener { private ch.softenvironment.view.DetailView caller = null; + private boolean updateName = false; private javax.swing.JPanel ivjBaseDialogContentPane = null; private javax.swing.JTabbedPane ivjJTabbedPane1 = null; *************** *** 62,65 **** --- 67,72 ---- private ch.softenvironment.view.swingext.NumberTextField ivjTxtDepreciation = null; private ch.softenvironment.view.swingext.NumberTextField ivjTxtUsage = null; + private boolean ivjConnPtoP5Aligning = false; + private boolean ivjConnPtoP7Aligning = false; class IvjEventHandler implements ch.softenvironment.view.SimpleEditorPanelListener, ch.softenvironment.view.ToolBarListener, java.awt.event.ItemListener, java.awt.event.KeyListener, java.beans.PropertyChangeListener { *************** *** 67,70 **** --- 74,79 ---- if (e.getSource() == CatalogueDetailView.this.getCbxCurrency()) connPtoP11SetSource(); + if (e.getSource() == CatalogueDetailView.this.getChxExpendable()) + connPtoP8SetSource(); }; public void keyPressed(java.awt.event.KeyEvent e) {}; *************** *** 111,114 **** --- 120,125 ---- if (evt.getSource() == CatalogueDetailView.this.getObject() && (evt.getPropertyName().equals("usageDuration"))) connPtoP7SetTarget(); + if (evt.getSource() == CatalogueDetailView.this.getObject() && (evt.getPropertyName().equals("expendable"))) + connPtoP8SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; *************** *** 131,136 **** }; }; ! private boolean ivjConnPtoP5Aligning = false; ! private boolean ivjConnPtoP7Aligning = false; /** * Constructor --- 142,147 ---- }; }; ! private javax.swing.JCheckBox ivjChxExpendable = null; ! private boolean ivjConnPtoP8Aligning = false; /** * Constructor *************** *** 696,699 **** --- 707,760 ---- } /** + * connPtoP8SetSource: (Object.expendable <--> ChxExpendable.selected) + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connPtoP8SetSource() { + /* Set the source from the target */ + try { + if (ivjConnPtoP8Aligning == false) { + // user code begin {1} + // user code end + ivjConnPtoP8Aligning = true; + if ((getObject() != null)) { + getObject().setExpendable(new java.lang.Boolean(getChxExpendable().isSelected())); + } + // user code begin {2} + // user code end + ivjConnPtoP8Aligning = false; + } + } catch (java.lang.Throwable ivjExc) { + ivjConnPtoP8Aligning = false; + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** + * connPtoP8SetTarget: (Object.expendable <--> ChxExpendable.selected) + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connPtoP8SetTarget() { + /* Set the target from the source */ + try { + if (ivjConnPtoP8Aligning == false) { + // user code begin {1} + // user code end + ivjConnPtoP8Aligning = true; + if ((getObject() != null)) { + getChxExpendable().setSelected((getObject().getExpendable()).booleanValue()); + } + // user code begin {2} + // user code end + ivjConnPtoP8Aligning = false; + } + } catch (java.lang.Throwable ivjExc) { + ivjConnPtoP8Aligning = false; + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** * Create a new Object as a "copy" of a selected one (and open * it for e.g. in a DetailView). *************** *** 742,746 **** ivjCbxCurrency = new javax.swing.JComboBox(); ivjCbxCurrency.setName("CbxCurrency"); ! ivjCbxCurrency.setBounds(364, 157, 61, 23); ivjCbxCurrency.setEnabled(true); // user code begin {1} --- 803,807 ---- ivjCbxCurrency = new javax.swing.JComboBox(); ivjCbxCurrency.setName("CbxCurrency"); ! ivjCbxCurrency.setBounds(364, 163, 61, 23); ivjCbxCurrency.setEnabled(true); // user code begin {1} *************** *** 755,758 **** --- 816,843 ---- } /** + * Return the ChxExpendable 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(161, 133, 263, 22); + // user code begin {1} + ivjChxExpendable.setText(getResourceString("ChxExpendable_text")); + ivjChxExpendable.setToolTipText(getResourceString("ChxExpendable_toolTipText")); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjChxExpendable; + } + /** * Return the ConsistencyController property value. * @return ch.softenvironment.jomm.controls.ConsistencyController *************** *** 962,966 **** ivjLblPrice.setName("LblPrice"); ivjLblPrice.setText("Kosten:"); ! ivjLblPrice.setBounds(11, 161, 141, 14); // user code begin {1} ivjLblPrice.setText(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text", true)); --- 1047,1051 ---- ivjLblPrice.setName("LblPrice"); ivjLblPrice.setText("Kosten:"); ! ivjLblPrice.setBounds(11, 167, 141, 14); // user code begin {1} ivjLblPrice.setText(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text", true)); *************** *** 1056,1059 **** --- 1141,1145 ---- getPnlDetail().add(getLblMonthTco(), getLblMonthTco().getName()); getPnlDetail().add(getLblMonthDepreciation(), getLblMonthDepreciation().getName()); + getPnlDetail().add(getChxExpendable(), getChxExpendable().getName()); // user code begin {1} // user code end *************** *** 1157,1161 **** ivjTxtCost = new ch.softenvironment.view.swingext.NumberTextField(); ivjTxtCost.setName("TxtCost"); ! ivjTxtCost.setBounds(161, 160, 194, 20); // user code begin {1} // user code end --- 1243,1247 ---- ivjTxtCost = new ch.softenvironment.view.swingext.NumberTextField(); ivjTxtCost.setName("TxtCost"); ! ivjTxtCost.setBounds(161, 166, 194, 20); // user code begin {1} // user code end *************** *** 1256,1259 **** --- 1342,1346 ---- getTxtDepreciation().addKeyListener(ivjEventHandler); getTxtUsage().addKeyListener(ivjEventHandler); + getChxExpendable().addItemListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP18SetTarget(); *************** *** 1266,1269 **** --- 1353,1357 ---- connPtoP5SetTarget(); connPtoP7SetTarget(); + connPtoP8SetTarget(); } /** *************** *** 1310,1314 **** caller.assignObjects(ch.softenvironment.util.ListUtils.createList(getObject())); } ! LauncherView.getInstance().saveObject(); closeOnSave(); --- 1398,1408 ---- caller.assignObjects(ch.softenvironment.util.ListUtils.createList(getObject())); } ! if (BaseDialog.showConfirm(this, getResourceString("CTUpdateReference"), getResourceString("CQUpdateReference"))) { ! // @see #treatFactCost() ! updateName = true; ! TreeTool treeTool = new TreeTool(this); ! treeTool.walkTree((TcoObject)LauncherView.getInstance().getUtility().getRoot()); ! updateName = false; ! } LauncherView.getInstance().saveObject(); closeOnSave(); *************** *** 1375,1381 **** --- 1469,1483 ---- ((Catalogue)object).refresh(false); ((Catalogue)object).setCurrency(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency()); + + ((Catalogue)object).setExpendable(Boolean.FALSE); ((Catalogue)object).setDepreciationDuration(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultDepreciationDuration()); ((Catalogue)object).setUsageDuration(LauncherView.getInstance().getUtility().getSystemParameter().getDefaultUsageDuration()); } + + if (((Catalogue)object).getExpendable().booleanValue()) { + // @see #updateModel() + getTxtUsage().setEditable(false); + getTxtDepreciation().setEditable(false); + } setObject((org.tcotool.model.Catalogue)object); *************** *** 1412,1415 **** --- 1514,1518 ---- connPtoP5SetTarget(); connPtoP7SetTarget(); + connPtoP8SetTarget(); // user code begin {1} // user code end *************** *** 1423,1426 **** --- 1526,1551 ---- // user code end } + public void treatCostDriver(CostDriver driver) { + } + /** + * @see #updateModel() + * @see @saveObject() + */ + public void treatFactCost(FactCost cost) { + if ((cost.getCatalogue() != null) && cost.getCatalogue().equals(getObject())) { + if (updateName) { + cost.setName(getObject().getNameString()); + } else { + ModelUtility.updateCatalogue(cost); + } + } + } + public void treatPersonalCost(PersonalCost cost) { + + } + public void treatService(Service service) { + } + public void treatTcoPackage(TcoPackage group) { + } /** * Undo the changes of an Object represented by this GUI. *************** *** 1432,1443 **** * Make sure any FactCost entries are recalculated. */ ! private void updateModel(java.beans.PropertyChangeEvent evt) { try { if (evt != null) { // be aware of ping-pong effect ! if (evt.getPropertyName().equals("price") || evt.getPropertyName().equals("currency")) { ! //TODO Tune fixModel -> needs only to correct PersonalCost entries ! LauncherView.getInstance().getUtility().fixModel((TcoObject)LauncherView.getInstance().getUtility().getRoot()); ! } } } catch(Throwable e) { --- 1557,1584 ---- * Make sure any FactCost entries are recalculated. */ ! private synchronized void updateModel(java.beans.PropertyChangeEvent evt) { try { if (evt != null) { // be aware of ping-pong effect ! // @see #saveObject() for event "name" ! if (evt.getPropertyName().equals("price") || evt.getPropertyName().equals("currency") || ! evt.getPropertyName().equals("usageDuration") || evt.getPropertyName().equals("depreciationDuration") || ! evt.getPropertyName().equals("expendable")) { ! if (evt.getPropertyName().equals("expendable")) { ! if (getObject().getExpendable().booleanValue()) { ! // fix duration to one year ! getTxtUsage().setEditable(false); ! getTxtDepreciation().setEditable(false); ! getObject().setUsageDuration(ModelUtility.EXPENDABLE_DURATION); ! getObject().setDepreciationDuration(ModelUtility.EXPENDABLE_DURATION); ! } else { ! getTxtUsage().setEditable(true); ! getTxtDepreciation().setEditable(true); ! } ! } ! // @see #treatFactCost() ! TreeTool treeTool = new TreeTool(this); ! treeTool.walkTree((TcoObject)LauncherView.getInstance().getUtility().getRoot()); ! } } } catch(Throwable e) { |
|
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 ---- |
|
From: Hirzel P. <ph...@us...> - 2006-01-13 13:07:57
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23136/src/org/tcotool/standard/charts Modified Files: ChartTool.java CostTypeBarChart.java CostTypePieChart.java Log Message: Feature: Allow Bar-/Pie-Charts for all DbCodeTypes used in TCO-Tool Index: CostTypePieChart.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypePieChart.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CostTypePieChart.java 28 Dec 2005 11:52:57 -0000 1.2 --- CostTypePieChart.java 13 Jan 2006 13:07:48 -0000 1.3 *************** *** 15,88 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.awt.BasicStroke; - import java.awt.Color; - import java.awt.Dimension; - import java.text.NumberFormat; - import javax.swing.JPanel; - - import org.jfree.chart.ChartFactory; - import org.jfree.chart.ChartPanel; - import org.jfree.chart.JFreeChart; - import org.jfree.chart.labels.StandardPieItemLabelGenerator; - import org.jfree.chart.plot.MultiplePiePlot; - import org.jfree.chart.plot.PiePlot; - import org.jfree.data.category.CategoryDataset; - import org.jfree.util.TableOrder; - import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; - import org.tcotool.tools.ModelUtility; - - import ch.softenvironment.client.ResourceManager; - import ch.softenvironment.util.NlsUtils; /** * PieChart-Tool to display CostType's as Pie. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! public class CostTypePieChart extends ChartTool { public CostTypePieChart(TcoPackage rootObject) { super(rootObject); } - /** - * Create a Pie-Chart of total TCO-Cost over TCO-duration. - * @param rootObject - * @return - * @throws Throwable - */ - public JPanel createPieChartTcoCostCause() throws Throwable { - CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class))); - JFreeChart jfreechart = createChart(categorydataset); - ChartPanel chartpanel = new ChartPanel(jfreechart); - - chartpanel.setPreferredSize(new Dimension(500, 270)); - return chartpanel; - } - /** - * Create a MultiplePiePlot. - * @param categorydataset - * @return - */ - private JFreeChart createChart(CategoryDataset categorydataset) { - JFreeChart jfreechart = ChartFactory.createMultiplePieChart(NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)), - categorydataset, - TableOrder.BY_COLUMN, true, - true, false); - MultiplePiePlot multiplepieplot = (MultiplePiePlot)jfreechart.getPlot(); - multiplepieplot.setBackgroundPaint(Color.white); - multiplepieplot.setOutlineStroke(new BasicStroke(1.0F)); - JFreeChart jfreechart_0_ = multiplepieplot.getPieChart(); - PiePlot pieplot = (PiePlot)jfreechart_0_.getPlot(); - pieplot.setBackgroundPaint(null); - pieplot.setOutlineStroke(null); - pieplot.setLabelGenerator(new StandardPieItemLabelGenerator - ("{0} ({2})", - NumberFormat.getNumberInstance(), - NumberFormat.getPercentInstance())); - pieplot.setMaximumLabelWidth(0.35); - pieplot.setLabelFont(new java.awt.Font("SansSerif", 0, 9)); - pieplot.setInteriorGap(0.3); - return jfreechart; - } } \ No newline at end of file --- 15,32 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import org.tcotool.model.TcoPackage; + import ch.softenvironment.util.DeveloperException; /** * PieChart-Tool to display CostType's as Pie. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ + * @deprecated (refactored into ChartTool) */ ! public abstract class CostTypePieChart extends ChartTool { public CostTypePieChart(TcoPackage rootObject) { super(rootObject); + throw new DeveloperException(this, "CostTypePieChart()", "Do not use this class anymore!"); } } \ No newline at end of file Index: ChartTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/ChartTool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChartTool.java 28 Dec 2005 11:52:57 -0000 1.2 --- ChartTool.java 13 Jan 2006 13:07:48 -0000 1.3 *************** *** 16,25 **** --- 16,45 ---- */ + import java.awt.BasicStroke; + import java.awt.Color; + import java.awt.Dimension; + import java.awt.GradientPaint; + import java.text.NumberFormat; import java.util.Iterator; import java.util.List; + import javax.swing.JPanel; + import org.jfree.chart.ChartFactory; + import org.jfree.chart.ChartPanel; + import org.jfree.chart.JFreeChart; + 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; + import org.jfree.chart.plot.PiePlot; + import org.jfree.chart.plot.PlotOrientation; + import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; + import org.jfree.util.TableOrder; + import org.tcotool.application.ApplicationOptions; import org.tcotool.application.FactCostDetailView; import org.tcotool.application.LauncherView; *************** *** 27,36 **** import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.Calculator; import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; - import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.client.ResourceManager; /** --- 47,57 ---- import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.Calculator; + import org.tcotool.tools.ModelUtility; import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.jomm.mvc.model.DbObject; + import ch.softenvironment.util.NlsUtils; import ch.softenvironment.client.ResourceManager; /** *************** *** 39,43 **** * @version $Revision$ $Date$ */ ! public abstract class ChartTool { private static final String TCO = "TCO "; //NLS protected Calculator calculator = null; --- 60,64 ---- * @version $Revision$ $Date$ */ ! public class ChartTool { private static final String TCO = "TCO "; //NLS protected Calculator calculator = null; *************** *** 50,58 **** } /** ! * Calculate Dataset for Total-Costs. * @param tco * @return */ ! protected CategoryDataset createTotalCostDataset(List tco) { // CostType (use different Colors) String personalCost = ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text"); --- 71,79 ---- } /** ! * Calculate Dataset for Total-Costs detailed in FactCost and PersonalCost. * @param tco * @return */ ! private CategoryDataset createTotalCostDataset(List tco) { // CostType (use different Colors) String personalCost = ResourceManager.getResource(PersonalCostDetailView.class, "FrmWindow_text"); *************** *** 73,89 **** } /** ! * Calculate Dataset for all CostType's. ! * @param costTypes * @return * @throws Throwable */ ! protected CategoryDataset createTotalCostCauseDataset(java.util.Map causes) throws Throwable { DefaultCategoryDataset set = new DefaultCategoryDataset(); ! DbObjectServer server = ((DbObject)LauncherView.getInstance().getUtility().getRoot()).getObjectServer(); ! Iterator it = server.retrieveCodes(CostCause.class).iterator(); while (it.hasNext()) { DbCodeType code = (DbCodeType)it.next(); ! java.util.List amounts = (java.util.List)causes.get(((DbObject)code).getId()); for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) { set.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear")); --- 94,110 ---- } /** ! * Calculate Dataset for given codes. ! * @param codes (List of DbCodeType) * @return * @throws Throwable */ ! private CategoryDataset createTotalCodeDataset(java.util.List codes) throws Throwable { ! java.util.Map map = calculator.getTcoCodeBlock(null, codes); DefaultCategoryDataset set = new DefaultCategoryDataset(); ! Iterator it = codes.iterator(); while (it.hasNext()) { DbCodeType code = (DbCodeType)it.next(); ! java.util.List amounts = (java.util.List)map.get(((DbObject)code).getId()); for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) { set.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear")); *************** *** 93,95 **** return set; } ! } --- 114,218 ---- return set; } ! /** ! * Create a CategoryPlot. ! * @param categorydataset ! * @param title ! * @param currency ! * @return ! */ ! 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, ! false); ! ApplicationOptions settings = LauncherView.getInstance().getSettings(); ! jfreechart.setBackgroundPaint(Color.white); ! CategoryPlot categoryplot = jfreechart.getCategoryPlot(); ! categoryplot.setBackgroundPaint(settings.getChartBackground()); ! categoryplot.setDomainGridlinePaint(settings.getChartDomainGridLine()); ! categoryplot.setDomainGridlinesVisible(true); ! categoryplot.setRangeGridlinePaint(settings.getChartRangeGridLine()); ! NumberAxis numberaxis = (NumberAxis)categoryplot.getRangeAxis(); ! numberaxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); ! BarRenderer barrenderer = (BarRenderer)categoryplot.getRenderer(); ! barrenderer.setDrawBarOutline(false); ! GradientPaint gradientpaint = new GradientPaint(0.0F, 0.0F, Color.blue, 0.0F, 0.0F, ! new Color(0, 0, 64)); ! GradientPaint gradientpaint_7_ = new GradientPaint(0.0F, 0.0F, Color.green, 0.0F, 0.0F, ! new Color(0, 64, 0)); ! GradientPaint gradientpaint_8_ = new GradientPaint(0.0F, 0.0F, Color.red, 0.0F, 0.0F, ! new Color(64, 0, 0)); ! barrenderer.setSeriesPaint(0, gradientpaint); ! barrenderer.setSeriesPaint(1, gradientpaint_7_); ! barrenderer.setSeriesPaint(2, gradientpaint_8_); ! CategoryAxis categoryaxis = categoryplot.getDomainAxis(); ! categoryaxis.setCategoryLabelPositions(CategoryLabelPositions.createUpRotationLabelPositions(0.5235987755982988)); ! return jfreechart; ! } ! /** ! * Create a TCO Bar-Chart over all given instances of dbCodeType in detail over TCO-Duration. ! * @param dbCodeType (DbCodeType) ! * @return ! * @throws Throwable ! */ ! public JPanel createTcoBarChart(Class dbCodeType) throws Throwable { ! CategoryDataset categorydataset = createTotalCodeDataset(rootObject.getObjectServer().retrieveCodes(dbCodeType)); ! JFreeChart jfreechart = createBarChart(categorydataset, NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCodeType"), ModelUtility.getTypeString(dbCodeType)), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ! ChartPanel chart = new ChartPanel(jfreechart); ! chart.setPreferredSize(new Dimension(500, 270)); ! return chart; ! } ! /** ! * Create a Bar-Chart of total TCO-Cost over TCO-duration ! * splitted in PersonalCost and FactCost. ! * @return ! * @throws Throwable ! */ ! public JPanel createTcoBarChart() throws Throwable { ! CategoryDataset categorydataset = createTotalCostDataset(calculator.getTcoCostBlock(null)); ! JFreeChart jfreechart = createBarChart(categorydataset, ResourceManager.getResource(ChartTool.class, "CTCostTotal"), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ! ChartPanel chart = new ChartPanel(jfreechart); ! chart.setPreferredSize(new Dimension(500, 270)); ! return chart; ! } ! /** ! * Create a Pie-Chart of total TCO-Cost over TCO-duration. ! * @param rootObject ! * @return ! * @throws Throwable ! */ ! public JPanel createTcoPieChart(Class dbCodeType) throws Throwable { ! CategoryDataset categorydataset = createTotalCodeDataset(rootObject.getObjectServer().retrieveCodes(dbCodeType)); ! JFreeChart jfreechart = createPieChart(categorydataset); ! ChartPanel chartpanel = new ChartPanel(jfreechart); ! ! chartpanel.setPreferredSize(new Dimension(500, 270)); ! return chartpanel; ! } ! /** ! * Create a MultiplePiePlot. ! * @param categorydataset ! * @return ! */ ! private JFreeChart createPieChart(CategoryDataset categorydataset) { ! JFreeChart jfreechart = ChartFactory.createMultiplePieChart(NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCodeType"), ModelUtility.getTypeString(CostCause.class)), ! categorydataset, ! TableOrder.BY_COLUMN, true, ! true, false); ! MultiplePiePlot multiplepieplot = (MultiplePiePlot)jfreechart.getPlot(); ! multiplepieplot.setBackgroundPaint(Color.white); ! multiplepieplot.setOutlineStroke(new BasicStroke(1.0F)); ! JFreeChart jfreechart_0_ = multiplepieplot.getPieChart(); ! PiePlot pieplot = (PiePlot)jfreechart_0_.getPlot(); ! pieplot.setBackgroundPaint(null); ! pieplot.setOutlineStroke(null); ! pieplot.setLabelGenerator(new StandardPieItemLabelGenerator ! ("{0} ({2})", ! NumberFormat.getNumberInstance(), ! NumberFormat.getPercentInstance())); ! pieplot.setMaximumLabelWidth(0.35); ! pieplot.setLabelFont(new java.awt.Font("SansSerif", 0, 9)); ! pieplot.setInteriorGap(0.3); ! return jfreechart; ! } ! } \ No newline at end of file Index: CostTypeBarChart.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypeBarChart.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CostTypeBarChart.java 28 Dec 2005 11:52:57 -0000 1.2 --- CostTypeBarChart.java 13 Jan 2006 13:07:48 -0000 1.3 *************** *** 15,114 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.awt.Color; - import java.awt.Dimension; - import java.awt.GradientPaint; - import javax.swing.JPanel; - - import org.jfree.chart.ChartFactory; - import org.jfree.chart.ChartPanel; - import org.jfree.chart.JFreeChart; - import org.jfree.chart.axis.CategoryAxis; - import org.jfree.chart.axis.CategoryLabelPositions; - import org.jfree.chart.axis.NumberAxis; - import org.jfree.chart.plot.CategoryPlot; - import org.jfree.chart.plot.PlotOrientation; - import org.jfree.chart.renderer.category.BarRenderer; - import org.jfree.data.category.CategoryDataset; - import org.tcotool.application.ApplicationOptions; - import org.tcotool.application.FactCostDetailView; - import org.tcotool.application.LauncherView; - import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; - import org.tcotool.tools.ModelUtility; ! import ch.softenvironment.client.ResourceManager; ! import ch.softenvironment.util.NlsUtils; /** ! * BarChart-Tool to display CostType's as Bar-Chart. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ public class CostTypeBarChart extends ChartTool { public CostTypeBarChart(TcoPackage rootObject) { super(rootObject); } ! /** ! * Create a CategoryPlot. ! * @param categorydataset ! * @param title ! * @param currency ! * @return ! */ ! private JFreeChart createChart(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, ! false); ! ApplicationOptions settings = LauncherView.getInstance().getSettings(); ! jfreechart.setBackgroundPaint(Color.white); ! CategoryPlot categoryplot = jfreechart.getCategoryPlot(); ! categoryplot.setBackgroundPaint(settings.getChartBackground()); ! categoryplot.setDomainGridlinePaint(settings.getChartDomainGridLine()); ! categoryplot.setDomainGridlinesVisible(true); ! categoryplot.setRangeGridlinePaint(settings.getChartRangeGridLine()); ! NumberAxis numberaxis = (NumberAxis)categoryplot.getRangeAxis(); ! numberaxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); ! BarRenderer barrenderer = (BarRenderer)categoryplot.getRenderer(); ! barrenderer.setDrawBarOutline(false); ! GradientPaint gradientpaint = new GradientPaint(0.0F, 0.0F, Color.blue, 0.0F, 0.0F, ! new Color(0, 0, 64)); ! GradientPaint gradientpaint_7_ = new GradientPaint(0.0F, 0.0F, Color.green, 0.0F, 0.0F, ! new Color(0, 64, 0)); ! GradientPaint gradientpaint_8_ = new GradientPaint(0.0F, 0.0F, Color.red, 0.0F, 0.0F, ! new Color(64, 0, 0)); ! barrenderer.setSeriesPaint(0, gradientpaint); ! barrenderer.setSeriesPaint(1, gradientpaint_7_); ! barrenderer.setSeriesPaint(2, gradientpaint_8_); ! CategoryAxis categoryaxis = categoryplot.getDomainAxis(); ! categoryaxis.setCategoryLabelPositions(CategoryLabelPositions.createUpRotationLabelPositions(0.5235987755982988)); ! return jfreechart; ! } ! /** ! * Create a TCO Bar-Chart over all CostTypes in detail over TCO-Duration. ! * @param rootObject ! * @return ! * @throws Throwable ! */ ! public JPanel createBarChartTcoCostCause() throws Throwable { ! CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class))); ! JFreeChart jfreechart = createChart(categorydataset, NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ! ChartPanel chart = new ChartPanel(jfreechart); ! chart.setPreferredSize(new Dimension(500, 270)); ! return chart; ! } ! /** ! * Create a Bar-Chart of total TCO-Cost over TCO-duration. ! * @param rootObject ! * @return ! * @throws Throwable ! */ ! public JPanel createBarChartTcoTotal() throws Throwable { ! CategoryDataset categorydataset = createTotalCostDataset(calculator.getTcoCostBlock(null)); ! JFreeChart jfreechart = createChart(categorydataset, ResourceManager.getResource(ChartTool.class, "CTCostTotal"), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ! ChartPanel chart = new ChartPanel(jfreechart); ! chart.setPreferredSize(new Dimension(500, 270)); ! return chart; ! } } --- 15,34 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import org.tcotool.model.TcoPackage; ! import ch.softenvironment.util.DeveloperException; /** ! * BarChart-Tool to display CostCause's as Bar-Chart. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ + * @deprecated (refactored into ChartTool) */ public class CostTypeBarChart extends ChartTool { public CostTypeBarChart(TcoPackage rootObject) { super(rootObject); + throw new DeveloperException(this, "CostTypeBarChart()", "Do not use this class anymore!"); } ! } |
|
From: Hirzel P. <ph...@us...> - 2006-01-13 13:07:56
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23136/src/org/tcotool/standard/charts/resources Modified Files: ChartTool.properties ChartTool_de.properties Log Message: Feature: Allow Bar-/Pie-Charts for all DbCodeTypes used in TCO-Tool Index: ChartTool_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/resources/ChartTool_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ChartTool_de.properties 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- ChartTool_de.properties 13 Jan 2006 13:07:48 -0000 1.2 *************** *** 1,3 **** ! CTCostByCostType = TCO-Gesamtkosten (Total Kostenarten) CTCostTotal = TCO-Gesamtkosten (Total) CIYear = Jahr --- 1,3 ---- ! CTCostByCostType = TCO-Gesamtkosten (Total {0}) CTCostTotal = TCO-Gesamtkosten (Total) CIYear = Jahr Index: ChartTool.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/resources/ChartTool.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ChartTool.properties 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- ChartTool.properties 13 Jan 2006 13:07:48 -0000 1.2 *************** *** 1,3 **** ! CTCostByCostType = TCO-Over all Costs (Total Cost-type) CTCostTotal = TCO-Over all Costs (Total) CIYear = Year --- 1,3 ---- ! CTCostByCodeType = TCO-Over all Costs (Total {0}) CTCostTotal = TCO-Over all Costs (Total) CIYear = Year |
|
From: Hirzel P. <ph...@us...> - 2006-01-13 12:32:48
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14026/src/org/tcotool/application/resources Added Files: pie_chart.png Log Message: Feature: Allow Bar-/Pie-Charts for all DbCodeTypes used in TCO-Tool --- NEW FILE: pie_chart.png --- (This appears to be a binary file; contents omitted.) |
|
From: Hirzel P. <ph...@us...> - 2006-01-13 08:55:59
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32233/src/org/tcotool/application/resources Added Files: bar_chart.png Log Message: New Symbol for Charts --- NEW FILE: bar_chart.png --- (This appears to be a binary file; contents omitted.) |
|
From: Hirzel P. <ph...@us...> - 2006-01-11 15:11:30
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23020/src/org/tcotool/model/resources Added Files: CostCause.properties CostCause_de.properties Log Message: Replaces CostType*.properties --- NEW FILE: CostCause.properties --- CIHardware = Hardware CISoftware = Software CIInstallation = Installation CIIntegration = Integration CIOperaion = Operation (in general) CIOperationHardware = Operation (Hardware) CIOperationSoftware = Operation (Software) CIInfrastructure = Infrastructure CIService = Service/Consulting CIEducation = Education CIStorage = Storage --- NEW FILE: CostCause_de.properties --- CIHardware = Hardware CISoftware = Software CIInstallation = Installation CIIntegration = Integration CIOperaion = Betrieb (allg.) CIOperationHardware = Betrieb (Hardware) CIOperationSoftware = Betrieb (Software) CIInfrastructure = Infrastruktur CIService = Dienstleistung CIEducation = Schulung CIStorage = Storage |
|
From: Hirzel P. <ph...@us...> - 2006-01-11 15:01:59
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21104/src/org/tcotool/application/resources Modified Files: CatalogueDetailView_de.properties CatalogueDetailView.properties Log Message: New Translation: expendable & update Name-Ref Index: CatalogueDetailView_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/CatalogueDetailView_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CatalogueDetailView_de.properties 29 Aug 2005 09:41:02 -0000 1.1.1.1 --- CatalogueDetailView_de.properties 11 Jan 2006 15:01:50 -0000 1.2 *************** *** 1,3 **** FrmWindow_text = Katalog-Teil LblOrderNumber_text = Artikel-Nummer: ! LblProducer_text = Hersteller: \ No newline at end of file --- 1,7 ---- FrmWindow_text = Katalog-Teil LblOrderNumber_text = Artikel-Nummer: ! LblProducer_text = Hersteller: ! ChxExpendable_text = Verbrauchsmaterial ! ChxExpendable_toolTipText = Ja=>setzt Nutzungs-/Abschreibungsdauer auf 1 Jahr ! CTUpdateReference = Namens-Referenzen ! CQUpdateReference = Möchten sie den gegebenen Katalog-Namen in allen betroffenen Sachkosten nachführen? \ No newline at end of file Index: CatalogueDetailView.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/CatalogueDetailView.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CatalogueDetailView.properties 29 Aug 2005 09:41:03 -0000 1.1.1.1 --- CatalogueDetailView.properties 11 Jan 2006 15:01:50 -0000 1.2 *************** *** 1,3 **** FrmWindow_text = Catalogue-Part LblOrderNumber_text = Order-number: ! LblProducer_text = Producer: \ No newline at end of file --- 1,7 ---- FrmWindow_text = Catalogue-Part LblOrderNumber_text = Order-number: ! LblProducer_text = Producer: ! ChxExpendable_text = Expendable ! ChxExpendable_toolTipText = Yes=>set usage-/depreciation-Duration to one year ! CTUpdateReference = Update name-reference ! CQUpdateReference = Would you like to replace the given Catalogue-name in all Factcost assignments? \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2006-01-06 15:09:30
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18872/src/org/tcotool/application/resources Modified Files: splash_de.jpg splash.jpg Log Message: Year updated to 2006 Index: splash.jpg =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/splash.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsSISty7 and /tmp/cvs81qz8q differ Index: splash_de.jpg =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/splash_de.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvseEJ41S and /tmp/cvsLBr3We differ |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:54:29
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17144/src/org/tcotool/tools Modified Files: Calculator.java Log Message: Refactoring: CostType replaced CostCause Index: Calculator.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/Calculator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Calculator.java 14 Dec 2005 13:20:39 -0000 1.2 --- Calculator.java 28 Dec 2005 11:54:19 -0000 1.3 *************** *** 47,51 **** // undefined Codes ! public static final String COST_TYPE_UNDEFINED = "COST_TYPE_UNDEFINED"; public static final String PROCESS_UNDEFINED = "UNDEFINED_PROCESS"; public static final String CATEGORY_UNDEFINED = "UNDEFINED_CATEGORY"; --- 47,51 ---- // undefined Codes ! public static final String COST_CAUSE_UNDEFINED = "COST_CAUSE_UNDEFINED"; public static final String PROCESS_UNDEFINED = "UNDEFINED_PROCESS"; public static final String CATEGORY_UNDEFINED = "UNDEFINED_CATEGORY"; *************** *** 562,568 **** // Cost codes ! key = COST_TYPE_UNDEFINED; ! if (cost.getType() != null) { ! key = cost.getType(); } storeIntoCodeList(serviceMap, kind, key, year, amount); --- 562,568 ---- // Cost codes ! key = COST_CAUSE_UNDEFINED; ! if (cost.getCause() != null) { ! key = cost.getCause(); } storeIntoCodeList(serviceMap, kind, key, year, amount); *************** *** 675,683 **** try { // use the specific code (CostType) to calculate sum ! Iterator codes = rootObject.getObjectServer().retrieveCodes(CostType.class).iterator(); while (codes.hasNext()) { cummulateLists(results, getCosts(object, kind, codes.next())); } ! cummulateLists(results, getCosts(object, kind, COST_TYPE_UNDEFINED)); } catch(Throwable e) { throw new UserException(this, "getTotal()", "Kostentyp-Code: " + e.getLocalizedMessage(), "Fehler bei der Berechnung", e); --- 675,683 ---- try { // use the specific code (CostType) to calculate sum ! Iterator codes = rootObject.getObjectServer().retrieveCodes(CostCause.class).iterator(); while (codes.hasNext()) { cummulateLists(results, getCosts(object, kind, codes.next())); } ! 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); *************** *** 747,754 **** */ public Map getTcoCodeBlock(TcoObject object, List codes) { ! TcoObject costObject = (object == null ? rootObject : object); Map map = new HashMap(); ! // use the specific code (CostType) to calculate sum Iterator iterator = codes.iterator(); while (iterator.hasNext()) { --- 747,754 ---- */ public Map getTcoCodeBlock(TcoObject object, List codes) { ! // TcoObject costObject = (object == null ? rootObject : object); Map map = new HashMap(); ! // use the specific code (CostCause) to calculate sum Iterator iterator = codes.iterator(); while (iterator.hasNext()) { |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:53:06
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/src/org/tcotool/standard/charts Modified Files: ChartTool.java CostTypeBarChart.java CostTypePieChart.java Log Message: Refactoring: CostType replaced CostCause Index: CostTypePieChart.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypePieChart.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CostTypePieChart.java 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- CostTypePieChart.java 28 Dec 2005 11:52:57 -0000 1.2 *************** *** 30,37 **** import org.jfree.data.category.CategoryDataset; import org.jfree.util.TableOrder; ! import org.tcotool.model.CostType; import org.tcotool.model.TcoPackage; import ch.softenvironment.client.ResourceManager; /** --- 30,39 ---- import org.jfree.data.category.CategoryDataset; import org.jfree.util.TableOrder; ! import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; + import org.tcotool.tools.ModelUtility; import ch.softenvironment.client.ResourceManager; + import ch.softenvironment.util.NlsUtils; /** *************** *** 50,55 **** * @throws Throwable */ ! public JPanel createPieChartTcoCostType() throws Throwable { ! CategoryDataset categorydataset = createTotalCostTypeDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostType.class))); JFreeChart jfreechart = createChart(categorydataset); ChartPanel chartpanel = new ChartPanel(jfreechart); --- 52,57 ---- * @throws Throwable */ ! public JPanel createPieChartTcoCostCause() throws Throwable { ! CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class))); JFreeChart jfreechart = createChart(categorydataset); ChartPanel chartpanel = new ChartPanel(jfreechart); *************** *** 64,68 **** */ private JFreeChart createChart(CategoryDataset categorydataset) { ! JFreeChart jfreechart = ChartFactory.createMultiplePieChart(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), categorydataset, TableOrder.BY_COLUMN, true, --- 66,70 ---- */ private JFreeChart createChart(CategoryDataset categorydataset) { ! JFreeChart jfreechart = ChartFactory.createMultiplePieChart(NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)), categorydataset, TableOrder.BY_COLUMN, true, *************** *** 84,86 **** return jfreechart; } ! } --- 86,88 ---- return jfreechart; } ! } \ No newline at end of file Index: ChartTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/ChartTool.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ChartTool.java 29 Aug 2005 09:41:13 -0000 1.1.1.1 --- ChartTool.java 28 Dec 2005 11:52:57 -0000 1.2 *************** *** 27,31 **** import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.Calculator; ! import org.tcotool.model.CostType; import org.tcotool.model.TcoPackage; --- 27,31 ---- import org.tcotool.standard.report.ReportTool; import org.tcotool.tools.Calculator; ! import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; *************** *** 78,95 **** * @throws Throwable */ ! protected CategoryDataset createTotalCostTypeDataset(java.util.Map costTypes) throws Throwable { ! DefaultCategoryDataset defaultcategorydataset = new DefaultCategoryDataset(); DbObjectServer server = ((DbObject)LauncherView.getInstance().getUtility().getRoot()).getObjectServer(); ! Iterator types = server.retrieveCodes(CostType.class).iterator(); ! while (types.hasNext()) { ! DbCodeType code = (DbCodeType)types.next(); ! java.util.List amounts = (java.util.List)costTypes.get(((DbObject)code).getId()); for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) { ! defaultcategorydataset.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear")); } } ! return defaultcategorydataset; } } --- 78,95 ---- * @throws Throwable */ ! protected CategoryDataset createTotalCostCauseDataset(java.util.Map causes) throws Throwable { ! DefaultCategoryDataset set = new DefaultCategoryDataset(); DbObjectServer server = ((DbObject)LauncherView.getInstance().getUtility().getRoot()).getObjectServer(); ! Iterator it = server.retrieveCodes(CostCause.class).iterator(); ! while (it.hasNext()) { ! DbCodeType code = (DbCodeType)it.next(); ! java.util.List amounts = (java.util.List)causes.get(((DbObject)code).getId()); for (int year=1 /*Total makes no sense*/; (year<amounts.size() && (year<=ReportTool.getUsageDuration()/12)); year++) { ! set.addValue((Double)amounts.get(year), code.getNameString(), TCO + (year) + "." + ResourceManager.getResource(ChartTool.class, "CIYear")); } } ! return set; } } Index: CostTypeBarChart.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/charts/CostTypeBarChart.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CostTypeBarChart.java 29 Aug 2005 09:41:13 -0000 1.1.1.1 --- CostTypeBarChart.java 28 Dec 2005 11:52:57 -0000 1.2 *************** *** 34,41 **** import org.tcotool.application.FactCostDetailView; import org.tcotool.application.LauncherView; ! import org.tcotool.model.CostType; import org.tcotool.model.TcoPackage; import ch.softenvironment.client.ResourceManager; /** --- 34,43 ---- import org.tcotool.application.FactCostDetailView; import org.tcotool.application.LauncherView; ! import org.tcotool.model.CostCause; import org.tcotool.model.TcoPackage; + import org.tcotool.tools.ModelUtility; import ch.softenvironment.client.ResourceManager; + import ch.softenvironment.util.NlsUtils; /** *************** *** 90,96 **** * @throws Throwable */ ! public JPanel createBarChartTcoCostType() throws Throwable { ! CategoryDataset categorydataset = createTotalCostTypeDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostType.class))); ! JFreeChart jfreechart = createChart(categorydataset, ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ChartPanel chart = new ChartPanel(jfreechart); chart.setPreferredSize(new Dimension(500, 270)); --- 92,98 ---- * @throws Throwable */ ! public JPanel createBarChartTcoCostCause() throws Throwable { ! CategoryDataset categorydataset = createTotalCostCauseDataset(calculator.getTcoCodeBlock(null, rootObject.getObjectServer().retrieveCodes(CostCause.class))); ! JFreeChart jfreechart = createChart(categorydataset, NlsUtils.formatMessage(ResourceManager.getResource(ChartTool.class, "CTCostByCostType"), ModelUtility.getTypeString(CostCause.class)), LauncherView.getInstance().getUtility().getSystemParameter().getDefaultCurrency().getNameString()); ChartPanel chart = new ChartPanel(jfreechart); chart.setPreferredSize(new Dimension(500, 270)); |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:52:39
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16853/src/org/tcotool/model Modified Files: CostType.java Cost.java Added Files: CostCause.java Log Message: Refactoring: CostType replaced CostCause --- NEW FILE: CostCause.java --- package org.tcotool.model; import org.tcotool.application.CostCauseDetailView; import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.descriptor.DbFieldTypeDescriptor; import ch.softenvironment.jomm.descriptor.DbMultiplicityRange; import ch.softenvironment.jomm.descriptor.DbTextFieldDescriptor; import ch.softenvironment.jomm.mvc.model.DbCode; import ch.softenvironment.jomm.mvc.model.DbCodeType; import ch.softenvironment.util.DeveloperException; /** * @author generated by the umleditor */ public class CostCause extends DbCode { // standard CodeCause's for the most TCO-Configuration public static final String INSTALLATION="Installation"; public static final String SERVICE="Service"; public static final String INFRASTRUCTURE="Infrastructure"; public static final String EDUCATION="Education"; public static final String OPERATION="Operation"; public static final String OPERATIONHARDWARE="OperationHardware"; public static final String OPERATIONSOFTWARE="OperationSoftware"; public static final String INTEGRATION="Integration"; public static final String SOFTWARE="Software"; public static final String HARDWARE="Hardware"; public static final String STORAGE="Storage"; public CostCause(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public static DbDescriptor createDescriptor(Class dbCode) { DbDescriptor descriptor = DbCode.createDescriptor(dbCode); descriptor.add(DbCodeType.PROPERTY_ILICODE, DbCode.ATTRIBUTE_ILICODE, new DbTextFieldDescriptor(DbCode.ILI_CODE_LENGTH), new DbMultiplicityRange(0, 1)); descriptor.add("direct","direct",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(0,1)); return descriptor; } private String fieldIliCode; /** * Overwrites. */ public final String getIliCode() { return fieldIliCode; } /** * Makes sense here because morphed from CostType-DbEnumeration. * @param iliCode */ public final void setIliCode(String iliCode) { if (getIliCode() != null) { throw new DeveloperException(this, "setIliCode()", "IliCode must not be changed!"); } String oldValue = fieldIliCode; fieldIliCode = iliCode; firePropertyChange("iliCode", oldValue, iliCode); } private Boolean fieldDirect; /** * */ public final Boolean getDirect() { return fieldDirect; } /** * According to Gartner costs may be "direct" or "indirect". * */ public void setDirect(Boolean direct) { Boolean oldValue = fieldDirect; fieldDirect = direct; firePropertyChange("direct", oldValue, direct); } /** * Overwrites */ public String getNameString() { String text = ""; // return getNameString(java.util.Locale.getDefault()); if (getName() != null) { 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) + "]"; } } return text; } } Index: Cost.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/Cost.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Cost.java 29 Aug 2005 09:41:06 -0000 1.1.1.1 --- Cost.java 28 Dec 2005 11:52:30 -0000 1.2 *************** *** 5,9 **** import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor; /** ! * Effectice calcuable Cost-Parameters. * @author generated by the umleditor */ --- 5,9 ---- import ch.softenvironment.jomm.descriptor.DbNumericFieldDescriptor; /** ! * Effective calcuable Cost-Parameters. * @author generated by the umleditor */ *************** *** 56,70 **** firePropertyChange("repeatable", oldValue, fieldRepeatable); } ! ! private org.tcotool.model.CostType fieldType; ! public org.tcotool.model.CostType getType() { refresh(false); // read lazy initialized objects ! return fieldType; } ! public void setType(org.tcotool.model.CostType type){ org.tcotool.model.CostType oldValue=fieldType; fieldType=type; firePropertyChange("type", oldValue, fieldType); ! } private java.lang.Long fieldDriverId; --- 56,85 ---- firePropertyChange("repeatable", oldValue, fieldRepeatable); } ! private org.tcotool.model.CostCause fieldCause; ! public org.tcotool.model.CostCause getCause() { refresh(false); // read lazy initialized objects ! return fieldCause; } ! public void setCause(CostCause cause){ ! CostCause oldValue=fieldCause; ! fieldCause=cause; ! firePropertyChange("cause", oldValue, fieldCause); ! } ! private org.tcotool.model.CostType fieldType; ! /** ! * @deprecated (replaced by CostCause ! */ ! public org.tcotool.model.CostType getType() { ! refresh(false); // read lazy initialized objects ! return fieldType; ! } ! /** ! * @deprecated (replaced by CostCause ! */ ! public void setType(org.tcotool.model.CostType type){ org.tcotool.model.CostType oldValue=fieldType; fieldType=type; firePropertyChange("type", oldValue, fieldType); ! } private java.lang.Long fieldDriverId; *************** *** 84,88 **** descriptor.add("estimated","estimated",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1)); descriptor.add("repeatable","repeatable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1)); ! descriptor.addCode("type", "type", new DbMultiplicityRange(0,1)); descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "driverId", "T_Id_driver", new DbMultiplicityRange(1,1)); return descriptor; --- 99,105 ---- descriptor.add("estimated","estimated",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1)); descriptor.add("repeatable","repeatable",new DbFieldTypeDescriptor(java.lang.Boolean.class),new DbMultiplicityRange(1,1)); ! descriptor.addCode("cause", "cause", new DbMultiplicityRange(0,1)); ! //TODO @deprecated CostType ! descriptor.addCode("type", "type", new DbMultiplicityRange(0,1)); descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "driverId", "T_Id_driver", new DbMultiplicityRange(1,1)); return descriptor; Index: CostType.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/model/CostType.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CostType.java 29 Aug 2005 09:41:05 -0000 1.1.1.1 --- CostType.java 28 Dec 2005 11:52:30 -0000 1.2 *************** *** 3,19 **** import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbEnumeration; public class CostType extends DbEnumeration { ! public static final String INSTALLATION="Installation"; ! public static final String SERVICE="Service"; ! public static final String INFRASTRUCTURE="Infrastructure"; ! public static final String EDUCATION="Education"; ! public static final String OPERATION="Operation"; ! public static final String OPERATIONHARDWARE="OperationHardware"; ! public static final String OPERATIONSOFTWARE="OperationSoftware"; ! public static final String INTEGRATION="Integration"; ! public static final String SOFTWARE="Software"; ! public static final String HARDWARE="Hardware"; ! public static final String STORAGE="Storage"; ! public CostType(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } --- 3,12 ---- import ch.softenvironment.jomm.descriptor.DbDescriptor; import ch.softenvironment.jomm.mvc.model.DbEnumeration; + /** + * @author Peter Hirzel <i>soft</i>Environment + * @deprecated (replaced by CostCause) + */ public class CostType extends DbEnumeration { ! public CostType(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:51:50
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16762/src/org/tcotool/application Modified Files: FindDialog.java Log Message: Refactoring: CostType replaced CostCause Index: FindDialog.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/FindDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FindDialog.java 22 Dec 2005 12:24:07 -0000 1.4 --- FindDialog.java 28 Dec 2005 11:51:42 -0000 1.5 *************** *** 12,18 **** import org.tcotool.model.Activity; import org.tcotool.model.Cost; import org.tcotool.model.CostCentre; import org.tcotool.model.CostDriver; - import org.tcotool.model.CostType; import org.tcotool.model.PersonalCost; import org.tcotool.model.Process; --- 12,18 ---- import org.tcotool.model.Activity; import org.tcotool.model.Cost; + import org.tcotool.model.CostCause; import org.tcotool.model.CostCentre; import org.tcotool.model.CostDriver; import org.tcotool.model.PersonalCost; import org.tcotool.model.Process; *************** *** 226,232 **** addHit(object); } ! } else if (Calculator.COST_TYPE_UNDEFINED.equals(id)) { ! getTxtExpression().setText(ModelUtility.getTypeString(CostType.class) + ": " + ResourceManager.getResource(ReportTool.class, "CIUndefinedCode")); ! if ((object instanceof Cost) && (((Cost)object).getType() == null)) { addHit(object); } --- 226,232 ---- addHit(object); } ! } else if (Calculator.COST_CAUSE_UNDEFINED.equals(id)) { ! getTxtExpression().setText(ModelUtility.getTypeString(CostCause.class) + ": " + ResourceManager.getResource(ReportTool.class, "CIUndefinedCode")); ! if ((object instanceof Cost) && (((Cost)object).getCause() == null)) { addHit(object); } |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:51:08
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16703/src/org/tcotool/application Modified Files: HTMLReportFrame.java Log Message: Refactoring: CostType replaced CostCause Index: HTMLReportFrame.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/HTMLReportFrame.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HTMLReportFrame.java 22 Dec 2005 12:25:57 -0000 1.4 --- HTMLReportFrame.java 28 Dec 2005 11:51:00 -0000 1.5 *************** *** 20,27 **** import ch.softenvironment.client.ResourceManager; import ch.softenvironment.jomm.mvc.model.DbCode; - import ch.softenvironment.jomm.mvc.model.DbEnumeration; import ch.softenvironment.jomm.target.xml.XmlObjectServer; import ch.softenvironment.util.StringUtils; - import org.tcotool.model.CostType; import org.tcotool.standard.report.ReportTool; import java.io.*; --- 20,25 ---- *************** *** 153,157 **** XmlObjectServer server = ((XmlObjectServer)LauncherView.getInstance().getUtility().getServer()); // 2)DbEnumeration ! Iterator codes = server.retrieveCodes(CostType.class).iterator(); while (codes.hasNext()) { DbEnumeration code = (DbEnumeration)codes.next(); --- 151,155 ---- XmlObjectServer server = ((XmlObjectServer)LauncherView.getInstance().getUtility().getServer()); // 2)DbEnumeration ! /* Iterator codes = server.retrieveCodes(CostType.class).iterator(); while (codes.hasNext()) { DbEnumeration code = (DbEnumeration)codes.next(); *************** *** 162,170 **** } } // 3) DbCode Iterator it = server.getCodeTypes().iterator(); while (it.hasNext()) { Class codeType = (Class)it.next(); ! codes = server.retrieveCodes(codeType).iterator(); while (codes.hasNext()) { DbCode code = (DbCode)codes.next(); --- 160,169 ---- } } + */ // 3) DbCode Iterator it = server.getCodeTypes().iterator(); while (it.hasNext()) { Class codeType = (Class)it.next(); ! Iterator codes = server.retrieveCodes(codeType).iterator(); while (codes.hasNext()) { DbCode code = (DbCode)codes.next(); |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:49:13
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16338/src/org/tcotool/application Modified Files: CodeDetailView.java Log Message: Add changeable CostCause Index: CodeDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CodeDetailView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CodeDetailView.java 25 Nov 2005 18:09:42 -0000 1.3 --- CodeDetailView.java 28 Dec 2005 11:49:04 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- package org.tcotool.application; + /* * This library is free software; you can redistribute it and/or *************** *** 22,25 **** --- 23,27 ---- import javax.swing.JFileChooser; + import org.tcotool.model.CostCause; import org.tcotool.model.TcoModel; import org.tcotool.tools.ModelUtility; *************** *** 95,98 **** --- 97,102 ---- public void tbbUndoAction_actionPerformed(java.util.EventObject newEvent) {}; }; + private javax.swing.JLabel ivjLblCostCause = null; + private ch.softenvironment.jomm.mvc.view.DbCodeManageView ivjPnlCostCause = null; /** * Constructor *************** *** 255,259 **** ivjBtnExport.setToolTipText("Sämtliche Geschäftsobjekte in ein Set exportieren."); ivjBtnExport.setText("Export..."); ! ivjBtnExport.setBounds(190, 456, 113, 25); // user code begin {1} // user code end --- 259,263 ---- ivjBtnExport.setToolTipText("Sämtliche Geschäftsobjekte in ein Set exportieren."); ivjBtnExport.setText("Export..."); ! ivjBtnExport.setBounds(190, 475, 113, 25); // user code begin {1} // user code end *************** *** 278,282 **** ivjBtnImport.setToolTipText("Sämtliche Geschäftsobjekte von einem Set importieren."); ivjBtnImport.setText("Import..."); ! ivjBtnImport.setBounds(320, 456, 113, 25); // user code begin {1} // user code end --- 282,286 ---- ivjBtnImport.setToolTipText("Sämtliche Geschäftsobjekte von einem Set importieren."); ivjBtnImport.setText("Import..."); ! ivjBtnImport.setBounds(320, 475, 113, 25); // user code begin {1} // user code end *************** *** 301,305 **** ivjLblActivity.setToolTipText(""); ivjLblActivity.setText("Aktivität"); ! ivjLblActivity.setBounds(10, 86, 144, 14); // user code begin {1} ivjLblActivity.setText(getResourceString(PersonalCostDetailView.class, "LblActivity_text")); --- 305,309 ---- ivjLblActivity.setToolTipText(""); ivjLblActivity.setText("Aktivität"); ! ivjLblActivity.setBounds(11, 112, 150, 14); // user code begin {1} ivjLblActivity.setText(getResourceString(PersonalCostDetailView.class, "LblActivity_text")); *************** *** 324,328 **** ivjLblCatalogue.setName("LblCatalogue"); ivjLblCatalogue.setText("Katalog-Teil:"); ! ivjLblCatalogue.setBounds(10, 25, 147, 14); // user code begin {1} ivjLblCatalogue.setText(ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", true)); --- 328,332 ---- ivjLblCatalogue.setName("LblCatalogue"); ivjLblCatalogue.setText("Katalog-Teil:"); ! ivjLblCatalogue.setBounds(11, 51, 150, 14); // user code begin {1} ivjLblCatalogue.setText(ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", true)); *************** *** 360,363 **** --- 364,390 ---- } /** + * Return the LblCostCause property value. + * @return javax.swing.JLabel + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JLabel getLblCostCause() { + if (ivjLblCostCause == null) { + try { + ivjLblCostCause = new javax.swing.JLabel(); + ivjLblCostCause.setName("LblCostCause"); + ivjLblCostCause.setText("Katalog-Teil:"); + 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) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjLblCostCause; + } + /** * Return the LblCostCentre property value. * @return javax.swing.JLabel *************** *** 464,468 **** ivjLblRole.setToolTipText("Siehe Personalkosten"); ivjLblRole.setText("Rolle:"); ! ivjLblRole.setBounds(10, 54, 144, 14); // user code begin {1} ivjLblRole.setText(ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", true)); --- 491,495 ---- ivjLblRole.setToolTipText("Siehe Personalkosten"); ivjLblRole.setText("Rolle:"); ! ivjLblRole.setBounds(11, 80, 150, 14); // user code begin {1} ivjLblRole.setText(ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", true)); *************** *** 509,513 **** ivjPnlActivity = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlActivity.setName("PnlActivity"); ! ivjPnlActivity.setBounds(165, 80, 404, 25); // user code begin {1} // user code end --- 536,540 ---- ivjPnlActivity = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlActivity.setName("PnlActivity"); ! ivjPnlActivity.setBounds(166, 106, 404, 25); // user code begin {1} // user code end *************** *** 530,534 **** ivjPnlCatalogue = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlCatalogue.setName("PnlCatalogue"); ! ivjPnlCatalogue.setBounds(165, 22, 404, 25); // user code begin {1} // user code end --- 557,561 ---- ivjPnlCatalogue = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlCatalogue.setName("PnlCatalogue"); ! ivjPnlCatalogue.setBounds(166, 48, 404, 25); // user code begin {1} // user code end *************** *** 599,603 **** ivjPnlCost.setName("PnlCost"); ivjPnlCost.setLayout(null); ! ivjPnlCost.setBounds(7, 312, 582, 120); getPnlCost().add(getLblRole(), getLblRole().getName()); getPnlCost().add(getPnlRole(), getPnlRole().getName()); --- 626,630 ---- ivjPnlCost.setName("PnlCost"); ivjPnlCost.setLayout(null); ! ivjPnlCost.setBounds(7, 312, 582, 150); getPnlCost().add(getLblRole(), getLblRole().getName()); getPnlCost().add(getPnlRole(), getPnlRole().getName()); *************** *** 606,609 **** --- 633,638 ---- getPnlCost().add(getLblCatalogue(), getLblCatalogue().getName()); getPnlCost().add(getPnlCatalogue(), getPnlCatalogue().getName()); + getPnlCost().add(getLblCostCause(), getLblCostCause().getName()); + getPnlCost().add(getPnlCostCause(), getPnlCostCause().getName()); // user code begin {1} getPnlCost().setBorder(javax.swing.BorderFactory.createCompoundBorder( *************** *** 620,623 **** --- 649,673 ---- } /** + * Return the PnlCostCause property value. + * @return ch.softenvironment.jomm.mvc.view.DbCodeManageView + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private ch.softenvironment.jomm.mvc.view.DbCodeManageView getPnlCostCause() { + if (ivjPnlCostCause == null) { + try { + ivjPnlCostCause = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); + ivjPnlCostCause.setName("PnlCostCause"); + ivjPnlCostCause.setBounds(166, 18, 404, 25); + // user code begin {1} + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjPnlCostCause; + } + /** * Return the PnlCostCentre property value. * @return ch.softenvironment.jomm.mvc.view.DbCodeManageView *************** *** 744,748 **** ivjPnlRole = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlRole.setName("PnlRole"); ! ivjPnlRole.setBounds(165, 50, 404, 25); // user code begin {1} // user code end --- 794,798 ---- ivjPnlRole = new ch.softenvironment.jomm.mvc.view.DbCodeManageView(); ivjPnlRole.setName("PnlRole"); ! ivjPnlRole.setBounds(166, 76, 404, 25); // user code begin {1} // user code end *************** *** 944,947 **** --- 994,1011 ---- public void newObject(Object source) { } + 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) * @see ch.softenvironment.view.ListMenuChoice#removeObjects(java.lang.Object) *************** *** 972,988 **** public void searchObjects() { } - 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); - - 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); - - } } --- 1036,1038 ---- |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:42:09
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15368/src/org/tcotool/application Added Files: CostCauseDetailView.java Log Message: NEW --- NEW FILE: CostCauseDetailView.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 ch.softenvironment.jomm.mvc.controller.*; import org.tcotool.model.*; import org.tcotool.tools.ModelUtility; /** * DetailView of CostCause. * * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2005/12/28 11:42:00 $ */ public class CostCauseDetailView extends ch.softenvironment.jomm.mvc.view.DbBaseFrame implements ch.softenvironment.view.DetailView { private ch.softenvironment.view.DetailView caller = null; private javax.swing.JPanel ivjBaseDialogContentPane = null; private javax.swing.JTabbedPane ivjJTabbedPane1 = null; IvjEventHandler ivjEventHandler = new IvjEventHandler(); private javax.swing.JPanel ivjPnlDetail = null; private boolean ivjConnPtoP2Aligning = false; private javax.swing.JPanel ivjJPanel1 = null; private CostCause ivjObject = null; private ch.softenvironment.view.ToolBar ivjPnlStandardToolbar = null; private ch.softenvironment.view.StatusBar ivjPnlStatusBar = null; private ConsistencyController ivjConsistencyController = null; private boolean ivjConnPtoP6Aligning = false; private javax.swing.JLabel ivjLblName = null; private javax.swing.JTextField ivjTxtName1 = null; private boolean ivjConnPtoP4Aligning = false; private ch.softenvironment.jomm.mvc.view.DbNlsStringView ivjPnlName = null; private javax.swing.JLabel ivjLblDirect = null; private javax.swing.JLabel ivjLblIliCode = null; class IvjEventHandler implements ch.softenvironment.view.ToolBarListener, java.awt.event.ItemListener, java.awt.event.KeyListener, java.beans.PropertyChangeListener { public void itemStateChanged(java.awt.event.ItemEvent e) { if (e.getSource() == CostCauseDetailView.this.getChxDirect()) connPtoP1SetSource(); }; public void keyPressed(java.awt.event.KeyEvent e) {}; public void keyReleased(java.awt.event.KeyEvent e) { if (e.getSource() == CostCauseDetailView.this.getTxtName1()) connPtoP4SetSource(); }; public void keyTyped(java.awt.event.KeyEvent e) {}; public void propertyChange(java.beans.PropertyChangeEvent evt) { if (evt.getSource() == CostCauseDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("isSaveable"))) connPtoP6SetTarget(); if (evt.getSource() == CostCauseDetailView.this.getPnlStandardToolbar() && (evt.getPropertyName().equals("tbbSaveEnabled"))) connPtoP6SetSource(); if (evt.getSource() == CostCauseDetailView.this.getConsistencyController() && (evt.getPropertyName().equals("inconsistencies"))) connEtoM1(evt); if (evt.getSource() == CostCauseDetailView.this.getPnlStandardToolbar() && (evt.getPropertyName().equals("currentObject"))) connEtoC1(evt); if (evt.getSource() == CostCauseDetailView.this.getObject()) connEtoC2(evt); if (evt.getSource() == CostCauseDetailView.this.getObject() && (evt.getPropertyName().equals("name"))) connPtoP2SetTarget(); if (evt.getSource() == CostCauseDetailView.this.getPnlName() && (evt.getPropertyName().equals("dbNlsString"))) connPtoP2SetSource(); if (evt.getSource() == CostCauseDetailView.this.getObject() && (evt.getPropertyName().equals("iliCode"))) connPtoP4SetTarget(); if (evt.getSource() == CostCauseDetailView.this.getObject() && (evt.getPropertyName().equals("direct"))) connPtoP1SetTarget(); }; public void tbbCopyAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbCutAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbDeleteAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbFindAction_actionPerformed(java.util.EventObject newEvent) {}; public void tbbNewAction_actionPerformed(java.util.EventObject newEvent) {}; 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) { if (newEvent.getSource() == CostCauseDetailView.this.getPnlStandardToolbar()) connEtoC7(newEvent); }; public void tbbUndoAction_actionPerformed(java.util.EventObject newEvent) {}; }; private javax.swing.JCheckBox ivjChxDirect = null; private boolean ivjConnPtoP1Aligning = false; /** * Constructor * @param viewOptions Symbol */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ public CostCauseDetailView(ch.softenvironment.view.ViewOptions viewOptions) { super(viewOptions); initialize(); } /** * Constructor */ public CostCauseDetailView(ch.softenvironment.view.ViewOptions viewOptions, java.util.List objects, ch.softenvironment.view.DetailView caller) { super(viewOptions, objects); this.caller = caller; initialize(); } /** * Assign a set of aggregates given in objects. * @param objects */ public void assignObjects(java.util.List objects) {} /** * connEtoC1: (PnlStandardToolbar.currentObject --> ServiceDetailView.executeSetCurrentObject(Ljava.lang.Object;)V) * @param arg1 java.beans.PropertyChangeEvent */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connEtoC1(java.beans.PropertyChangeEvent arg1) { try { // user code begin {1} // user code end this.setCurrentObject(getPnlStandardToolbar().getCurrentObject()); // user code begin {2} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {3} // user code end handleException(ivjExc); } } /** * connEtoC2: (Object.propertyChange.propertyChange(java.beans.PropertyChangeEvent) --> CatalogueDetailView.updateModel()V) * @param arg1 java.beans.PropertyChangeEvent */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connEtoC2(java.beans.PropertyChangeEvent arg1) { try { // user code begin {1} // user code end this.updateModel(arg1); // user code begin {2} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {3} // user code end handleException(ivjExc); } } /** * connEtoC7: (PnlStandardToolbar.toolBar.tbbSaveAction_actionPerformed(java.util.EventObject) --> ServiceDetailView.executeSaveObject()V) * @param arg1 java.util.EventObject */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connEtoC7(java.util.EventObject arg1) { try { // user code begin {1} // user code end this.saveObject(); // user code begin {2} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {3} // user code end handleException(ivjExc); } } /** * connEtoM1: (ConsistencyController.inconsistencies --> PnlStandardToolbar.setItems(Ljava.util.Vector;)V) * @param arg1 java.beans.PropertyChangeEvent */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connEtoM1(java.beans.PropertyChangeEvent arg1) { try { // user code begin {1} // user code end getPnlStandardToolbar().setItems(getConsistencyController().getInconsistencies()); // user code begin {2} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP18SetTarget: (Object.mark <--> PnlStatusBar.mark) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP18SetTarget() { /* Set the target from the source */ try { if ((getObject() != null)) { getPnlStatusBar().setMark(getObject().getMark()); } // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP1SetSource: (Object.direct <--> ChxDirect.selected) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP1SetSource() { /* Set the source from the target */ try { if (ivjConnPtoP1Aligning == false) { // user code begin {1} // user code end ivjConnPtoP1Aligning = true; if ((getObject() != null)) { getObject().setDirect(new java.lang.Boolean(getChxDirect().isSelected())); } // user code begin {2} // user code end ivjConnPtoP1Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP1Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP1SetTarget: (Object.direct <--> ChxDirect.selected) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP1SetTarget() { /* Set the target from the source */ try { if (ivjConnPtoP1Aligning == false) { // user code begin {1} // user code end ivjConnPtoP1Aligning = true; if ((getObject() != null)) { getChxDirect().setSelected((getObject().getDirect()).booleanValue()); } // user code begin {2} // user code end ivjConnPtoP1Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP1Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP2SetSource: (Object.name <--> PnlName.name) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP2SetSource() { /* Set the source from the target */ try { if (ivjConnPtoP2Aligning == false) { // user code begin {1} // user code end ivjConnPtoP2Aligning = true; if ((getObject() != null)) { getObject().setName(getPnlName().getDbNlsString()); } // user code begin {2} // user code end ivjConnPtoP2Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP2Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP2SetTarget: (Object.name <--> TxtName.text) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP2SetTarget() { /* Set the target from the source */ try { if (ivjConnPtoP2Aligning == false) { // user code begin {1} // user code end ivjConnPtoP2Aligning = true; if ((getObject() != null)) { getPnlName().setDbNlsString(getObject().getName()); } // user code begin {2} // user code end ivjConnPtoP2Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP2Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP4SetSource: (Object.producer <--> JTextField1.text) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP4SetSource() { /* Set the source from the target */ try { if (ivjConnPtoP4Aligning == false) { // user code begin {1} // user code end ivjConnPtoP4Aligning = true; if ((getObject() != null)) { getObject().setIliCode(getTxtName1().getText()); } // user code begin {2} // user code end ivjConnPtoP4Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP4Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP4SetTarget: (Object.producer <--> JTextField1.text) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP4SetTarget() { /* Set the target from the source */ try { if (ivjConnPtoP4Aligning == false) { // user code begin {1} // user code end ivjConnPtoP4Aligning = true; if ((getObject() != null)) { getTxtName1().setText(getObject().getIliCode()); } // user code begin {2} // user code end ivjConnPtoP4Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP4Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP6SetSource: (ConsistencyController.isSaveable <--> PnlStandardToolbar.tbbSaveEnabled) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP6SetSource() { /* Set the source from the target */ try { if (ivjConnPtoP6Aligning == false) { // user code begin {1} // user code end ivjConnPtoP6Aligning = true; if ((getConsistencyController() != null)) { getConsistencyController().setIsSaveable(getPnlStandardToolbar().getTbbSaveEnabled()); } // user code begin {2} // user code end ivjConnPtoP6Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP6Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * connPtoP6SetTarget: (ConsistencyController.isSaveable <--> PnlStandardToolbar.tbbSaveEnabled) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void connPtoP6SetTarget() { /* Set the target from the source */ try { if (ivjConnPtoP6Aligning == false) { // user code begin {1} // user code end ivjConnPtoP6Aligning = true; if ((getConsistencyController() != null)) { getPnlStandardToolbar().setTbbSaveEnabled(getConsistencyController().getIsSaveable()); } // user code begin {2} // user code end ivjConnPtoP6Aligning = false; } } catch (java.lang.Throwable ivjExc) { ivjConnPtoP6Aligning = false; // user code begin {3} // user code end handleException(ivjExc); } } /** * Create a new Object as a "copy" of a selected one (and open * it for e.g. in a DetailView). * @param source (for e.g. a Popup-MenuItem) */ public void copyObject(java.lang.Object source) {} /** * Overwrites. */ public void dispose() { getObject().removePropertyChangeListener(getConsistencyController()); super.dispose(); } /** * Return the BaseDialogContentPane property value. * @return javax.swing.JPanel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JPanel getBaseDialogContentPane() { if (ivjBaseDialogContentPane == null) { try { ivjBaseDialogContentPane = new javax.swing.JPanel(); ivjBaseDialogContentPane.setName("BaseDialogContentPane"); ivjBaseDialogContentPane.setLayout(new java.awt.BorderLayout()); getBaseDialogContentPane().add(getJPanel1(), "Center"); getBaseDialogContentPane().add(getPnlStandardToolbar(), "North"); getBaseDialogContentPane().add(getPnlStatusBar(), "South"); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjBaseDialogContentPane; } /** * Return the ChxDirect property value. * @return javax.swing.JCheckBox */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JCheckBox getChxDirect() { if (ivjChxDirect == null) { try { ivjChxDirect = new javax.swing.JCheckBox(); ivjChxDirect.setName("ChxDirect"); ivjChxDirect.setText(""); ivjChxDirect.setBounds(161, 22, 24, 22); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjChxDirect; } /** * Return the ConsistencyController property value. * @return ch.softenvironment.jomm.controls.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private ch.softenvironment.jomm.mvc.controller.ConsistencyController getConsistencyController() { // user code begin {1} // user code end return ivjConsistencyController; } /** * Return the JPanel1 property value. * @return javax.swing.JPanel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JPanel getJPanel1() { if (ivjJPanel1 == null) { try { ivjJPanel1 = new javax.swing.JPanel(); ivjJPanel1.setName("JPanel1"); ivjJPanel1.setLayout(null); getJPanel1().add(getLblName(), getLblName().getName()); getJPanel1().add(getJTabbedPane1(), getJTabbedPane1().getName()); getJPanel1().add(getPnlName(), getPnlName().getName()); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjJPanel1; } /** * Return the JTabbedPane1 property value. * @return javax.swing.JTabbedPane */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JTabbedPane getJTabbedPane1() { if (ivjJTabbedPane1 == null) { try { ivjJTabbedPane1 = new javax.swing.JTabbedPane(); ivjJTabbedPane1.setName("JTabbedPane1"); ivjJTabbedPane1.setBounds(7, 51, 486, 157); ivjJTabbedPane1.insertTab("Detail", null, getPnlDetail(), null, 0); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjJTabbedPane1; } /** * Return the LblDirect property value. * @return javax.swing.JLabel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JLabel getLblDirect() { if (ivjLblDirect == null) { try { ivjLblDirect = new javax.swing.JLabel(); ivjLblDirect.setName("LblDirect"); ivjLblDirect.setText("Direkte Kosten:"); ivjLblDirect.setBounds(11, 25, 143, 14); // user code begin {1} ivjLblDirect.setText(getResourceString("LblDirect_text")); ivjLblDirect.setToolTipText(getResourceString("LblDirect_toolTipText")); // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjLblDirect; } /** * Return the LblIliCode property value. * @return javax.swing.JLabel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JLabel getLblIliCode() { if (ivjLblIliCode == null) { try { ivjLblIliCode = new javax.swing.JLabel(); ivjLblIliCode.setName("LblIliCode"); ivjLblIliCode.setText("IliCode:"); ivjLblIliCode.setBounds(11, 52, 143, 14); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjLblIliCode; } /** * Return the JLabel1 property value. * @return javax.swing.JLabel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JLabel getLblName() { if (ivjLblName == null) { try { ivjLblName = new javax.swing.JLabel(); ivjLblName.setName("LblName"); ivjLblName.setText("Bezeichnung:"); 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) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjLblName; } /** * Return the Object property value. * @return org.tcotool.model.CostCause */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private org.tcotool.model.CostCause getObject() { // user code begin {1} // user code end return ivjObject; } /** * Return the PnlDetail property value. * @return javax.swing.JPanel */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JPanel getPnlDetail() { if (ivjPnlDetail == null) { try { ivjPnlDetail = new javax.swing.JPanel(); ivjPnlDetail.setName("PnlDetail"); ivjPnlDetail.setLayout(null); getPnlDetail().add(getLblIliCode(), getLblIliCode().getName()); getPnlDetail().add(getTxtName1(), getTxtName1().getName()); getPnlDetail().add(getLblDirect(), getLblDirect().getName()); getPnlDetail().add(getChxDirect(), getChxDirect().getName()); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjPnlDetail; } /** * Return the PnlName property value. * @return ch.softenvironment.jomm.mvc.view.DbNlsStringView */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private ch.softenvironment.jomm.mvc.view.DbNlsStringView getPnlName() { if (ivjPnlName == null) { try { ivjPnlName = new ch.softenvironment.jomm.mvc.view.DbNlsStringView(); ivjPnlName.setName("PnlName"); ivjPnlName.setBounds(149, 11, 344, 26); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjPnlName; } /** * Return the PnlStandardToolbar property value. * @return ch.softenvironment.view.ToolBar */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private ch.softenvironment.view.ToolBar getPnlStandardToolbar() { if (ivjPnlStandardToolbar == null) { try { ivjPnlStandardToolbar = new ch.softenvironment.view.ToolBar(); ivjPnlStandardToolbar.setName("PnlStandardToolbar"); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjPnlStandardToolbar; } /** * Return the PnlStatusBar property value. * @return ch.softenvironment.view.StatusBar */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private ch.softenvironment.view.StatusBar getPnlStatusBar() { if (ivjPnlStatusBar == null) { try { ivjPnlStatusBar = new ch.softenvironment.view.StatusBar(); ivjPnlStatusBar.setName("PnlStatusBar"); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjPnlStatusBar; } /** * Return the TxtName1 property value. * @return javax.swing.JTextField */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private javax.swing.JTextField getTxtName1() { if (ivjTxtName1 == null) { try { ivjTxtName1 = new javax.swing.JTextField(); ivjTxtName1.setName("TxtName1"); ivjTxtName1.setBounds(161, 49, 309, 20); ivjTxtName1.setEditable(false); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } } return ivjTxtName1; } /** * Called whenever the part throws an exception. * @param exception java.lang.Throwable */ protected void handleException(java.lang.Throwable exception) { super.handleException(exception); } /** * Initializes connections * @exception java.lang.Exception The exception description. */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void initConnections() throws java.lang.Exception { // user code begin {1} // user code end getPnlStandardToolbar().addPropertyChangeListener(ivjEventHandler); getPnlStandardToolbar().addToolBarListener(ivjEventHandler); getPnlName().addPropertyChangeListener(ivjEventHandler); getTxtName1().addKeyListener(ivjEventHandler); getChxDirect().addItemListener(ivjEventHandler); connPtoP6SetTarget(); connPtoP2SetTarget(); connPtoP18SetTarget(); connPtoP4SetTarget(); connPtoP1SetTarget(); } /** * Initialize the class. */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void initialize() { try { // user code begin {1} initializeView(); // user code end setName("CatalogueDialog"); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setSize(505, 305); setTitle("Kostenart"); setContentPane(getBaseDialogContentPane()); initConnections(); } catch (java.lang.Throwable ivjExc) { handleException(ivjExc); } // user code begin {2} setTitle(ModelUtility.getTypeString(CostCause.class)); setConsistencyController(new ch.softenvironment.jomm.mvc.controller.ConsistencyController(this)); getPnlStandardToolbar().setObjects(getObjects()); // user code end } public void initializeView() throws Throwable { } /** * Redo the last undoing changes of an Object represented by this GUI. */ public void redoObject() {} /** * Save an Object represented by DetailView. */ public void saveObject() { try { getObject().save(); getObject().getObjectServer().cacheCode(getObject()); if (caller != null) { caller.assignObjects(ch.softenvironment.util.ListUtils.createList(getObject())); } LauncherView.getInstance().saveObject(); closeOnSave(); } catch(Throwable e) { handleException(e); } } /** * Set the ConsistencyController to a new value. * @param newValue ch.softenvironment.jomm.controls.ConsistencyController */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void setConsistencyController(ch.softenvironment.jomm.mvc.controller.ConsistencyController newValue) { if (ivjConsistencyController != newValue) { try { /* Stop listening for events from the current object */ if (ivjConsistencyController != null) { ivjConsistencyController.removePropertyChangeListener(ivjEventHandler); } ivjConsistencyController = newValue; /* Listen for events from the new object */ if (ivjConsistencyController != null) { ivjConsistencyController.addPropertyChangeListener(ivjEventHandler); } connPtoP6SetTarget(); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } }; // user code begin {3} // user code end } /** * Make the View represent the given Object. * @param currentObject * * Example Code: try { if ((object != null) && object.equals(getObject())) { return; } if (getObject() != null) { getObject().removeChangeListener(getConsistencyController()); } ((DbObject)object).refresh(true); setObject(object); object.addChangeListener(getconsistencyController()); } catch(Throwable e) { handleException(e); } */ public void setCurrentObject(java.lang.Object object) { try { if (getObject() != null) { getObject().removePropertyChangeListener(getConsistencyController()); } if (((CostCause)object).getPersistencyState().isNew()) { ((CostCause)object).refresh(false); } setObject((org.tcotool.model.CostCause)object); getObject().addPropertyChangeListener(getConsistencyController()); } catch(Throwable e) { handleException(e); } } /** * Set the Object to a new value. * @param newValue org.tcotool.model.CostCause */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ private void setObject(org.tcotool.model.CostCause newValue) { if (ivjObject != newValue) { try { /* Stop listening for events from the current object */ if (ivjObject != null) { ivjObject.removePropertyChangeListener(ivjEventHandler); } ivjObject = newValue; /* Listen for events from the new object */ if (ivjObject != null) { ivjObject.addPropertyChangeListener(ivjEventHandler); } connPtoP2SetTarget(); connPtoP18SetTarget(); connPtoP4SetTarget(); connPtoP1SetTarget(); // user code begin {1} // user code end } catch (java.lang.Throwable ivjExc) { // user code begin {2} // user code end handleException(ivjExc); } }; // user code begin {3} // user code end } /** * Undo the changes of an Object represented by this GUI. */ public void undoObject() { setCurrentObject(getObject()); } /** * Make sure any FactCost entries are recalculated. */ private void updateModel(java.beans.PropertyChangeEvent evt) { try { if (evt != null) { // be aware of ping-pong effect if (evt.getPropertyName().equals("price") || evt.getPropertyName().equals("currency")) { //TODO Tune fixModel -> needs only to correct PersonalCost entries LauncherView.getInstance().getUtility().fixModel((TcoObject)LauncherView.getInstance().getUtility().getRoot()); } } } catch(Throwable e) { handleException(e); } } } |
|
From: Hirzel P. <ph...@us...> - 2005-12-28 11:34:22
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14301/src/org/tcotool Modified Files: TcotoolUtility.java Log Message: Entry CostCause added Index: TcotoolUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/TcotoolUtility.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TcotoolUtility.java 20 Sep 2005 19:09:04 -0000 1.2 --- TcotoolUtility.java 28 Dec 2005 11:34:12 -0000 1.3 *************** *** 39,42 **** --- 39,43 ---- 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"); |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 13:06:46
|
Update of /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5115/plugins/org.tcotool.core.runtime Modified Files: plugin.xml Log Message: Documentation API Index: plugin.xml =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/plugins/org.tcotool.core.runtime/plugin.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** plugin.xml 29 Aug 2005 09:40:23 -0000 1.1.1.1 --- plugin.xml 22 Dec 2005 13:06:37 -0000 1.2 *************** *** 37,41 **** <doc-text><![CDATA[add a financial report to Menu->Reports->Finance and corresponding NavTree-Popup-Menu]]></doc-text> </doc> ! <!-- Menu-Entry relevant for Packages only --> <parameter-def id="isGroupSpecific" type="boolean"/> </extension-point> --- 37,41 ---- <doc-text><![CDATA[add a financial report to Menu->Reports->Finance and corresponding NavTree-Popup-Menu]]></doc-text> </doc> ! <!-- Menu-Entry relevant for TcoPackage (true), Service (false) or null (TcoPackage || Service) --> <parameter-def id="isGroupSpecific" type="boolean"/> </extension-point> |
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30048/src/org/tcotool/application/resources Modified Files: RoleDetailView_de.properties PersonalCostDetailView_de.properties RoleDetailView.properties PersonalCostDetailView.properties Log Message: Refactoring: Translations Index: RoleDetailView.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/RoleDetailView.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RoleDetailView.properties 29 Aug 2005 09:41:03 -0000 1.1.1.1 --- RoleDetailView.properties 22 Dec 2005 12:36:34 -0000 1.2 *************** *** 4,8 **** LblFullTimeEquivalent_text = Full Time Equivalent (FTE): LblHourlyRate_text = Hourly rate: ! LblYearlyHours_text = Manyear-h: LblYearlyHours_toolTipText = Max. number of working hours for 100% of this Role? PnlYearlySettings_text = Settings per business year \ No newline at end of file --- 4,8 ---- LblFullTimeEquivalent_text = Full Time Equivalent (FTE): LblHourlyRate_text = Hourly rate: ! LblYearlyHours_text = Manyear: LblYearlyHours_toolTipText = Max. number of working hours for 100% of this Role? PnlYearlySettings_text = Settings per business year \ No newline at end of file Index: PersonalCostDetailView_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/PersonalCostDetailView_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PersonalCostDetailView_de.properties 29 Aug 2005 09:41:03 -0000 1.1.1.1 --- PersonalCostDetailView_de.properties 22 Dec 2005 12:36:34 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- LblActivity_text = Aktivität: LblHours_text = Anzahl: + LblAvailableHours_text = Noch verfügbar: + LblAvailableHours_toolTipText = Verbleibender Rest-Aufwand gemäss der Rollen-Angaben. ChxInternal_text = MitarbeiterIn intern ChxInternal_toolTipText = sonst externe MitarbeiterIn \ No newline at end of file Index: RoleDetailView_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/RoleDetailView_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RoleDetailView_de.properties 29 Aug 2005 09:41:03 -0000 1.1.1.1 --- RoleDetailView_de.properties 22 Dec 2005 12:36:34 -0000 1.2 *************** *** 4,8 **** LblFullTimeEquivalent_text = Vollkosten (FTE): LblHourlyRate_text = Stundenansatz: ! LblYearlyHours_text = Mannjahr-h: LblYearlyHours_toolTipText = Max. Anzahl Arbeitsstunden pro 100% dieser Rolle? PnlYearlySettings_text = Angaben für ein Geschäftsjahr \ No newline at end of file --- 4,8 ---- LblFullTimeEquivalent_text = Vollkosten (FTE): LblHourlyRate_text = Stundenansatz: ! LblYearlyHours_text = Mannjahr: LblYearlyHours_toolTipText = Max. Anzahl Arbeitsstunden pro 100% dieser Rolle? PnlYearlySettings_text = Angaben für ein Geschäftsjahr \ No newline at end of file Index: PersonalCostDetailView.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/resources/PersonalCostDetailView.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PersonalCostDetailView.properties 29 Aug 2005 09:41:00 -0000 1.1.1.1 --- PersonalCostDetailView.properties 22 Dec 2005 12:36:34 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- LblActivity_text = Activity: LblHours_text = Number of: + LblAvailableHours_text = Available yet: + LblAvailableHours_toolTipText = Personal-Effort available according to Role-settings. ChxInternal_text = Employee internal ChxInternal_toolTipText = otherwise external employee \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 12:35:55
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29922/src/org/tcotool/standard/report/resources Modified Files: ReportTool.properties ReportTool_de.properties Log Message: New Translations Index: ReportTool.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/resources/ReportTool.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ReportTool.properties 29 Aug 2005 09:41:13 -0000 1.1.1.1 --- ReportTool.properties 22 Dec 2005 12:35:47 -0000 1.2 *************** *** 18,27 **** CIPersonalPartialEffort = Personal partially effort CIPersonalRapportedEffort = Assigned efforts in hours for Personalcosts - CIInternalHours = Hours internally - CIExternalHours = Hours externally - CIInternalManYear = Man-year internally - CIExternalManYear = Man-year externally CIOtherPersonalCost = Lump Personal costs without assigned effort in h ! CIInternalLump = Lump internally ! CIExternalLump = Lump externally ! CIPersonalTotal = Partial effort Personal \ No newline at end of file --- 18,27 ---- CIPersonalPartialEffort = Personal partially effort CIPersonalRapportedEffort = Assigned efforts in hours for Personalcosts CIOtherPersonalCost = Lump Personal costs without assigned effort in h ! CIPersonalTotal = Partial effort Personal ! CINotAvailable = N.A. ! CELicence = Licence-problem ! CWNoPluginLicence = Unfortunately, there is no valid licence fot the chosen Plugin!\nFor further information, please refer to:\nmailto: in...@so... ! CIPlugins = Plugins ! CIValidUntil = Valid until ! CTLump = Lump (without assigned {0}) \ No newline at end of file Index: ReportTool_de.properties =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/resources/ReportTool_de.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ReportTool_de.properties 29 Aug 2005 09:41:13 -0000 1.1.1.1 --- ReportTool_de.properties 22 Dec 2005 12:35:47 -0000 1.2 *************** *** 18,27 **** CIPersonalPartialEffort = Teilaufwände Personal CIPersonalRapportedEffort = Erfasste h-Aufwände in den Personalkosten - CIInternalHours = Stunden intern - CIExternalHours = Stunden extern - CIInternalManYear = Mannjahre intern - CIExternalManYear = Mannjahre extern CIOtherPersonalCost = Pauschale Personalkosten ohne Angabe des h-Aufwandes ! CIInternalLump = Pauschal intern ! CIExternalLump = Pauschal extern ! CIPersonalTotal = Totalaufwände Personal \ No newline at end of file --- 18,27 ---- CIPersonalPartialEffort = Teilaufwände Personal CIPersonalRapportedEffort = Erfasste h-Aufwände in den Personalkosten CIOtherPersonalCost = Pauschale Personalkosten ohne Angabe des h-Aufwandes ! CIPersonalTotal = Totalaufwände Personal ! CINotAvailable = N.V. ! CELicence = Lizenzproblem ! CWNoPluginLicence = Für dieses Plugin existiert leider keine gültige Lizenz!\nWeitere Informationen erhalten Sie bei:\nmailto: in...@so... ! CIPlugins = Plugins ! CIValidUntil = Gültig bis ! CTLump = Pauschal (ohne zugeordnete {0}) \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 12:34:48
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/src/org/tcotool/tools Modified Files: ModelUtility.java Log Message: Refactoring: documentation Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ModelUtility.java 13 Dec 2005 14:04:14 -0000 1.7 --- ModelUtility.java 22 Dec 2005 12:34:40 -0000 1.8 *************** *** 46,51 **** private String file = null; private Diagram dependencyDiagram = null; - // private long maxUsage = 12; // at least 12 month - // private long maxDepreciation = 12; // at least 12 month /** --- 46,49 ---- *************** *** 136,140 **** ((TcoPackage)element).setNamespaceId(((TcoPackage)owner).getId()); } ! return element; } --- 134,138 ---- ((TcoPackage)element).setNamespaceId(((TcoPackage)owner).getId()); } ! return element; } *************** *** 542,546 **** } /** ! * Returns the appropriate icon */ public Icon getIcon(Object node, boolean expanded) { --- 540,544 ---- } /** ! * Returns the appropriate icon for node Element. */ public Icon getIcon(Object node, boolean expanded) { |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 12:31:27
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/pluginsupport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29141/src/org/tcotool/pluginsupport Modified Files: PluginUtility.java Log Message: Refactoring #invokePlugins() for better reusability Index: PluginUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/pluginsupport/PluginUtility.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PluginUtility.java 16 Dec 2005 09:27:43 -0000 1.3 --- PluginUtility.java 22 Dec 2005 12:31:16 -0000 1.4 *************** *** 43,47 **** */ public final class PluginUtility { - public static final String CORE_PLUGIN_ID = "org.tcotool.core.runtime"; private static final String PLUGINS_FOLDER = "./plugins"; private static final String DATA_FOLDER = "./data"; --- 43,46 ---- *************** *** 50,60 **** /** * Scan for available Plugins for e.g. at startup and ! * register them. The ApplicationCore-Plugin will then ! * be initialized. ! * @param args no arguments expected * @throws Exception if any error occurred * @see org.tcotool.core.runtime.ApplicationPlugin */ ! public static PluginManager invokePlugins() throws Exception { try { // suppress any logs by commons-logging.jar --- 49,58 ---- /** * Scan for available Plugins for e.g. at startup and ! * register them. The ApplicationCore-Plugin must be passed. ! * @param corePluginId Id of an extension-Point * @throws Exception if any error occurred * @see org.tcotool.core.runtime.ApplicationPlugin */ ! public static PluginManager invokePlugins(final String corePluginId) throws Exception { try { // suppress any logs by commons-logging.jar *************** *** 120,126 **** // get the start-up plug-in (plugin-id => see plugin.xml) ! Plugin corePlugin = pluginManager.getPlugin(CORE_PLUGIN_ID); if (corePlugin == null) { ! throw new Exception("can't get Plugin: " + CORE_PLUGIN_ID); } // Now we are ready to RUN! Let's do it! --- 118,124 ---- // get the start-up plug-in (plugin-id => see plugin.xml) ! Plugin corePlugin = pluginManager.getPlugin(corePluginId); if (corePlugin == null) { ! throw new Exception("can't get Plugin: " + corePluginId); } // Now we are ready to RUN! Let's do it! |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 12:27:24
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28357/src/org/tcotool/application Modified Files: NavigationView.java Log Message: BUG FIX: Popup Menu Control mechanism Index: NavigationView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/NavigationView.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NavigationView.java 14 Dec 2005 13:14:14 -0000 1.5 --- NavigationView.java 22 Dec 2005 12:27:15 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- import java.util.List; + import org.tcotool.pluginsupport.Menu; import org.tcotool.standard.report.ReportInvestment; import org.tcotool.standard.report.ReportTco; *************** *** 146,149 **** --- 147,151 ---- boolean selected = (node != null); boolean isPackage = selected && (node instanceof TcoPackage); + boolean isService = selected && (node instanceof Service); getMnuFileNew().setEnabled(false); *************** *** 173,179 **** } getMniService().setEnabled(isPackage && (!node.equals(modelAdapter.getUtility().getRoot()))); - getMniReportBlockTcoDetailed().setEnabled(selected); - getMniReportBlockTcoTotal().setEnabled(isPackage); - getMniReportInvestment().setEnabled(isPackage); // treat "Main-Menu" --- 175,178 ---- *************** *** 190,206 **** getMniExportConfiguration().setEnabled(isPackage && (!modelAdapter.getUtility().getRoot().equals(node))); ! Component[] items = getMnuReportFinance().getMenuComponents(); ! for (int i=0; i<items.length; i++) { JComponent comp = (JComponent)items[i]; // @see ApplicationPlugin#createMenuItem() Boolean isGroup = (Boolean)comp.getClientProperty(org.tcotool.pluginsupport.Menu.GROUP_SPECIFIC); if (isGroup == null) { ! comp.setEnabled(selected); } else { ! comp.setEnabled(isGroup.booleanValue() && isPackage); } } - - // LauncherView.getInstance().adaptSelection(node); } /** --- 189,223 ---- getMniExportConfiguration().setEnabled(isPackage && (!modelAdapter.getUtility().getRoot().equals(node))); ! adaptReports(getMnuReportTco().getMenuComponents(), isService, isPackage); ! adaptReports(getMnuReportFinance().getMenuComponents(), isService, isPackage); ! // getMniReportBlockTcoTotal().setEnabled(isPackage); ! // getMniReportBlockTcoDetailed().setEnabled(isService || isPackage); ! // getMniReportInvestment().setEnabled(isPackage); ! ! // LauncherView.getInstance().adaptSelection(node); ! } ! /** ! * Adapt Plugin-Reports. ! * @param items ! * @param isService ! * @param isPackage ! * @see org.tcotool.pluginsupport.Menu ! */ ! private void adaptReports(Component[] items, boolean isService, boolean isPackage) { ! for (int i=0; i<items.length; i++) { JComponent comp = (JComponent)items[i]; // @see ApplicationPlugin#createMenuItem() Boolean isGroup = (Boolean)comp.getClientProperty(org.tcotool.pluginsupport.Menu.GROUP_SPECIFIC); if (isGroup == null) { ! // report is available for Group or Package ! comp.setEnabled(isService || isPackage); ! } else if (isGroup.booleanValue()) { ! // only TcoPackage specific ! comp.setEnabled(isPackage); } else { ! // only Service specific ! comp.setEnabled(isService); } } } /** *************** *** 1017,1020 **** --- 1034,1038 ---- ivjMniReportBlockTcoDetailed.setText("Kostenblock detailiert (TCO)"); // user code begin {1} + ivjMniReportBlockTcoDetailed.putClientProperty(Menu.GROUP_SPECIFIC, null); ivjMniReportBlockTcoDetailed.setToolTipText(getResourceString("CICostBlock")); ivjMniReportBlockTcoDetailed.setText(getResourceString("MniReportTcoCostDetailed_text")); *************** *** 1041,1044 **** --- 1059,1063 ---- ivjMniReportBlockTcoTotal.setText("Kostenblock gesamt (TCO)"); // user code begin {1} + ivjMniReportBlockTcoTotal.putClientProperty(Menu.GROUP_SPECIFIC, Boolean.TRUE); ivjMniReportBlockTcoTotal.setToolTipText(getResourceString("CICostBlock")); ivjMniReportBlockTcoTotal.setText(getResourceString(LauncherView.class, "MniReportTotalTcoCost_text")); *************** *** 1055,1058 **** --- 1074,1078 ---- if (mniReportInvestment == null) { mniReportInvestment = new JMenuItem(); + mniReportInvestment.putClientProperty(Menu.GROUP_SPECIFIC, Boolean.TRUE); mniReportInvestment.setText(getResourceString(LauncherView.class, "MniReportInvestment_text")); mniReportInvestment.addActionListener(new java.awt.event.ActionListener() { *************** *** 1757,1760 **** --- 1777,1781 ---- this.viewOptions = viewOptions; if (!viewOptions.isSet(LauncherView.TEST_RELEASE)) { + //TODO not yet robust getSepImportExport().setVisible(false); getMniImportConfiguration().setVisible(false); |
|
From: Hirzel P. <ph...@us...> - 2005-12-22 12:26:47
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28208/src/org/tcotool/application Modified Files: LauncherView.java Log Message: Official Release 1.4.0 Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LauncherView.java 7 Dec 2005 13:48:41 -0000 1.8 --- LauncherView.java 22 Dec 2005 12:26:37 -0000 1.9 *************** *** 1907,1911 **** */ public static String getVersion() { ! return "V1.4.0 beta 2"; } /** --- 1907,1911 ---- */ public static String getVersion() { ! return "V1.4.0"; } /** *************** *** 2064,2068 **** DbObjectServer objSrv = initializeDatabase(System.getProperty("user.name"), null, "tcotool.model"); ! showSplashScreen(new java.awt.Dimension(624, 400), ch.ehi.basics.i18n.ResourceBundle.getImageIcon(LauncherView.class, "splash_de.jpg")); ch.softenvironment.jomm.mvc.controller.ConsistencyController.setCascaded(true); --- 2064,2072 ---- DbObjectServer objSrv = initializeDatabase(System.getProperty("user.name"), null, "tcotool.model"); ! String splashImage = "splash.jpg"; ! if (Locale.getDefault().getLanguage().equals(Locale.GERMAN.getLanguage())) { ! splashImage = "splash_de.jpg"; ! } ! showSplashScreen(new java.awt.Dimension(624, 400), ch.ehi.basics.i18n.ResourceBundle.getImageIcon(LauncherView.class, splashImage)); ch.softenvironment.jomm.mvc.controller.ConsistencyController.setCascaded(true); *************** *** 2074,2078 **** } catch (Throwable exception) { exception.printStackTrace(System.out); ! showException(instance, exception); //$NON-NLS-1$ Tracer.getInstance().stop(); System.exit(-1); --- 2078,2082 ---- } catch (Throwable exception) { exception.printStackTrace(System.out); ! showException(instance, exception); Tracer.getInstance().stop(); System.exit(-1); *************** *** 2090,2094 **** try { //TODO Future use: instantiate LauncherView in ApplicationPlugin#createAndShowGUI() ! /*getInstance().pluginManager =*/ PluginUtility.invokePlugins(); } catch(Exception e) { //TODO NLS --- 2094,2098 ---- try { //TODO Future use: instantiate LauncherView in ApplicationPlugin#createAndShowGUI() ! /*getInstance().pluginManager =*/ PluginUtility.invokePlugins("org.tcotool.core.runtime"); } catch(Exception e) { //TODO NLS *************** *** 2617,2620 **** setModelChanged(false); } ! } --- 2621,2626 ---- setModelChanged(false); } ! public void showStatus(String status) { ! getStbStatus().setStatus(status); ! } } |
