From: Hirzel P. <ph...@us...> - 2008-06-18 15:29:36
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17279/src/org/tcotool/application Modified Files: LauncherView.java Log Message: new official release Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** LauncherView.java 19 Jun 2007 08:21:59 -0000 1.12 --- LauncherView.java 18 Jun 2008 15:29:39 -0000 1.13 *************** *** 1,3 **** --- 1,4 ---- package org.tcotool.application; + /* * This library is free software; you can redistribute it and/or *************** *** 29,32 **** --- 30,35 ---- import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; + import java.io.BufferedInputStream; + import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.Iterator; *************** *** 44,48 **** --- 47,53 ---- import ch.softenvironment.jomm.*; import ch.softenvironment.jomm.mvc.model.DbChangeableBean; + import ch.softenvironment.jomm.mvc.model.DbCode; import ch.softenvironment.jomm.mvc.model.DbCodeType; + import ch.softenvironment.jomm.serialize.CsvSerializer; import ch.softenvironment.jomm.target.xml.*; *************** *** 116,119 **** --- 121,125 ---- private JMenu ivjMnuReportGeneral = null; private JMenu ivjMnuReportTco = null; + private JRadioButtonMenuItem ivjRbtChinese = null; class IvjEventHandler implements ch.softenvironment.view.SimpleEditorPanelListener, ch.softenvironment.view.ToolBarListener, java.awt.event.ActionListener, java.awt.event.ItemListener { *************** *** 151,154 **** --- 157,164 ---- if (e.getSource() == LauncherView.this.getRbtFontBig()) connEtoC30(e); + if (e.getSource() == LauncherView.this.getMniFileImportCostCentre()) + connEtoC16(e); + if (e.getSource() == LauncherView.this.getMniFileImportCostCause()) + connEtoC17(e); }; public void itemStateChanged(java.awt.event.ItemEvent e) { *************** *** 161,175 **** if (e.getSource() == LauncherView.this.getRbtLanguageEnglish()) connEtoC22(e); }; 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) { ! try { ! mniFind(); ! } catch (java.lang.Throwable ivjExc) { ! handleException(ivjExc); ! } ! }; public void tbbNewAction_actionPerformed(java.util.EventObject newEvent) { if (newEvent.getSource() == LauncherView.this.getTlbStandard()) --- 171,181 ---- if (e.getSource() == LauncherView.this.getRbtLanguageEnglish()) connEtoC22(e); + if (e.getSource() == LauncherView.this.getRbtChinese()) + connEtoC13(e); }; 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) { if (newEvent.getSource() == LauncherView.this.getTlbStandard()) *************** *** 193,197 **** }; }; ! /** * Constructor --- 199,205 ---- }; }; ! private JMenuItem ivjMniFileImportCostCause = null; ! private JMenuItem ivjMniFileImportCostCentre = null; ! private JMenu ivjMnuFileImport = null; /** * Constructor *************** *** 276,283 **** item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { showBusy(new Runnable() { public void run() { try { ! Iterator it = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary).iterator(); //TODO if (!it.hasNext()) { showNoDataFor(dbCodeType) } while (it.hasNext()) { --- 284,296 ---- item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { + final java.util.List primaryCodes = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary); + if ((primaryCodes == null) || (primaryCodes.size() == 0)) { + BaseDialog.showWarning(getInstance(), ResourceManager.getResource(ChartTool.class, "CWNoCode_title") + " " + ModelUtility.getTypeString(dbCodeTypePrimary), ResourceManager.getResource(ChartTool.class, "CWNoCode_text")); + return; + } showBusy(new Runnable() { public void run() { try { ! Iterator it = primaryCodes.iterator(); //TODO if (!it.hasNext()) { showNoDataFor(dbCodeType) } while (it.hasNext()) { *************** *** 301,308 **** item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { showBusy(new Runnable() { public void run() { try { ! Iterator it = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary).iterator(); while (it.hasNext()) { DbCodeType maskCode = (DbCodeType)it.next(); --- 314,326 ---- item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { + final java.util.List primaryCodes = ((TcoModel)getUtility().getRoot()).getObjectServer().retrieveCodes(dbCodeTypePrimary); + if ((primaryCodes == null) || (primaryCodes.size() == 0)) { + BaseDialog.showWarning(getInstance(), ResourceManager.getResource(ChartTool.class, "CWNoCode_title") + " " + ModelUtility.getTypeString(dbCodeTypePrimary), ResourceManager.getResource(ChartTool.class, "CWNoCode_text")); + return; + } showBusy(new Runnable() { public void run() { try { ! Iterator it = primaryCodes.iterator(); while (it.hasNext()) { DbCodeType maskCode = (DbCodeType)it.next(); *************** *** 441,444 **** --- 459,480 ---- } /** + * connEtoC13: (RbtChinese.item.itemStateChanged(java.awt.event.ItemEvent) --> LauncherView.setLanguage()V) + * @param arg1 java.awt.event.ItemEvent + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connEtoC13(java.awt.event.ItemEvent arg1) { + try { + // user code begin {1} + // user code end + this.setLanguage(); + // user code begin {2} + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** * connEtoC14: (JMenuItem41.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.mniSystem()V) * @param arg1 java.awt.event.ActionEvent *************** *** 477,480 **** --- 513,552 ---- } /** + * connEtoC16: (MniFileImportCostCentre.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.mniFileImportCostCentre()V) + * @param arg1 java.awt.event.ActionEvent + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connEtoC16(java.awt.event.ActionEvent arg1) { + try { + // user code begin {1} + // user code end + this.mniFileImportCostCentre(); + // user code begin {2} + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** + * connEtoC17: (MniFileImportCostCause.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.mniFileImportCostCause()V) + * @param arg1 java.awt.event.ActionEvent + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private void connEtoC17(java.awt.event.ActionEvent arg1) { + try { + // user code begin {1} + // user code end + this.mniFileImportCostCause(); + // user code begin {2} + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {3} + // user code end + handleException(ivjExc); + } + } + /** * connEtoC18: (MniHelp.action.actionPerformed(java.awt.event.ActionEvent) --> LauncherView.mniHelp()V) * @param arg1 java.awt.event.ActionEvent *************** *** 1049,1052 **** --- 1121,1168 ---- } /** + * Return the MniFileImportCostCause property value. + * @return javax.swing.JMenuItem + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JMenuItem getMniFileImportCostCause() { + if (ivjMniFileImportCostCause == null) { + try { + ivjMniFileImportCostCause = new javax.swing.JMenuItem(); + ivjMniFileImportCostCause.setName("MniFileImportCostCause"); + ivjMniFileImportCostCause.setText("Cost type..."); + // user code begin {1} + ivjMniFileImportCostCause.setText(ModelUtility.getTypeString(CostCause.class) + "..."); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjMniFileImportCostCause; + } + /** + * Return the MniFileImportCostCentre property value. + * @return javax.swing.JMenuItem + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JMenuItem getMniFileImportCostCentre() { + if (ivjMniFileImportCostCentre == null) { + try { + ivjMniFileImportCostCentre = new javax.swing.JMenuItem(); + ivjMniFileImportCostCentre.setName("MniFileImportCostCentre"); + ivjMniFileImportCostCentre.setText("Cost centre..."); + // user code begin {1} + ivjMniFileImportCostCentre.setText(ModelUtility.getTypeString(CostCentre.class) + "..."); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjMniFileImportCostCentre; + } + /** * Return the MnuNew property value. * @return javax.swing.JMenu *************** *** 1179,1193 **** return mniFind; } - private void mniFind() { - try { - if (!getViewOptions().getViewManager().activateView(FindDialog.class)) { - javax.swing.JDialog dialog = new FindDialog(getInstance(), getViewOptions(), false); - getViewOptions().getViewManager().checkIn(null, dialog); - dialog.setVisible(true); - } - } catch(Throwable ex) { - handleException(ex); - } - } /** * Return the MniHelp property value. --- 1295,1298 ---- *************** *** 1397,1400 **** --- 1502,1506 ---- ivjMnuFile.add(getMniFileNew()); ivjMnuFile.add(getMniFileOpenWindow()); + ivjMnuFile.add(getMnuFileImport()); ivjMnuFile.add(getMniFileSave()); ivjMnuFile.add(getMniFileSaveAs()); *************** *** 1413,1416 **** --- 1519,1545 ---- } /** + * Return the MnuFileImport property value. + * @return javax.swing.JMenu + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JMenu getMnuFileImport() { + if (ivjMnuFileImport == null) { + try { + ivjMnuFileImport = new javax.swing.JMenu(); + ivjMnuFileImport.setName("MnuFileImport"); + ivjMnuFileImport.setText("Import"); + ivjMnuFileImport.add(getMniFileImportCostCentre()); + ivjMnuFileImport.add(getMniFileImportCostCause()); + // user code begin {1} + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjMnuFileImport; + } + /** * Return the MnuFont property value. * @return javax.swing.JMenu *************** *** 1486,1489 **** --- 1615,1619 ---- ivjMnuLanguage.add(getRbtLanguageFrench()); ivjMnuLanguage.add(getRbtLanguageItalian()); + ivjMnuLanguage.add(getRbtChinese()); // user code begin {1} ivjMnuLanguage.setText(CommonUserAccess.getMnuLanguageText()); *************** *** 1764,1767 **** --- 1894,1919 ---- } /** + * Return the RbtChinese property value. + * @return javax.swing.JRadioButtonMenuItem + */ + /* WARNING: THIS METHOD WILL BE REGENERATED. */ + private javax.swing.JRadioButtonMenuItem getRbtChinese() { + if (ivjRbtChinese == null) { + try { + ivjRbtChinese = new javax.swing.JRadioButtonMenuItem(); + ivjRbtChinese.setName("RbtChinese"); + ivjRbtChinese.setText("Chinese"); + // user code begin {1} + ivjRbtChinese.setText("Chinese (zhong wen"); + // user code end + } catch (java.lang.Throwable ivjExc) { + // user code begin {2} + // user code end + handleException(ivjExc); + } + } + return ivjRbtChinese; + } + /** * Return the RbtFontBig property value. * @return javax.swing.JRadioButtonMenuItem *************** *** 1994,1998 **** */ public static String getVersion() { ! return "V1.4.4"; } /** --- 2146,2150 ---- */ public static String getVersion() { ! return "V1.4.5"; } /** *************** *** 2033,2036 **** --- 2185,2191 ---- getRbtFontDefault().addActionListener(ivjEventHandler); getRbtFontBig().addActionListener(ivjEventHandler); + getRbtChinese().addItemListener(ivjEventHandler); + getMniFileImportCostCentre().addActionListener(ivjEventHandler); + getMniFileImportCostCause().addActionListener(ivjEventHandler); } /** *************** *** 2073,2076 **** --- 2228,2232 ---- group.add(getRbtLanguageFrench()); group.add(getRbtLanguageItalian()); + group.add(getRbtChinese()); if (java.util.Locale.getDefault().getLanguage().equals(java.util.Locale.GERMAN.getLanguage())) { getRbtLanguageGerman().setSelected(true); *************** *** 2079,2082 **** --- 2235,2240 ---- } else if (java.util.Locale.getDefault().getLanguage().equals(java.util.Locale.ITALIAN.getLanguage())) { getRbtLanguageItalian().setSelected(true); + } else if (java.util.Locale.getDefault().getLanguage().equals(java.util.Locale.CHINESE.getLanguage())) { + getRbtChinese().setSelected(true); } else { // default *************** *** 2162,2166 **** ApplicationOptions options = new ApplicationOptions(System.getProperty("user.home") + java.io.File.separator + ".TCO_Tool"); ! NlsUtils.changeLocale(new Locale(options.getLanguage())); setSystemLookAndFeel(); --- 2320,2328 ---- ApplicationOptions options = new ApplicationOptions(System.getProperty("user.home") + java.io.File.separator + ".TCO_Tool"); ! NlsUtils.changeLocale(new Locale(options.getLanguage())); ! if (Locale.getDefault().getLanguage().equals("zh")) { ! // @see #setLanguage() ! ResourceManager.setCharacterSet(StringUtils.CHARSET_UTF8); ! } setSystemLookAndFeel(); *************** *** 2193,2197 **** private void mniAbout() { try { ! new AboutDialog(this, getResourceString("FrmWindow_text"), getVersion(), "softEnvironment by Peter Hirzel 2004-2007"); } catch(Throwable e) { handleException(e); --- 2355,2359 ---- private void mniAbout() { try { ! new AboutDialog(this, getResourceString("FrmWindow_text"), getVersion(), "softEnvironment by Peter Hirzel 2004-2008"); } catch(Throwable e) { handleException(e); *************** *** 2217,2226 **** public void run() { try { ! showProgress(10, getResourceString("CIDependencyInit")); java.util.Set dependencies = getUtility().findDependencies((TcoObject)getUtility().getRoot()); if (dependencies.size() == 0) { BaseDialog.showWarning(view, getResourceString("MniDependencyGraph_text"), getResourceString("CEDependenciesMissing")); } else { ! showProgress(30, getResourceString("CIInitGraph")); boolean doLayout = false; if (getUtility().getDependencyDiagram() == null) { --- 2379,2388 ---- public void run() { try { ! WaitDialog.updateProgress(10, getResourceString("CIDependencyInit")); java.util.Set dependencies = getUtility().findDependencies((TcoObject)getUtility().getRoot()); if (dependencies.size() == 0) { BaseDialog.showWarning(view, getResourceString("MniDependencyGraph_text"), getResourceString("CEDependenciesMissing")); } else { ! WaitDialog.updateProgress(30, getResourceString("CIInitGraph")); boolean doLayout = false; if (getUtility().getDependencyDiagram() == null) { *************** *** 2230,2235 **** } org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(getUtility().getDependencyDiagram(), dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight()); ! showProgress(50, getResourceString("CIReportInit")); ! showProgress(65, getResourceString("CIAutoLayout")); depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60); if (doLayout) { --- 2392,2397 ---- } org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(getUtility().getDependencyDiagram(), dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight()); ! WaitDialog.updateProgress(50, getResourceString("CIReportInit")); ! WaitDialog.updateProgress(65, getResourceString("CIAutoLayout")); depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60); if (doLayout) { *************** *** 2247,2250 **** --- 2409,2513 ---- } /** + * Comment + */ + private void mniFileImportCostCause() { + importCode(CostCause.class, "Nr(UNIQUE!);Name;Direct(Yes/No);"); + } + /** + * Import code "CostCentre" from CSV-file. + * Replace text if CostCentre#iliCode matches. + */ + private void mniFileImportCostCentre() { + importCode(CostCentre.class, "Nr(UNIQUE!);Name;"); + } + /** + * Import given DbCode type into as BusinessObjects. + * @param type + * @param csvFormat + */ + private void importCode(Class type, final String csvFormat) { + try { + //TODO NLS + if (BaseDialog.showConfirm((java.awt.Component)this, "Import Code", ModelUtility.getTypeString(type) + "\n\nFormat: \"" + csvFormat + "\"\n\n[wobei die Kopfzeile ignoriert wird und eindeutige Nummern überschrieben werden!]")) { + FileChooser openDialog = new FileChooser(LauncherView.getInstance().getSettings().getWorkingDirectory()); + openDialog.setDialogTitle(CommonUserAccess.getTitleFileOpen()); + openDialog.addChoosableFileFilter(GenericFileFilter.createCsvFilter()); + if (openDialog.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { + java.util.Locale locale = ModelUtility.getCodeTypeLocale(); + XmlObjectServer server = (XmlObjectServer)utility.getServer(); + BufferedInputStream bis = new BufferedInputStream (new FileInputStream(openDialog.getSelectedFile())); + Iterator it = ParserCSV.readFile(bis, CsvSerializer.CELL_SEPARATOR).iterator(); + bis.close(); + if (it.hasNext()) { + // skip header + it.next(); + } + while (it.hasNext()) { + String line = (String)it.next(); + ParserCSV parser = new ParserCSV(line, CsvSerializer.CELL_SEPARATOR); + String iliCode = parser.getNextString(); + String name = parser.getNextString(); + Boolean direct = Boolean.TRUE; + if (type == CostCause.class) { + Boolean tmp = parser.getNextBoolean(); + if (tmp != null) { + direct = tmp; + } + } + /* + String note = ""; + String tmp = null; + while (!StringUtils.isNullOrEmpty(tmp = parser.getNextString())) { + if (note.length() > 0) { + note = note + "; "; + } + note = note + tmp; + } + */ + if (!StringUtils.isNullOrEmpty(name)) { + Iterator codes = utility.getServer().retrieveCodes(type).iterator(); + boolean found = false; + while (codes.hasNext()) { + DbCode code = (DbCode)codes.next(); + if ((code.getIliCode() != null) && code.getIliCode().equals(iliCode)) { + // update text + code.getName().setValue(name, locale); + if (type == CostCause.class) { + ((CostCause)code).setDirect(direct); + } + found = true; + break; + } + } + if (!found) { + // add new code + if (type == CostCause.class) { + ModelUtility.createCostCause(server, locale, iliCode, name, direct); + } else { + ModelUtility.createCostCenter(server, locale, iliCode, name); + } + } + } + } + closeSubWindows(); + LauncherView.getInstance().setModelChanged(true); + } + } + } catch(Throwable e) { + handleException(e); + } + } + private void mniFind() { + try { + if (!getViewOptions().getViewManager().activateView(FindDialog.class)) { + javax.swing.JDialog dialog = new FindDialog(getInstance(), getViewOptions(), false); + getViewOptions().getViewManager().checkIn(null, dialog); + dialog.setVisible(true); + } + } catch(Throwable ex) { + handleException(ex); + } + } + /** * Show Help. */ *************** *** 2350,2358 **** protected boolean mniSaveFile() { try { ! if (getUtility().getFile() == null) { return mniSaveAs(); } else { try { ! saveFile(getUtility().getFile()); } catch(java.io.IOException e) { handleException(e); --- 2613,2621 ---- protected boolean mniSaveFile() { try { ! if (getUtility().getFilename() == null) { return mniSaveAs(); } else { try { ! saveFile(getUtility().getFilename()); } catch(java.io.IOException e) { handleException(e); *************** *** 2549,2559 **** * Save Model into file. */ ! private void saveFile(String filename) throws Throwable { ! ((TcoModel)getUtility().getRoot()).setName(StringUtils.getPureFileName(filename)); ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(filename); ! userObject.setSender("www.tcotool.org (" + getVersion() + ")"); //TODO NYI: XSD ! userObject.setXsd("http://www.interlis.ch/INTERLIS2.2 TcoTool.xsd"); // userObject.setXsl("http://www.tcotool.org/XSLT/TCOModel_Tree.xsl"); final DbObjectServer server = getUtility().getServer(); --- 2812,2822 ---- * Save Model into file. */ ! private void saveFile(final String filename) throws Throwable { ! // ((TcoModel)getUtility().getRoot()).setName(StringUtils.getPureFileName(filename)); ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(filename); ! userObject.setSender(ModelUtility.getIliSender()); //TODO NYI: XSD ! userObject.setXsd(ModelUtility.XSD); // userObject.setXsl("http://www.tcotool.org/XSLT/TCOModel_Tree.xsl"); final DbObjectServer server = getUtility().getServer(); *************** *** 2583,2587 **** mnuFileHistory.addRecent(filename); ! getUtility().setFile(filename); ch.softenvironment.jomm.mvc.controller.ConsistencyController.cascadedSaved(); --- 2846,2850 ---- mnuFileHistory.addRecent(filename); ! getUtility().setFilename(filename); ch.softenvironment.jomm.mvc.controller.ConsistencyController.cascadedSaved(); *************** *** 2607,2610 **** --- 2870,2880 ---- } /** + * Set the image to be displayed in the Report-Desktop-Pane. + * @param image + */ + public void setBackgroundImage(Image image) { + this.image = image; + } + /** * Register currently selected treeNode in NavigationTree * for listening to PropertyChanges to update DocumentationPanel. *************** *** 2649,2660 **** // change Locale-Default; boolean changed = false; ! if (getRbtLanguageEnglish().isSelected()) { ! changed = NlsUtils.changeLocale(Locale.ENGLISH); } else if (getRbtLanguageFrench().isSelected()) { changed = NlsUtils.changeLocale(Locale.FRENCH); } else if (getRbtLanguageItalian().isSelected()) { changed = NlsUtils.changeLocale(Locale.ITALIAN); } else { ! changed = NlsUtils.changeLocale(Locale.GERMAN); } --- 2919,2934 ---- // change Locale-Default; boolean changed = false; ! ResourceManager.setCharacterSet(null); ! if (getRbtLanguageGerman().isSelected()) { ! changed = NlsUtils.changeLocale(Locale.GERMAN); } else if (getRbtLanguageFrench().isSelected()) { changed = NlsUtils.changeLocale(Locale.FRENCH); } else if (getRbtLanguageItalian().isSelected()) { changed = NlsUtils.changeLocale(Locale.ITALIAN); + } else if (getRbtChinese().isSelected()) { + ResourceManager.setCharacterSet(StringUtils.CHARSET_UTF8); // *_zh.properties are in UTF8 + changed = NlsUtils.changeLocale(Locale.CHINESE); } else { ! changed = NlsUtils.changeLocale(Locale.ENGLISH); } *************** *** 2663,2668 **** getSettings().setLanguage(Locale.getDefault().getLanguage()); saveSettings(); ! super.dispose(); ! showInstance(getViewOptions(), getUtility(), getSettings()); // updateStringComponent(this); // manual reset --- 2937,2941 ---- getSettings().setLanguage(Locale.getDefault().getLanguage()); saveSettings(); ! closeSubWindows(); // updateStringComponent(this); // manual reset *************** *** 2673,2676 **** --- 2946,2957 ---- } /** + * If language or codes changes force refresh in sub GUI's. + * @throws Throwable + */ + private void closeSubWindows() throws Throwable { + super.dispose(); + showInstance(getViewOptions(), getUtility(), getSettings()); + } + /** * Keep changes of Model in mind. */ *************** *** 2696,2704 **** getDtpRoot().repaint(); getViewOptions().getViewManager().closeAll(); ! ! if (utility.getFile() != null) { ! ((TcoPackage)this.utility.getRoot()).setName(StringUtils.getPureFileName(utility.getFile())); } ! getPnlNavigation().setUtility(getUtility()); --- 2977,2985 ---- getDtpRoot().repaint(); getViewOptions().getViewManager().closeAll(); ! /* ! if (utility.getFilename() != null) { ! ((TcoModel)this.utility.getRoot()).setName(new java.io.File(utility.getFilename()).getName()); } ! */ getPnlNavigation().setUtility(getUtility()); *************** *** 2728,2738 **** getStbStatus().setStatus(status); } - /** - * Set the image to be displayed in the Report-Desktop-Pane. - * @param image - */ - public void setBackgroundImage(Image image) { - this.image = image; - } - } --- 3009,3011 ---- |