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

r2976 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 Feb '10

04 Feb '10

Author: chatellier Date: 2010-02-04 11:23:18 +0000 (Thu, 04 Feb 2010) New Revision: 2976 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update translations Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 10:50:54 UTC (rev 2975) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-04 11:23:18 UTC (rev 2976) @@ -664,6 +664,7 @@ isisfish.params.description=Description isisfish.params.filter=Filter isisfish.params.loadOldSimulation=Load old simulation +isisfish.params.nopopulation=No selected population isisfish.params.numberYear=Number of year isisfish.params.populationEffectives=%s's effectives isisfish.params.rules=Rules @@ -901,6 +902,7 @@ isisfish.sensitivity.firstValue=First value isisfish.sensitivity.increment=Cardinality isisfish.sensitivity.lastValue=Last value +isisfish.sensitivity.methodfactornotsupported=The selected sensitivity method handles factors cardinalities isisfish.sensitivity.name=Factor name isisfish.sensitivity.operator=Operator isisfish.sensitivity.secondpass=Analyze results @@ -910,7 +912,7 @@ isisfish.sensitivity.title=Sensitivity analysis isisfish.sensitivity.validDiscretNumber=Ok isisfish.sensitivity.value=Value -isisfish.sensitivityChooser.title=Sensitivities input +isisfish.sensitivityChooser.title=Sensitivity method isisfish.server.ssh.generateKey.title=Generate Ssh key isisfish.setOfVessels.comments=Comments isisfish.setOfVessels.fixedCosts=Fixed costs Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 10:50:54 UTC (rev 2975) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-04 11:23:18 UTC (rev 2976) @@ -664,6 +664,7 @@ isisfish.params.description=Description isisfish.params.filter=Filtrer isisfish.params.loadOldSimulation=Charger une ancienne simulation +isisfish.params.nopopulation=Aucune population s\u00E9lectionn\u00E9e isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.populationEffectives=Effectifs %s isisfish.params.rules=R\u00E8gles @@ -901,6 +902,7 @@ isisfish.sensitivity.firstValue=Premi\u00E8re valeur isisfish.sensitivity.increment=Cardinalit\u00E9 isisfish.sensitivity.lastValue=Derni\u00E8re valeur +isisfish.sensitivity.methodfactornotsupported=La m\u00e9thode de sensibilit\u00e9 choisie g\u00e8re les cardinalit\u00e9s des facteurs isisfish.sensitivity.name=Nom du facteur isisfish.sensitivity.operator=Op\u00E9rateur isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats

1 0

r2975 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 04 Feb '10

04 Feb '10

Author: chatellier Date: 2010-02-04 10:50:54 +0000 (Thu, 04 Feb 2010) New Revision: 2975 Modified: isis-fish/branches/3.3.1/changelog.txt Log: Update changelog Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2010-02-02 16:52:49 UTC (rev 2974) +++ isis-fish/branches/3.3.1/changelog.txt 2010-02-04 10:50:54 UTC (rev 2975) @@ -1,5 +1,22 @@ -isis-fish (3.3.0.0) stable; urgency=low +isis-fish (3.3.1.0-rc1) stable; urgency=low + * Improve UI to enable some fields/tabs only after region loading + * Enable to put population effectives into factors + * Enable to put rules into factor + * Add group screening features + * Modify parameters interface to prepare factorizable values (population/rule) + * Factor, DesignPlan, Scenario and Domain are no longer generics + + -- jeu. févr. 4 11:48:12 CET 2010 + +isis-fish (3.3.0.0-rc2) stable; urgency=low + + * Disable all list filtering functionalities (don't work anymore with a lot of simulations) + + -- jeu. janv. 28 18:51:17 CET 2010 + +isis-fish (3.3.0.0-rc1) stable; urgency=low + * Enable to add factors from tables (target factor equation, selectivity equation) * Restore simulation control auto save features (usefull for remote simulation monitoring) * Make all data storage isolated on simulation directory during a simulation @@ -32,7 +49,7 @@ * Add ".shp" extension to database map files list (database migration) * Move codelutin librairies to nuiton.org (database migration) - -- mar. oct. 13 09:48:15 CEST 2009 + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.2.0.10) stable; urgency=high

1 0

r2974 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 16:52:49 +0000 (Tue, 02 Feb 2010) New Revision: 2974 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Cleanup unused properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:34:22 UTC (rev 2973) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:52:49 UTC (rev 2974) @@ -124,7 +124,6 @@ isisfish.common.region=Region isisfish.common.remove=Remove isisfish.common.reset=Reset -isisfish.common.rules=Rules isisfish.common.save=Save isisfish.common.saveModel=Save as model isisfish.common.saveNextSimulation=Save for next simulation @@ -667,11 +666,8 @@ isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year isisfish.params.populationEffectives=%s's effectives -isisfish.params.populationNumbers=Population numbers input -isisfish.params.populations=Populations -isisfish.params.ruleParameters=Rule's parameters isisfish.params.rules=Rules -isisfish.params.rules.availables=Avalilables rules +isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name isisfish.params.simulationLauncher=Simulation launcher Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:34:22 UTC (rev 2973) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:52:49 UTC (rev 2974) @@ -124,7 +124,6 @@ isisfish.common.region=R\u00E9gion isisfish.common.remove=Supprimer isisfish.common.reset=R\u00E9initialiser -isisfish.common.rules=R\u00E8gles isisfish.common.save=Sauver isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation @@ -667,8 +666,6 @@ isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.populationEffectives=Effectifs %s -isisfish.params.populationNumbers=Donn\u00E9es de population -isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles isisfish.params.rules=R\u00E8gles isisfish.params.rules.availables=R\u00E8gles disponibles isisfish.params.rules.selected=R\u00E8gles s\u00E9lectionn\u00E9es

1 0

r2973 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 16:34:22 +0000 (Tue, 02 Feb 2010) New Revision: 2973 Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update translation (population effectives and rule factors) Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 14:56:45 UTC (rev 2972) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2010-02-02 16:34:22 UTC (rev 2973) @@ -664,13 +664,19 @@ isisfish.params.clearFilter=Clear filter isisfish.params.description=Description isisfish.params.filter=Filter -isisfish.params.lblLauncher=Simulation launcher isisfish.params.loadOldSimulation=Load old simulation isisfish.params.numberYear=Number of year +isisfish.params.populationEffectives=%s's effectives isisfish.params.populationNumbers=Population numbers input +isisfish.params.populations=Populations isisfish.params.ruleParameters=Rule's parameters +isisfish.params.rules=Rules +isisfish.params.rules.availables=Avalilables rules +isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name +isisfish.params.simulationLauncher=Simulation launcher isisfish.params.simulationName=Simulation name +isisfish.params.stategiesAndPopulations=Stategies and populations isisfish.params.title=Parameters isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 14:56:45 UTC (rev 2972) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-02-02 16:34:22 UTC (rev 2973) @@ -664,13 +664,18 @@ isisfish.params.clearFilter=Remise \u00E0 z\u00E9ro du filtre isisfish.params.description=Description isisfish.params.filter=Filtrer -isisfish.params.lblLauncher=Lanceur de simulation isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es +isisfish.params.populationEffectives=Effectifs %s isisfish.params.populationNumbers=Donn\u00E9es de population isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles +isisfish.params.rules=R\u00E8gles +isisfish.params.rules.availables=R\u00E8gles disponibles +isisfish.params.rules.selected=R\u00E8gles s\u00E9lectionn\u00E9es isisfish.params.sensitivityName=Nom de l'analyse de sensibilit\u00E9 +isisfish.params.simulationLauncher=Lanceur de simulation isisfish.params.simulationName=Nom de la simulation +isisfish.params.stategiesAndPopulations=Strat\u00E9gies et populations isisfish.params.title=Param\u00E8tres isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %1$s

1 0

r2972 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 14:56:45 +0000 (Tue, 02 Feb 2010) New Revision: 2972 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java Log: Make all method deprecated (replaced by their storage equivalent) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:59:29 UTC (rev 2971) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 14:56:45 UTC (rev 2972) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * Copyright (C) 2006 - 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 @@ -27,13 +27,14 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationProperties; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** - * Welcome.java + * Common class containing static method to get some list (region, simulations...). * * Created: 22 août 2006 10:50:49 * @@ -54,6 +55,8 @@ * Return regions. * * @return regions + * + * @deprecated since 3.3.1.0, use {@link RegionStorage#getRegionNames()} instead */ public static Object[] getRegionItem() { List<String> regionNames = new ArrayList<String>(); @@ -71,6 +74,8 @@ * Return old simulations. * * @return old simulations + * + * @deprecated since 3.3.1.0, use {@link SimulationStorage#getSimulationNames()} instead */ public static Object[] getOldSimulationItem() { @@ -103,5 +108,22 @@ } return null; } + + /** + * Return list with all available rules names. + * + * @return list with all available rules names + * + * @deprecated since 3.3.1.0, use {@link RuleStorage#getRuleNames()} instead + */ + public static List<String> getAvailablesRuleNames() { + List<String> result = new ArrayList<String>(); + for (String ruleName : RuleStorage.getRuleNames()) { + // TODO remove last .java + String shortRuleName = ruleName.substring(0, ruleName.length() - 5); + result.add(shortRuleName); + } + return result; + } }

1 0

r2971 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:59:29 +0000 (Tue, 02 Feb 2010) New Revision: 2971 Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java Log: Remove unused class Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java 2010-02-02 10:06:41 UTC (rev 2970) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizard.java 2010-02-02 10:59:29 UTC (rev 2971) @@ -1,67 +0,0 @@ -/* *##% - * Copyright (C) 2002, 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.simulator; - -import javax.swing.JButton; -import javax.swing.JTabbedPane; - -/** - * SensWizard. - * - * Created: 14 nov. 2005 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - * - * @deprecated on 20080223 seams to be unused - */ -public class SensWizard { - - /** - * Methode appelee à lors du passage d'une fenetre a une autre dans le - * wizard - * @return l'index de la tab a selectionner - */ - public static int newTab(JButton prev, JButton next, JButton finish, - JTabbedPane tabPane) { - // La direction du changement de tab (+1, -1) - //int step = ((Integer)currentContext.getData("_step")).intValue(); - // La nouvelle tab sélectionnée par l'utilisateur - int tab = tabPane.getSelectedIndex(); - if (tab > 0) { - prev.setEnabled(true); - } else { - prev.setEnabled(false); - } - // Active/desactive les boutons next et finish - if (tab == tabPane.getTabCount() - 1) { - next.setEnabled(false); - finish.setEnabled(true); - } else { - next.setEnabled(true); - finish.setEnabled(false); - } - return tab; - } - -} //SensWizard

1 0

r2970 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:06:41 +0000 (Tue, 02 Feb 2010) New Revision: 2970 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Also disable reset button 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-02-02 10:04:26 UTC (rev 2969) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:06:41 UTC (rev 2970) @@ -407,7 +407,7 @@ <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> - <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()' enabled="false"/> </cell> </row> </Table>

1 0

r2969 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/ui/result src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:04:26 +0000 (Tue, 02 Feb 2010) New Revision: 2969 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Remove all filtering functionalities (too long). Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/changelog.txt 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,7 @@ isis-fish (3.3.0.0-rc2) stable; urgency=low + * Disable all list filtering functionalities (don't work anymore with a lot of simulations) + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * Copyright (C) 2006 - 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 @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.ui; -import java.io.IOException; -import java.text.ParseException; import java.util.ArrayList; import java.util.List; @@ -28,9 +26,6 @@ import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.SimulationProperties; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; -import fr.ifremer.isisfish.ui.widget.filter.FilterModel; /** * Welcome.java @@ -74,17 +69,21 @@ */ public static Object[] getOldSimulationItem() { - try { + //try { List<String> oldSimul = new ArrayList<String>(); - FilterModel<SimulationProperties, String> filterModel; + //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) oldSimul.addAll(SimulationStorage.getSimulationNames()); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(oldSimul); + //filterModel = SimulationFilterUtil.createFilterModel(oldSimul); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); Object[] result = oldSimul.toArray(); // FIXME chatellier : Ajout d'une entrée vide pour forcer la sélection @@ -92,7 +91,7 @@ oldSimul.add(0, " "); return result; - } catch (ParseException ex) { + /*} catch (ParseException ex) { if (log.isErrorEnabled()) { log.error("Can't get old simulations", ex); } @@ -101,7 +100,7 @@ log.error("Can't get old simulations", ex); } } - return null; + return null;*/ } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -39,6 +39,9 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; + /* + * FIXME this code reload ALL simulation (too long) + */ SimulationServiceListener listener = new SimulationServiceListener() { @Override @@ -78,11 +81,15 @@ private void initSimulation() throws IOException, ParseException { // keep in context list of old simulation names (for filter process) java.util.List<String> value = SimulationStorage.getSimulationNames(); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(value); + //filterModel = SimulationFilterUtil.createFilterModel(value); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); getSimulation().setEditable(false); model = new DefaultComboBoxModel(value.toArray()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2010-02-02 10:04:26 UTC (rev 2969) @@ -358,6 +358,9 @@ JButton result = new JButton(_("isisfish.filter"), icon); + // TODO disabled, filtering is too long + result.setEnabled(false); + result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); 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-02-02 10:03:53 UTC (rev 2968) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2010-02-02 10:04:26 UTC (rev 2969) @@ -404,7 +404,7 @@ <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> - <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/>

1 0

r2968 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Feb '10

02 Feb '10

Author: chatellier Date: 2010-02-02 10:03:53 +0000 (Tue, 02 Feb 2010) New Revision: 2968 Modified: isis-fish/trunk/pom.xml Log: Restore integrations tests Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-02-01 14:45:26 UTC (rev 2967) +++ isis-fish/trunk/pom.xml 2010-02-02 10:03:53 UTC (rev 2968) @@ -504,7 +504,7 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> -  + </executions> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r2967 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 01 Feb '10

01 Feb '10

Author: chatellier Date: 2010-02-01 14:45:26 +0000 (Mon, 01 Feb 2010) New Revision: 2967 Modified: isis-fish/branches/3.3.1/pom.xml Log: Update h2 Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2010-01-28 17:53:17 UTC (rev 2966) +++ isis-fish/branches/3.3.1/pom.xml 2010-02-01 14:45:26 UTC (rev 2967) @@ -218,7 +218,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> + <version>1.2.128</version> <scope>compile</scope> </dependency>

1 0