January 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r2886 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org Jan. 8, 2010

Jan. 8, 2010

Author: chatellier Date: 2010-01-08 09:35:05 +0000 (Fri, 08 Jan 2010) New Revision: 2886 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java Log: Fix wrong log + add comments. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2010-01-06 18:34:55 UTC (rev 2885) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2010-01-08 09:35:05 UTC (rev 2886) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,7 +19,6 @@ package fr.ifremer.isisfish.ui.sensitivity; import fr.ifremer.isisfish.ui.input.InputContentUI; -import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -27,13 +26,18 @@ import org.apache.commons.logging.LogFactory; /** - * + * Sensitivity change listener to control tab swapping. + * * @author letellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ */ -public class SensitivityTabbedPaneListener implements ChangeListener{ +public class SensitivityTabbedPaneListener implements ChangeListener { /** Class logger. */ - private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); + private static Log log = LogFactory.getLog(SensitivityTabbedPaneListener.class); protected int cacheSelectedIndex = -1; @@ -72,14 +76,14 @@ } } - /* - * Ask you to save if modification are made - * @param ui selected + /** + * Ask you to save if modification are made. + * + * @param context selected * @return true to change tab */ protected boolean closeUI(InputContentUI context) throws Exception { boolean exit = true; return exit; } - }

1 0

r2885 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 18:34:55 +0000 (Wed, 06 Jan 2010) New Revision: 2885 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx Log: Fix simulation filtering. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-01-06 18:34:55 UTC (rev 2885) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -337,8 +337,11 @@ protected void selectFilter() { try { - simulAction.setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem())); - refresh(); + java.util.List<String> simulationsNames = fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()); + // TODO add " " to not triger event (need to be fixed) + simulationsNames.add(0, " "); + simulAction.setOldSimulatorNames(simulationsNames); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); } catch (ParseException ex) { if (log.isErrorEnabled()) { log.error("Can't select simulation filter", ex); @@ -367,6 +370,7 @@ protected void resetFilter(){ simulAction.resetOldSimulatorNames(); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); } protected void saveName(){ simulAction.setName(fieldSimulParamsName.getText()); @@ -393,12 +397,10 @@ <cell fill="horizontal" weightx="1.0"> <Table> <row> - <cell columns="4" fill="horizontal"> + <cell fill="horizontal"> <JLabel text="isisfish.params.loadOldSimulation"/> </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> + <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> @@ -412,6 +414,11 @@ </cell> </row> <row> + <cell fill="horizontal" weightx="1.0" insets="0,3,0,3"> + <JSeparator /> + </cell> + </row> + <row> <cell fill="both" weightx="1.0" weighty="1.0"> <Table> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2010-01-06 18:34:55 UTC (rev 2885) @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Field; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; @@ -44,7 +43,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; @@ -66,7 +64,6 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.SimulationProperties; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; @@ -77,9 +74,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.util.ErrorHelper; -import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** * SimulAction. @@ -472,17 +467,17 @@ */ public List<String> getOldSimulationItem() { - try { + //try { oldSimulNames = new ArrayList<String>(); - FilterModel<SimulationProperties, String> filterModel; + //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimulNames.addAll(SimulationStorage.getSimulationNames()); // create filter model - filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames); + //filterModel = SimulationFilterUtil.createFilterModel(oldSimulNames); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); // chatellier : Ajout d'une entrée vide pour forcer la sélection // et que le changement lance un evenement sur la liste @@ -491,7 +486,7 @@ oldSimulNames.add(0, " "); return oldSimulNames; - } catch (ParseException e) { + /*} catch (ParseException e) { if (log.isErrorEnabled()) { log.error("Can't get old simulation item", e); } @@ -502,13 +497,9 @@ } ErrorHelper.showErrorDialog(_("isisfish.error.simulation.listoldsimulation"), e); } - return null; + return null;*/ } - public List<String> getFilteredOldSimulatorNames() { - return getFilteredOldSimulatorNames(false); - } - public List<String> getFilteredOldSimulatorNames(boolean force) { if (oldSimulNames == null || force) { oldSimulNames = getOldSimulationItem(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2010-01-06 16:32:34 UTC (rev 2884) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2010-01-06 18:34:55 UTC (rev 2885) @@ -37,6 +37,8 @@ setSize(getMinimumSize()); repaint(); doReset(); + // TODO pas de composant parent ? + org.nuiton.widget.SwingUtil.center(this); // launch ui and waits for reply setVisible(true); return model.getFilteredResult(); @@ -46,6 +48,8 @@ setSize(getMinimumSize()); repaint(); doReset(); + // TODO pas de composant parent ? + org.nuiton.widget.SwingUtil.center(this); // launch ui and waits for reply setVisible(true); return (String) comboResult.getSelectedItem();

1 0

r2884 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:32:34 +0000 (Wed, 06 Jan 2010) New Revision: 2884 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java Log: Use java 6 link Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:30:49 UTC (rev 2883) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:32:34 UTC (rev 2884) @@ -33,7 +33,7 @@ "<br/>" + " Pour plus de renseignement sur les expressions rationnelles, reportez vous au lien suivant :" + "<ul>" + - "<li><a href='http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html'>Les expression rationnelles en Java</a></li>" + + "<li><a href='http://java.sun.com/javase/6/docs/api/java/util/regex/Pattern.html'>Les expression rationnelles en Java</a></li>" + "</ul>"); doc.setText(sb.toString()); doc.setCaretPosition(0);

1 0

r2883 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:30:49 +0000 (Wed, 06 Jan 2010) New Revision: 2883 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java Log: Fix accent Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:14:23 UTC (rev 2882) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2010-01-06 16:30:49 UTC (rev 2883) @@ -27,7 +27,7 @@ "<li><b>'.'</b> : un joker, qui repr\u00E9sente un caract\u00E8re unique quelconque.</li>\n" + "<li><b>'^'</b> et<b> '$'</b> : repr\u00E9sentent respectivement un d\u00E9but et une fin de ligne.</li>" + "<li><b>'*'</b> sp\u00E9cifie un nombre quelque conque du caract\u00E8re pr\u00E9c\u00E9dent</li>" + - "<li><b>'+'</b> sp\u00E9cifie un nombre strictement positif d'occurrence sup\u00E9rieur \u00E0 0 du caract\u00E8re pr\u0EE9c\u00E9dent ( x+ = xx*)</li>" + + "<li><b>'+'</b> sp\u00E9cifie un nombre strictement positif d'occurrence sup\u00E9rieur \u00E0 0 du caract\u00E8re pr\u00E9c\u00E9dent ( x+ = xx*)</li>" + "<li><b>'|'</b> sp\u00E9cifie une alternative, par exemple ^(a|b).+ repr\u00E9sente l'ensemble des mots commencant par <code>a</code> ou <code>b</code>.</li>" + "</ul>" + "<br/>" +

1 0

r2882 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:14:23 +0000 (Wed, 06 Jan 2010) New Revision: 2882 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Display exception message instead of "error" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 16:02:55 UTC (rev 2881) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 16:14:23 UTC (rev 2882) @@ -497,7 +497,7 @@ if (log.isDebugEnabled()) { log.debug("saveScript called on " + codeStorage.getName()); } - + try { //String content = scriptUI.getEditor().getText(); //codeStorage.setContent(content); @@ -520,9 +520,11 @@ */ public void commitScript() { + if (log.isDebugEnabled()) { + log.debug("commitScript called for " + codeStorage.getName()); + } + try { - log.debug("commitScript called for " + codeStorage.getName()); - // save script before commit saveScript(); @@ -539,8 +541,8 @@ log.error("Error on script commit", ex); } - // if vcs can write - ErrorHelper.showErrorDialog(_("isisfish.common.error"), ex); + // if vcs can't write + ErrorHelper.showErrorDialog(ex.getMessage(), ex); } }

1 0

r2881 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/script resources/icons
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:02:55 +0000 (Wed, 06 Jan 2010) New Revision: 2881 Added: isis-fish/trunk/src/main/resources/icons/cut.png isis-fish/trunk/src/main/resources/icons/database.png isis-fish/trunk/src/main/resources/icons/database_add.png isis-fish/trunk/src/main/resources/icons/database_connect.png isis-fish/trunk/src/main/resources/icons/database_delete.png isis-fish/trunk/src/main/resources/icons/database_edit.png isis-fish/trunk/src/main/resources/icons/database_error.png isis-fish/trunk/src/main/resources/icons/database_gear.png isis-fish/trunk/src/main/resources/icons/database_go.png isis-fish/trunk/src/main/resources/icons/database_key.png isis-fish/trunk/src/main/resources/icons/database_lightning.png isis-fish/trunk/src/main/resources/icons/database_link.png isis-fish/trunk/src/main/resources/icons/database_refresh.png isis-fish/trunk/src/main/resources/icons/database_save.png isis-fish/trunk/src/main/resources/icons/database_table.png isis-fish/trunk/src/main/resources/icons/page_copy.png isis-fish/trunk/src/main/resources/icons/page_paste.png isis-fish/trunk/src/main/resources/icons/page_white_compressed.png isis-fish/trunk/src/main/resources/icons/script.png isis-fish/trunk/src/main/resources/icons/script_add.png isis-fish/trunk/src/main/resources/icons/script_code.png isis-fish/trunk/src/main/resources/icons/script_code_red.png isis-fish/trunk/src/main/resources/icons/script_delete.png isis-fish/trunk/src/main/resources/icons/script_edit.png isis-fish/trunk/src/main/resources/icons/script_error.png isis-fish/trunk/src/main/resources/icons/script_gear.png isis-fish/trunk/src/main/resources/icons/script_go.png isis-fish/trunk/src/main/resources/icons/script_key.png isis-fish/trunk/src/main/resources/icons/script_lightning.png isis-fish/trunk/src/main/resources/icons/script_link.png isis-fish/trunk/src/main/resources/icons/script_palette.png isis-fish/trunk/src/main/resources/icons/script_save.png Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Add icons into script interface an on main frame Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-06 16:01:36 UTC (rev 2880) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-06 16:02:55 UTC (rev 2881) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,16 +22,19 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.Image; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import javax.imageio.ImageIO; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; @@ -604,6 +607,17 @@ ((WelcomeUI)e.getSource()).close(); } }); + + try { + InputStream imageStream = WelcomeUI.class.getResourceAsStream("/images/simulation.gif"); + Image image = ImageIO.read(imageStream); + welcome.setIconImage(image); + } + catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't set frame icon", ex); + } + } SwingUtil.center(welcome); welcome.setVisible(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-01-06 16:01:36 UTC (rev 2880) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2010-01-06 16:02:55 UTC (rev 2881) @@ -1,6 +1,6 @@  <JMenuBar id="scriptMenuBar" constraints='BorderLayout.NORTH'> <JMenu id="scriptTxtFile" text="isisfish.script.menu.file"> - <JMenu id="scriptNewMenu" text="isisfish.script.menu.new"> - <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' accelerator="accNewScript"/> - <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' accelerator="accNewSimulator"/> - <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' accelerator="accNewExport"/> - <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' accelerator="accNewRule"/> - <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' accelerator="accNewAnalysePlan"/> - <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' accelerator="accNewSensitivity"/> - <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' accelerator="accNewSensitivityExport"/> - <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' accelerator="accNewEquationModel"/> + <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png"> + <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' icon="script.png" /> + <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' icon="script.png" /> + <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" /> + <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" /> + <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' icon="script.png" /> + <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> + <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" /> + <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' icon="script.png" /> </JMenu> - <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" accelerator="accSave" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> - <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" accelerator="accImport" /> - <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="getScriptAction().exportScript()" accelerator="accExport" enabled='{isFileSelected()}' /> + <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" /> + <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="getScriptAction().exportScript()" icon="page_white_compressed.png" enabled='{isFileSelected()}' /> <JSeparator/> - <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='getScriptAction().deleteScript(false)' accelerator="accDelete" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='getScriptAction().deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtEdit" text="isisfish.script.menu.edit"> - <JMenuItem id="miCut" text="isisfish.script.menu.cut" onActionPerformed="getScriptAction().cut()" accelerator="accCut" enabled='{isTextSelected()}' /> - <JMenuItem id="miCopy" text="isisfish.script.menu.copy" onActionPerformed="getScriptAction().copy()" accelerator="accCopy" enabled='{isTextSelected()}' /> - <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" accelerator="accPaste" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCut" text="isisfish.script.menu.cut" onActionPerformed="getScriptAction().cut()" icon="cut.png" enabled='{isTextSelected()}' /> + <JMenuItem id="miCopy" text="isisfish.script.menu.copy" onActionPerformed="getScriptAction().copy()" icon="page_copy.png" enabled='{isTextSelected()}' /> + <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" accelerator="accCommitVCS" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" accelerator="accUpdateVCS" onActionPerformed="getScriptAction().updateScript()"/> + <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()"/> <JSeparator/> - <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' accelerator="accDeleteVCS" enabled='{isSingleFileSelected()}'/> + <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='{isSingleFileSelected()}'/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> - <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" accelerator="accCheckSyntax" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> - <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" accelerator="accEvaluate" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' /> + <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> + <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' /> <JSeparator/> <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" onActionPerformed="getScriptAction().generateScriptJavadoc()"/> <JMenuItem id="miShowJavadoc" text="isisfish.script.menu.javadocshow" onActionPerformed="getScriptAction().showScriptJavadoc()"/> @@ -76,15 +77,15 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/> - <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' /> - <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' /> - <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' /> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' /> - <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' /> - <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' /> - <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' /> - <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().checkScript()' /> - <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().evaluateScript()' /> + <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' icon="script.png" /> + <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" /> + <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" /> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> + <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' icon="cut.png" /> + <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' icon="page_copy.png" /> + <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' icon="page_paste.png" /> + <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().checkScript()' icon="script_code_red.png" /> + <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().evaluateScript()' icon="script_gear.png" /> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> @@ -95,7 +96,7 @@ <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> <org.nuiton.widget.editor.Editor id='editor'/> <JScrollPane> - <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced",Font.PLAIN, 12)}' /> + <JTextArea id="actionLogArea" editable="false" font='{new Font("Monospaced", Font.PLAIN, 12)}' /> </JScrollPane> </JSplitPane> </JSplitPane> Added: isis-fish/trunk/src/main/resources/icons/cut.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/cut.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_add.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_connect.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_connect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_delete.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_edit.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_error.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_gear.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_go.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_key.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_lightning.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_link.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_refresh.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_save.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/database_table.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/database_table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_copy.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_paste.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_paste.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/page_white_compressed.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/page_white_compressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_add.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_code.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_code.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_code_red.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_code_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_delete.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_edit.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_error.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_gear.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_go.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_key.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_lightning.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_link.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_palette.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_palette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/icons/script_save.png =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/icons/script_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2880 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 16:01:36 +0000 (Wed, 06 Jan 2010) New Revision: 2880 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx Log: Refactor advanced parameters (a border around 'free parameters') Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2010-01-06 11:32:03 UTC (rev 2879) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2010-01-06 16:01:36 UTC (rev 2880) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,224 +26,215 @@ import javax.swing.table.DefaultTableModel; import java.util.Map.Entry; - tableTagValue.addMouseListener(new MouseAdapter() { + /** + * Listener to enable/disable remove button. + */ + tableTagValues.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override - public void mouseReleased(MouseEvent e) { - setRemove(tableTagValue.getSelectedRow() != -1); + public void valueChanged(ListSelectionEvent e) { + setRemove(tableTagValues.getSelectedRow() != -1); } }); refresh(); - public void refresh(){ - setTableTagValue(); + public void refresh() { + setTableTagValues(); } - public AdvancedParamsUI (SimulAction action){ + public AdvancedParamsUI(SimulAction action) { setContextValue(action); } - protected void addTagValue(){ + + protected void addTagValue() { getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); - setTableTagValue(); - setRemove(true); + setTableTagValues(); valueChanged(true); } - protected void removeTagValue(){ - getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString()); - setTableTagValue(); + + protected void removeTagValue() { + getContextValue(SimulAction.class).removeTagValue(tableTagValues.getValueAt(tableTagValues.getSelectedRow(),0).toString()); + setTableTagValues(); valueChanged(true); } - protected void saveTagValue(){ - if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + + protected void saveTagValues() { + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) { getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); } valueChanged(false); } - protected void setSimulName(){ - if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + + protected void setSimulatorName() { + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1) { getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); valueChanged(true); } } - protected void setTableTagValue(){ - Map<String, String> tagValue = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); + + protected void setTableTagValues() { + Map<String, String> tagValues = getContextValue(SimulAction.class).getSimulationParameter().getTagValue(); // TODO make a table model for it String columnName[] = { _("isisfish.common.tag"), _("isisfish.common.value")}; - if (tagValue != null) { - DefaultTableModel model = new DefaultTableModel(columnName, tagValue.size()){ + if (tagValues != null) { + DefaultTableModel model = new DefaultTableModel(columnName, tagValues.size()) { @Override public boolean isCellEditable(int row, int column) { return false; } }; - Set<Entry<String, String>> set = tagValue.entrySet(); + Set<Entry<String, String>> set = tagValues.entrySet(); int row = 0; - for (Iterator<String> it = tagValue.keySet().iterator(); it.hasNext();) { + for (Iterator<String> it = tagValues.keySet().iterator(); it.hasNext();) { String name = it.next(); model.setValueAt(name, row, 0); - model.setValueAt(tagValue.get(name), row, 1); + model.setValueAt(tagValues.get(name), row, 1); row++; } - tableTagValue.setModel(model); + tableTagValues.setModel(model); } - else { - DefaultTableModel model = new DefaultTableModel(columnName, 0); - } } - protected void valueChanged(boolean b){ - save.setEnabled(b); + + protected void valueChanged(boolean b) { setChanged(b); } + ]]> </script> <row> - <cell fill="horizontal" weightx="0.16"> - <Table> - <row> - <cell> - <JLabel text="isisfish.advancedParams.simulatorUse"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JPanel/> - </cell> - </row> - </Table> + <cell fill="horizontal" rows="2"> + <JLabel text="isisfish.advancedParams.simulatorUse"/> </cell> - <cell columns="5" fill="horizontal" weightx="0.84"> - <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/> + <cell columns="4" fill="horizontal"> + <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulatorName()'/> </cell> </row> <row> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal"> <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());'/> </cell> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> + <cell columns="2" fill="horizontal"> <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JLabel text="isisfish.advancedParams.simulLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal" weightx="1.0"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");'/> </cell> </row> <row> - <cell columns="2" fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JLabel text="isisfish.advancedParams.libLevelLogger"/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibInfoLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");'/> </cell> - <cell fill="horizontal" weightx="0.2"> + <cell fill="horizontal"> <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" selected='{getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");valueChanged(true);'/> + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");'/> </cell> </row> <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> + <cell columns="5" fill="both" weighty="1" weightx="1"> + <Table border='{BorderFactory.createTitledBorder(_("isisfish.advancedParams.freeParameters"))}'> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.tag"/> + </cell> + <cell fill="horizontal" weightx="1"> + <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> + </cell> + <cell fill="horizontal"> + <JLabel text="isisfish.common.value"/> + </cell> + <cell fill="horizontal" weightx="1"> + <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="tableTagValues"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> + </cell> + </row> + <row> + <cell columns="5" fill="horizontal"> + <JButton text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValues()'/> + </cell> + </row> + </Table> </cell> </row> - <row> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.tag"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.value"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="tableTagValue"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/> - </cell> - </row> -</Table> \ No newline at end of file +</Table>

1 0

r2879 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 11:32:03 +0000 (Wed, 06 Jan 2010) New Revision: 2879 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Take care about user cancelation and errors. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:17:20 UTC (rev 2878) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:32:03 UTC (rev 2879) @@ -48,6 +48,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -229,16 +230,19 @@ // if user has not choose "cancel" if (equationModelType != null) { - String fileName = JOptionPane - .showInputDialog(_("isisfish.message.new.filename")); - File scriptFile = newScript(equationModelTypePath + fileName, - scriptType); - ScriptTreeModel model = (ScriptTreeModel) scriptUI.getTree().getModel(); - model.fileAdded(scriptFile); - TreePath treePath = model.getTreePathFor(scriptFile); - scriptUI.getTree().setSelectionPath(treePath); + String fileName = JOptionPane.showInputDialog(_("isisfish.message.new.filename")); + // user cancel + if (!StringUtils.isEmpty(fileName)) { + File scriptFile = newScript(equationModelTypePath + fileName, scriptType); + // creation successful + if (scriptFile != null) { + ScriptTreeModel model = (ScriptTreeModel) scriptUI.getTree().getModel(); + model.fileAdded(scriptFile); + TreePath treePath = model.getTreePathFor(scriptFile); + scriptUI.getTree().setSelectionPath(treePath); + } + } } - } /** @@ -247,7 +251,7 @@ * * @param fileName full filename * @param scriptType le type que l'on souhaite Script, Simulator, ou Export. - * @return created file + * @return created file or {@code null} if any error happen */ protected File newScript(String fileName, ScriptMapping scriptType) { @@ -272,16 +276,16 @@ String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } // il y a un sous type à traiter if (pos == fileName.length() - 1) { String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } realFilename = fileName .substring(fileName.lastIndexOf('/') + 1); @@ -293,8 +297,8 @@ if (!realFilename.matches("[A-Z0-9_][a-zA-Z0-9_]*")) { String message = _("isisfish.error.invalid.file.name", fileName); Exception e = new RuntimeException(message); - returnError(_("isisfish.error.script.create", fileName, e - .getMessage()), e); + returnError(_("isisfish.error.script.create", fileName, e.getMessage()), e); + return null; } //TODO do test on category CodeSourceStorage script = null;

1 0

r2878 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 11:17:20 +0000 (Wed, 06 Jan 2010) New Revision: 2878 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Fix no file selection (refresh editor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 10:26:32 UTC (rev 2877) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2010-01-06 11:17:20 UTC (rev 2878) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -404,13 +404,17 @@ loadScript(selectedFile); scriptUI.getEditor().open(selectedFile); // force refresh + scriptUI.getEditor().repaint(); scriptUI.getEditor().validate(); setButton(); } else { scriptUI.getEditor().close(); + // force refresh + scriptUI.getEditor().repaint(); scriptUI.getEditor().validate(); + setButton(); } }

1 0

r2877 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/mexico/export main/java/fr/ifremer/isisfish/ui/input main/java/fr/ifremer/isisfish/ui/sensitivity main/resources test/java/fr/ifremer/isisfish/mexico/export
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2010

Jan. 6, 2010

Author: chatellier Date: 2010-01-06 10:26:32 +0000 (Wed, 06 Jan 2010) New Revision: 2877 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/resources/sensitivity.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java Log: Uncapitalize factor property names. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -84,6 +84,8 @@ @Override public void visit(TopiaEntity e, String name, Class<?> type, Object value) { // si c'est une entitÃ© + + // FIXME only hack about Equation is used instead of Topia visitor if (value instanceof TopiaEntity && !(value instanceof Equation)) { TopiaEntity entity = (TopiaEntity) value; toVisitEntities.add(entity); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -101,8 +101,7 @@ // if there is a "Impl" in entityName, remove it factorClass = factorClass.replaceFirst("Impl", ""); - // FIXME propertyName with capitalize first letter is a bad idea - String factorName = factorClass + "." + StringUtils.capitalize(propertyName); + String factorName = factorClass + "." + propertyName; // test if factor name is enabled // TODO move SensitivityUtils outside of UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,6 +1,6 @@  <Boolean id='sensitivity' javaBean='false'/> - +  <java.lang.String id='buttonTitle' javaBean='""'/> @@ -33,7 +33,7 @@  <jaxx.runtime.swing.BlockingLayerUI id='layerUI' - blockingColor='{new Color(50,50,50)}' /> + blockingColor='{new Color(25,25,25)}' />  <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' @@ -48,14 +48,15 @@ }}' /> <script><![CDATA[ -import fr.ifremer.isisfish.ui.WelcomePanelUI; +import javax.swing.JComponent; import fr.ifremer.isisfish.entities.FisheryRegion; -import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.JComponent; import fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import org.nuiton.topia.persistence.TopiaEntity; +import org.apache.commons.lang.StringUtils; protected ChangeListener tabbedPaneChangeListener; @@ -107,28 +108,34 @@ FisheryRegion fisheryRegion = map.getFisheryRegion(); FisheryRegion regionFromContext = getRegion(); if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) { - log.info("use now " + regionFromContext + " in map " + map); + if (log.isInfoEnabled()) { + log.info("Use now " + regionFromContext + " in map " + map); + } map.setFisheryRegion(regionFromContext); } } - -// TODO this method cause a lot of probleme -// must cast TopiaEntity to impl in inherited UIs... -// 20090602 chatellier : useless method ? cause a lot of cast problem -//public void setBean(TopiaEntity t) {} - public void setLayer(boolean active) { if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entrÃ© existe dans le fichier sensitivity.properties Class classBean = (Class)boxed.getClientProperty("bean"); String method = (String)boxed.getClientProperty("method"); + + // test if factor is enabled boolean isSensitivityFactorEnabled = false; if (classBean != null) { - String sensitivityFactorName = classBean.getSimpleName().replace("Impl", "") + "." + method; + // classBean is defined in property file without "Impl" + String className = classBean.getSimpleName().replace("Impl", ""); + + // ensure that method name is uncapitalized + method = StringUtils.uncapitalize(method); + + String sensitivityFactorName = className + "." + method; isSensitivityFactorEnabled = SensitivityUtils.isSensitivityFactorEnabled(sensitivityFactorName); } + + // install correct layer depending if factor enable if (isSensitivityFactorEnabled) { jaxx.runtime.swing.BlockingLayerUI2 ui = layerUI2.clone(); SwingUtil.getLayer(boxed).setUI(ui); @@ -148,6 +155,10 @@ * @param e l'event initial interseptÃ© par le layer */ protected void accept(ActionEvent e) { + if (log.isDebugEnabled()) { + log.debug("Event intercepted on " + e); + } + JComponent source = (JComponent) e.getSource(); Class classBean = (Class)source.getClientProperty("bean"); String beanID = (String)source.getClientProperty("beanID"); @@ -178,7 +189,7 @@ for (ChangeListener changeListener : tabbedPane.getChangeListeners()) { tabbedPane.removeChangeListener(changeListener); } - + if (tabbedPaneChangeListener == null) { if (isSensitivity()) { tabbedPaneChangeListener = new SensitivityTabbedPaneListener(); @@ -186,7 +197,7 @@ tabbedPaneChangeListener = new InputTabbedPaneListener(); } } - + tabbedPane.addChangeListener(tabbedPaneChangeListener); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -35,7 +35,6 @@ import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -784,7 +783,7 @@ } String topiaId = path.substring(0, path.lastIndexOf('#')); - String property = StringUtils.capitalize(path.substring(path.lastIndexOf('#') + 1)); + String property = path.substring(path.lastIndexOf('#') + 1); Class<?> typeClazz = null; try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -109,7 +109,6 @@ if (log.isDebugEnabled()) { log.debug("Component found is " + component2); } - wizard.initExisting(component2, selectedFactor); wizard.pack(); wizard.setVisible(true); Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,45 +1,44 @@ # this file contains authorized entities factors creation -EffortDescription.CrewFoodCost -EffortDescription.CrewShareRate -EffortDescription.CrewSize -EffortDescription.FishingOperation -EffortDescription.FishingOperationDuration -EffortDescription.FixedCrewSalary -EffortDescription.GearsNumberPerOperation -EffortDescription.LandingCosts -EffortDescription.OtherRunningCost -EffortDescription.RepairAndMaintenanceGearCost -EffortDescription.UnitCostOfFishing -Gear.PossibleValue -Gear.StandardisationFactor -Metier.GearParameterValue -Population.Capturability -PopulationGroup.ReproductionRate -Population.Growth -Population.GrowthReverse -Population.MeanWeight -Population.MonthGapBetweenReproRecrutement -Population.NaturalDeathRate -Population.Price -Population.RecruitmentDistribution -Population.ReproductionEquation -PopulationSeasonInfo.LengthChangeMatrix -PopulationSeasonInfo.MigrationEquation -PopulationSeasonInfo.EmigrationEquation -PopulationSeasonInfo.ImmigrationEquation -SetOfVessels.FixedCosts -SetOfVessels.NumberOfVessels -SetOfVessels.TechnicalEfficiencyEquation -Strategy.InactivityEquation -StrategyMonthInfo.MinInactivityDays -StrategyMonthInfo.ProportionMetier -Strategy.ProportionSetOfVessels -TripType.MinTimeBetweenTrip -TripType.TripDuration -VesselType.ActivityRange -VesselType.Length -VesselType.MaxTripDuration -VesselType.MinCrewSize -VesselType.Speed -VesselType.TripType -VesselType.UnitFuelCostOfTravel \ No newline at end of file +EffortDescription.crewFoodCost +EffortDescription.crewShareRate +EffortDescription.crewSize +EffortDescription.fishingOperation +EffortDescription.fishingOperationDuration +EffortDescription.fixedCrewSalary +EffortDescription.gearsNumberPerOperation +EffortDescription.landingCosts +EffortDescription.otherRunningCost +EffortDescription.repairAndMaintenanceGearCost +EffortDescription.unitCostOfFishing +Gear.possibleValue +Gear.standardisationFactor +Metier.gearParameterValue +Population.capturability +PopulationGroup.reproductionRate +Population.growth +Population.growthReverse +Population.meanWeight +Population.monthGapBetweenReproRecrutement +Population.naturalDeathRate +Population.price +Population.recruitmentDistribution +Population.reproductionEquation +PopulationSeasonInfo.lengthChangeMatrix +PopulationSeasonInfo.migrationEquation +PopulationSeasonInfo.emigrationEquation +PopulationSeasonInfo.immigrationEquation +SetOfVessels.fixedCosts +SetOfVessels.numberOfVessels +SetOfVessels.technicalEfficiencyEquation +Strategy.inactivityEquation +StrategyMonthInfo.minInactivityDays +StrategyMonthInfo.proportionMetier +Strategy.proportionSetOfVessels +TripType.minTimeBetweenTrip +TripType.tripDuration +VesselType.activityRange +VesselType.length +VesselType.maxTripDuration +VesselType.minCrewSize +VesselType.speed +VesselType.unitFuelCostOfTravel \ No newline at end of file Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-01-06 10:15:51 UTC (rev 2876) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2010-01-06 10:26:32 UTC (rev 2877) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009-2010 Ifremer, Code Lutin, Chatellier Eric * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -101,14 +101,14 @@ */ @Test public void testAllEntityPresence() throws TopiaException, StorageException, IOException { - // get region to export + // get region to export RegionStorage regionStorage = RegionStorage.getRegion("Golfe de Gascogne"); TopiaContext context = regionStorage.getStorage().beginTransaction(); FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(context); // export implementation File file = File.createTempFile("xmlexport-", ".xml"); - file.deleteOnExit(); + //file.deleteOnExit(); RegionExportFactorXML xmlFactorExport = new RegionExportFactorXML(file); // explore region (export as xml)

1 0