From: Hirzel P. <ph...@us...> - 2008-05-18 14:49:27
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19201/src/org/tcotool/application Modified Files: CodeDetailView.java Log Message: Import disabled => makes no sense Index: CodeDetailView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/CodeDetailView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CodeDetailView.java 13 Jun 2007 20:13:56 -0000 1.7 --- CodeDetailView.java 18 May 2008 14:49:30 -0000 1.8 *************** *** 109,122 **** private javax.swing.JLabel ivjLblCostCause = null; private ch.softenvironment.jomm.mvc.view.DbCodeManageView ivjPnlCostCause = null; ! /** ! * Constructor ! * @param owner Symbol ! * @param modal Symbol ! */ ! /* WARNING: THIS METHOD WILL BE REGENERATED. */ ! public CodeDetailView(java.awt.Component owner, boolean modal) { ! super(owner, modal); ! initialize(); ! } /** * CodeDetailView constructor comment. --- 109,113 ---- private javax.swing.JLabel ivjLblCostCause = null; private ch.softenvironment.jomm.mvc.view.DbCodeManageView ivjPnlCostCause = null; ! /** * CodeDetailView constructor comment. *************** *** 210,216 **** if (saveDialog.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) { ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(saveDialog.getSelectedFile().getAbsolutePath()); ! userObject.setSender("www.tcotool.org (" + LauncherView.getVersion() + ")"); // TODO NYI: XSD ! userObject.setXsd("http://www.interlis.ch/INTERLIS2.2 TcoTool.xsd"); // userObject.setXsl("http://www.tcotool.org/XSLT/TCOModel_Tree.xsl"); server.setUserObject(userObject); --- 201,207 ---- if (saveDialog.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) { ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(saveDialog.getSelectedFile().getAbsolutePath()); ! userObject.setSender(ModelUtility.getIliSender()); // TODO NYI: XSD ! userObject.setXsd(ModelUtility.XSD); // userObject.setXsl("http://www.tcotool.org/XSLT/TCOModel_Tree.xsl"); server.setUserObject(userObject); *************** *** 265,269 **** ivjBtnExport = new javax.swing.JButton(); ivjBtnExport.setName("BtnExport"); ! ivjBtnExport.setToolTipText("Sämtliche Geschäftsobjekte in ein Set exportieren."); ivjBtnExport.setText("Export..."); ivjBtnExport.setBounds(190, 475, 113, 25); --- 256,260 ---- ivjBtnExport = new javax.swing.JButton(); ivjBtnExport.setName("BtnExport"); ! ivjBtnExport.setToolTipText("Export all Business-Object's into one Configuration.xml file."); ivjBtnExport.setText("Export..."); ivjBtnExport.setBounds(190, 475, 113, 25); *************** *** 281,284 **** --- 272,276 ---- * Return the BtnImport property value. * @return javax.swing.JButton + * @deprecated (@see #importCodes()) */ /* WARNING: THIS METHOD WILL BE REGENERATED. */ *************** *** 288,295 **** ivjBtnImport = new javax.swing.JButton(); ivjBtnImport.setName("BtnImport"); ! 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 } catch (java.lang.Throwable ivjExc) { --- 280,288 ---- ivjBtnImport = new javax.swing.JButton(); ivjBtnImport.setName("BtnImport"); ! ivjBtnImport.setToolTipText("Sämtliche Geschäftsobjekte aus einer anderen Konfiguration importieren."); ivjBtnImport.setText("Import..."); ivjBtnImport.setBounds(320, 475, 113, 25); // user code begin {1} + ivjBtnImport.setEnabled(false); // user code end } catch (java.lang.Throwable ivjExc) { *************** *** 645,649 **** // user code begin {1} getPnlCost().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(getResourceString("PnlCost_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end --- 638,642 ---- // user code begin {1} getPnlCost().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end *************** *** 718,722 **** // user code begin {1} getPnlCostDriver().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(getResourceString("PnlCostDriver_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end --- 711,715 ---- // user code begin {1} getPnlCostDriver().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ResourceManager.getResource(ServiceDetailView.class, "PnlCostDriver_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end *************** *** 833,837 **** // user code begin {1} getPnlService().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(getResourceString("PnlService_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end --- 826,830 ---- // user code begin {1} getPnlService().setBorder(javax.swing.BorderFactory.createCompoundBorder( ! javax.swing.BorderFactory.createTitledBorder(ResourceManager.getResource(ServiceDetailView.class, "FrmWindow_text")), javax.swing.BorderFactory.createEmptyBorder(5,5,5,5))); // user code end *************** *** 915,918 **** --- 908,912 ---- * Import codes from a file. * Keep DbEnumeration's and Model-Objects. + * @deprecated (this function is no help so far: update/extend codes acc. to IliCode would be nice) */ private void importCodes() { *************** *** 923,927 **** openDialog.addChoosableFileFilter(GenericFileFilter.createXmlFilter()); if (openDialog.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { ! //TODO Nasty removes given configuration except root to prevent TID-duplication and Code-Reference problems! ((TcoModel)LauncherView.getInstance().getUtility().getRoot()).setOwnedElement(new ArrayList()); --- 917,921 ---- openDialog.addChoosableFileFilter(GenericFileFilter.createXmlFilter()); if (openDialog.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { ! //TODO Nasty removes given configuration except root to prevent TID-duplication and Code-Reference problems! COMPARE IliCode where possible instead ((TcoModel)LauncherView.getInstance().getUtility().getRoot()).setOwnedElement(new ArrayList()); *************** *** 1011,1015 **** getPnlCategory().setCode(server, org.tcotool.model.ServiceCategory.class, ModelUtility.getTypeString(ServiceCategory.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlResponsibility().setCode(server, org.tcotool.model.Responsibility.class, ModelUtility.getTypeString(Responsibility.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); ! getPnlCostCentre().setCode(server, org.tcotool.model.CostCentre.class, ModelUtility.getTypeString(CostCentre.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlPhase().setCode(server, ProjectPhase.class, ModelUtility.getTypeString(ProjectPhase.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); --- 1005,1009 ---- getPnlCategory().setCode(server, org.tcotool.model.ServiceCategory.class, ModelUtility.getTypeString(ServiceCategory.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); getPnlResponsibility().setCode(server, org.tcotool.model.Responsibility.class, ModelUtility.getTypeString(Responsibility.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblResponsibility_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); ! getPnlCostCentre().setCode(server, org.tcotool.model.CostCentre.class, ModelUtility.getTypeString(CostCentre.class) /*ResourceManager.getResource(ServiceDetailView.class, "LblCostCentre_text", false)*/, DbObject.PROPERTY_NAME, CostCentreDetailView.class, getViewOptions()); getPnlPhase().setCode(server, ProjectPhase.class, ModelUtility.getTypeString(ProjectPhase.class) /*ResourceManager.getResource(CostDriverDetailView.class, "LblPhase_text", false)*/, DbObject.PROPERTY_NAME, null, getViewOptions()); *************** *** 1017,1021 **** getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblProcess_text"), DbObject.PROPERTY_NAME, null, getViewOptions()); ! getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ModelUtility.getTypeString(CostCause.class) /*ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false)*/, DbObject.PROPERTY_NAME, CostCauseDetailView.class, getViewOptions()); getPnlCatalogue().setCode(server, org.tcotool.model.Catalogue.class, ModelUtility.getTypeString(Catalogue.class) /*ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, CatalogueDetailView.class, getViewOptions()); getPnlRole().setCode(server, org.tcotool.model.Role.class, ModelUtility.getTypeString(Role.class) /*ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, RoleDetailView.class, getViewOptions()); --- 1011,1015 ---- getPnlProcess().setCode(server, org.tcotool.model.Process.class, ResourceManager.getResourceAsNonLabeled(CostDriverDetailView.class, "LblProcess_text"), DbObject.PROPERTY_NAME, null, getViewOptions()); ! getPnlCostCause().setCode(server, org.tcotool.model.CostCause.class, ModelUtility.getTypeString(CostCause.class) /*ResourceManager.getResource(CostDriverDetailView.class, "TbcCosttype_text", false)*/, "nameString", CostCauseDetailView.class, getViewOptions()); getPnlCatalogue().setCode(server, org.tcotool.model.Catalogue.class, ModelUtility.getTypeString(Catalogue.class) /*ResourceManager.getResource(CatalogueDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, CatalogueDetailView.class, getViewOptions()); getPnlRole().setCode(server, org.tcotool.model.Role.class, ModelUtility.getTypeString(Role.class) /*ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text", false)*/, DbObject.PROPERTY_NAME, RoleDetailView.class, getViewOptions()); |