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

r3541 - trunk/src/test/resources/test-database/simulators
by echatellier＠users.forge.codelutin.com 28 Nov '11

28 Nov '11

Author: echatellier Date: 2011-11-28 10:47:12 +0100 (Mon, 28 Nov 2011) New Revision: 3541 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3541 Log: Fix test compilation Modified: trunk/src/test/resources/test-database/simulators/DefaultSimulator.java Modified: trunk/src/test/resources/test-database/simulators/DefaultSimulator.java =================================================================== --- trunk/src/test/resources/test-database/simulators/DefaultSimulator.java 2011-11-28 09:39:19 UTC (rev 3540) +++ trunk/src/test/resources/test-database/simulators/DefaultSimulator.java 2011-11-28 09:47:12 UTC (rev 3541) @@ -80,7 +80,7 @@ SimulationControl control = context.getSimulationControl(); int lastYear = param.getNumberOfYear(); int lastStep = lastYear * Month.NUMBER_OF_MONTH; - TimeStep step = control.getTimeStep(); + TimeStep step = control.getStep(); ResultManager resManager = context.getResultManager(); TopiaContext db = context.getDB(); @@ -132,7 +132,7 @@ break; } - control.setTimeStep(step); + control.setStep(step); control.setProgress(step.getStep()); control.setText(_("begin step " + step));

1 0

r3540 - trunk
by echatellier＠users.forge.codelutin.com 28 Nov '11

28 Nov '11

Author: echatellier Date: 2011-11-28 10:39:19 +0100 (Mon, 28 Nov 2011) New Revision: 3540 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3540 Log: Update nuiton-matrix (with relocated jfreechart) and h2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-25 16:42:01 UTC (rev 3539) +++ trunk/pom.xml 2011-11-28 09:39:19 UTC (rev 3540) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> @@ -272,7 +272,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.161</version> + <version>1.3.162</version> <scope>compile</scope> </dependency>

1 0

r3539 - in trunk/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/datastore/migration main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/ui/input main/java/fr/ifremer/isisfish/ui/input/tree test/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 25 Nov '11

25 Nov '11

Author: echatellier Date: 2011-11-25 17:42:01 +0100 (Fri, 25 Nov 2011) New Revision: 3539 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3539 Log: Add automatic migration of equations Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -450,10 +450,6 @@ tx.commitTransaction(); tx.closeContext(); } - - // storage need to be closed, to perform - // topia migration in next call - result.closeStorage(); } // add storage modification event Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -29,6 +29,7 @@ import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; @@ -92,25 +93,42 @@ // start equation migration List<Equation> equations = tx.find("from " + Equation.class.getName()); for (Equation equation : equations) { - int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); + + // empty is empty and stay empty + if (StringUtils.isBlank(equation.getContent())) { + continue; + } + + // first compilation + String content = equation.getContent(); + int ok = EvaluatorHelper.check(equation.getJavaInterface(), content, null); if (ok != 0) { - EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle(_("isisfish.message.import.equation.convert")); - - try { - frame.setEquation(equation.getCategory(), equation.getName(), - equation.getJavaInterface(), equation.getContent()); - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Can't migrate equation", ex); + content = StringUtils.replace(content, "Date ", "TimeStep "); + content = StringUtils.replace(content, ".getDate()", ".getStep()"); + // second compilation + ok = EvaluatorHelper.check(equation.getJavaInterface(), content, null); + if (ok == 0) { + equation.setContent(content); + equation.update(); + } else { + EquationEditorPaneUI frame = new EquationEditorPaneUI(); + frame.setTitle(_("isisfish.message.import.equation.convert")); + + try { + frame.setEquation(equation.getCategory(), equation.getName(), + equation.getJavaInterface(), content); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't migrate equation", ex); + } } + + frame.setVisible(true); + if (frame.isResultOk()) { + equation.setContent(frame.getEditor().getText()); + equation.update(); + } } - - frame.setVisible(true); - if (frame.isResultOk()) { - equation.setContent(frame.getEditor().getText()); - equation.update(); - } } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -121,7 +121,8 @@ return simulation; } - public void addPropertyChangeListener(String propName, PropertyChangeListener l) { + public void addPropertyChangeListener(String propName, + PropertyChangeListener l) { listeners.addPropertyChangeListener(propName, l); } @@ -281,7 +282,7 @@ * * @return donne la date utiliser par la simulation */ - public TimeStep getTimeStep() { + public TimeStep getStep() { return step; } @@ -290,7 +291,7 @@ * * @param t la nouvelle etape */ - public void setTimeStep(TimeStep t) { + public void setStep(TimeStep t) { int oldValue = 0; if (this.step != null) { oldValue = this.step.getStep(); @@ -351,9 +352,9 @@ setStopSimulationRequest(stop); } if (props.containsKey("step")) { - TimeStep step = new TimeStep(Integer - .parseInt(props.getProperty("step"))); - setTimeStep(step); + TimeStep step = new TimeStep(Integer.parseInt(props + .getProperty("step"))); + setStep(step); } if (props.containsKey("progressMax")) { long progressMax = Long.parseLong(props Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -129,7 +129,7 @@ // WARNING: make sure to not open Region before being in simulation context // add missing control informations SimulationParameter param = simulation.getParameter(); - control.setTimeStep(new TimeStep()); + control.setStep(new TimeStep()); control.setProgress(0); control.setStarted(true); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -227,7 +227,7 @@ + ", " + "control.getProgress() = " + control.getProgress() + ", " + "control.getProgressMax() = " + control.getProgressMax() + ", " + "control.getDate() = " - + control.getTimeStep()); + + control.getStep()); } switch (columnIndex) { @@ -266,7 +266,7 @@ pb.setValue((int) control.getProgress()); // progress can be used for other things - TimeStep step = control.getTimeStep(); + TimeStep step = control.getStep(); if (step != null) { pb.setString(step.getMonth() + "/" + step.getYear()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -162,6 +162,7 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); fisheryTreeHelper.setDataProvider(dataProvider); TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); + inputUI.getFisheryRegionTree().setCellRenderer(null); // fix region opening after import inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); @@ -176,7 +177,7 @@ inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(),"normale"); - // autoselect roto node (fire some event) + // autoselect root node (fire some event) fisheryTreeHelper.selectNode((FisheryTreeNode)fisheryTreeModel.getRoot()); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -47,7 +47,7 @@ /** * Get provider fishery region. * - * @return provide fichery region + * @return provide fishery region */ public FisheryRegion getFisheryRegion() { return fisheryRegion; Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2011-11-22 14:46:53 UTC (rev 3538) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2011-11-25 16:42:01 UTC (rev 3539) @@ -92,7 +92,7 @@ // lancement de la simulation SimulationControl control = new SimulationControl(sim.getName()); - control.setTimeStep(new TimeStep()); + control.setStep(new TimeStep()); InProcessSimulatorLauncher launcher = new InProcessSimulatorLauncher(); sim = launcher.localSimulate(control, sim);

1 0

r3538 - in trunk/src/main/java/fr/ifremer/isisfish/ui: result widget
by echatellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: echatellier Date: 2011-11-22 15:46:53 +0100 (Tue, 22 Nov 2011) New Revision: 3538 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3538 Log: Fix binding Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:46:53 UTC (rev 3538) @@ -37,21 +37,19 @@ <JLabel text="isisfish.result.choose.simulation"/> </cell> <cell fill="horizontal" weightx="1"> - <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox"/> + <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox" + onActionPerformed="openButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);removeButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);logButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);"/> </cell> <cell> - <JButton text="isisfish.result.new.window" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="openButton" text="isisfish.result.new.window" onActionPerformed="getHandler().openNewSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.remove.simulation" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="removeButton" text="isisfish.result.remove.simulation" onActionPerformed="getHandler().deleteSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.show.simulation.log" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="logButton" text="isisfish.result.show.simulation.log" onActionPerformed="getHandler().showLog(this)"/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:46:53 UTC (rev 3538) @@ -33,6 +33,7 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -70,13 +71,11 @@ protected FilterComboBoxModel filterModel; protected List<ActionListener> actionListeners; - protected List<ItemListener> itemListeners; protected boolean filtering = false; public FilterableComboBox() { actionListeners = new ArrayList<ActionListener>(); - itemListeners = new ArrayList<ItemListener>(); buildLayout(); } @@ -178,20 +177,6 @@ } } } - - class ComboBoxItemListener implements ItemListener { - /* - * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) - */ - @Override - public void itemStateChanged(ItemEvent e) { - if (!filtering) { - for (ItemListener i : itemListeners) { - i.itemStateChanged(e); - } - } - } - } /** * Build layout. @@ -199,7 +184,6 @@ private void buildLayout() { dataBox = new JXComboBox(); dataBox.addActionListener(new ComboBoxActionListener()); - dataBox.addItemListener(new ComboBoxItemListener()); filterField = new JXTextField(_("isisfish.common.filter")); // fix size filterField.setPreferredSize(new Dimension(200, 0)); @@ -242,12 +226,4 @@ public boolean removeActionListener(ActionListener o) { return actionListeners.remove(o); } - - public boolean addItemListener(ItemListener e) { - return itemListeners.add(e); - } - - public boolean removeItemListener(ItemListener o) { - return itemListeners.remove(o); - } } \ No newline at end of file

1 0

r3537 - in trunk/src/main: java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: echatellier Date: 2011-11-22 15:00:17 +0100 (Tue, 22 Nov 2011) New Revision: 3537 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3537 Log: #517 : Ajouter un filtrage des simulations plus simple (seulement par le nom) Added: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-22 14:00:17 UTC (rev 3537) @@ -109,7 +109,7 @@ protected void initSimulationList(ResultUI resultUI) { java.util.List<String> value = SimulationStorage.getSimulationNames(); - resultUI.getSimulationComboBox().setEditable(false); + //resultUI.getSimulationComboBox().setEditable(false); StringComboModel model = new StringComboModel(value); resultUI.getSimulationComboBox().setModel(model); resultUI.getSimulationComboBox().setSelectedItem(null); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) @@ -37,7 +37,7 @@ <JLabel text="isisfish.result.choose.simulation"/> </cell> <cell fill="horizontal" weightx="1"> - <JComboBox id="simulationComboBox"/> + <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox"/> </cell> <cell> <JButton text="isisfish.result.new.window" Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) @@ -31,33 +31,34 @@ <import> java.util.EventObject; java.text.ParseException; - fr.ifremer.isisfish.datastore.RegionStorage; - fr.ifremer.isisfish.datastore.StorageChangeEvent; - fr.ifremer.isisfish.datastore.StorageChangeListener; - fr.ifremer.isisfish.datastore.StorageException; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.Strategy; - fr.ifremer.isisfish.entities.FisheryRegion; - fr.ifremer.isisfish.ui.SimulationUI; - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.WelcomeTabUI; - fr.ifremer.isisfish.ui.models.common.StringComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; - fr.ifremer.isisfish.ui.models.rule.RuleListModel; - fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; - fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; - fr.ifremer.isisfish.rule.Rule; - fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; - fr.ifremer.isisfish.simulator.launcher.SimulationService; - fr.ifremer.isisfish.simulator.launcher.SimulationJob; - fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - fr.ifremer.isisfish.simulator.sensitivity.Factor; - org.nuiton.topia.TopiaException; - org.nuiton.topia.TopiaContext; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEditor; - org.apache.commons.lang3.ArrayUtils; + fr.ifremer.isisfish.datastore.RegionStorage + fr.ifremer.isisfish.datastore.StorageChangeEvent + fr.ifremer.isisfish.datastore.StorageChangeListener + fr.ifremer.isisfish.datastore.StorageException + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.entities.Strategy + fr.ifremer.isisfish.entities.FisheryRegion + fr.ifremer.isisfish.ui.SimulationUI + fr.ifremer.isisfish.ui.WelcomePanelUI + fr.ifremer.isisfish.ui.WelcomeTabUI + fr.ifremer.isisfish.ui.models.common.StringComboModel + fr.ifremer.isisfish.ui.models.rule.RuleComboModel + fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer + fr.ifremer.isisfish.ui.models.rule.RuleListModel + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI + fr.ifremer.isisfish.ui.sensitivity.SensitivityUI + fr.ifremer.isisfish.ui.widget.FilterableComboBox + fr.ifremer.isisfish.rule.Rule + fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher + fr.ifremer.isisfish.simulator.launcher.SimulationService + fr.ifremer.isisfish.simulator.launcher.SimulationJob + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener + fr.ifremer.isisfish.simulator.sensitivity.Factor + org.nuiton.topia.TopiaException + org.nuiton.topia.TopiaContext + org.nuiton.math.matrix.MatrixND + org.nuiton.math.matrix.gui.MatrixPanelEditor + org.apache.commons.lang3.ArrayUtils javax.swing.SwingUtilities javax.swing.DefaultComboBoxModel java.awt.CardLayout @@ -329,20 +330,10 @@ <JLabel text="isisfish.params.loadOldSimulation" /> </cell> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsSelect" + <FilterableComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()' /> </cell> - <cell> - <JButton text="isisfish.params.filter" - id="buttonSimulParamsSelectFilter" - onActionPerformed='selectFilter()' enabled="false" /> - </cell> - <cell> - <JButton text="isisfish.params.clearFilter" - id="buttonSimulParamsSelectClearFilter" - onActionPerformed='resetFilter()' enabled="false" /> - </cell> </row> </Table> </cell> Added: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:00:17 UTC (rev 3537) @@ -0,0 +1,253 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.widget; + +import static org.nuiton.i18n.I18n._; + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import org.jdesktop.swingx.JXComboBox; +import org.jdesktop.swingx.JXTextField; +import org.nuiton.util.Resource; + +/** + * A filterable combobox using an additional text field and reset button. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FilterableComboBox extends JPanel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6669320998140538372L; + + protected JComboBox dataBox; + protected JTextField filterField; + protected JButton resetButton; + + protected FilterComboBoxModel filterModel; + + protected List<ActionListener> actionListeners; + protected List<ItemListener> itemListeners; + + protected boolean filtering = false; + + public FilterableComboBox() { + actionListeners = new ArrayList<ActionListener>(); + itemListeners = new ArrayList<ItemListener>(); + buildLayout(); + } + + public FilterableComboBox(ComboBoxModel model) { + this(); + setModel(model); + } + + class FilterComboBoxModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6256289874593024153L; + + protected ComboBoxModel model; + + public FilterComboBoxModel(ComboBoxModel model) { + this.model = model; + } + + @Override + public int getSize() { + int delegateSize = model.getSize(); + int realSize = 0; + for (int i = 0; i < delegateSize; ++i) { + if (model.getElementAt(i).toString().matches(".*" + filterField.getText() + ".*")) { + realSize++; + } + } + return realSize; + } + + @Override + public Object getElementAt(int index) { + int delegateSize = model.getSize(); + int realIndex = -1; + for (int i = 0; i < delegateSize; ++i) { + Object element = model.getElementAt(i); + if (element.toString().matches(".*" + filterField.getText() + ".*")) { + realIndex++; + } + if (index == realIndex) { + return element; + } + } + return null; + } + + public void fireDataChanged() { + filtering = true; + super.fireContentsChanged(this, 0, model.getSize()); + filtering = false; + } + + + } + + class FilterDocumentListener implements DocumentListener { + @Override + public void insertUpdate(DocumentEvent e) { + updateFilter(); + } + + @Override + public void removeUpdate(DocumentEvent e) { + updateFilter(); + } + + @Override + public void changedUpdate(DocumentEvent e) { + updateFilter(); + } + + protected void updateFilter() { + ((FilterComboBoxModel)dataBox.getModel()).fireDataChanged(); + resetButton.setEnabled(!filterField.getText().isEmpty()); + } + } + + class FilterActionListener implements ActionListener { + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + filterField.setText(""); + } + } + + class ComboBoxActionListener implements ActionListener { + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + if (!filtering) { + for (ActionListener a : actionListeners) { + a.actionPerformed(e); + } + } + } + } + + class ComboBoxItemListener implements ItemListener { + /* + * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) + */ + @Override + public void itemStateChanged(ItemEvent e) { + if (!filtering) { + for (ItemListener i : itemListeners) { + i.itemStateChanged(e); + } + } + } + } + + /** + * Build layout. + */ + private void buildLayout() { + dataBox = new JXComboBox(); + dataBox.addActionListener(new ComboBoxActionListener()); + dataBox.addItemListener(new ComboBoxItemListener()); + filterField = new JXTextField(_("isisfish.common.filter")); + // fix size + filterField.setPreferredSize(new Dimension(200, 0)); + resetButton = new JButton(Resource.getIcon("/icons/cancel.png")); + resetButton.addActionListener(new FilterActionListener()); + resetButton.setEnabled(false); + filterField.getDocument().addDocumentListener(new FilterDocumentListener()); + + setLayout(new BorderLayout()); + add(dataBox, BorderLayout.CENTER); + + JPanel filterPanel = new JPanel(new BorderLayout()); + filterPanel.add(filterField, BorderLayout.CENTER); + filterPanel.add(resetButton, BorderLayout.EAST); + + add(filterPanel, BorderLayout.EAST); + } + + /** + * Change model. + * + * @param model model to set + */ + public void setModel(ComboBoxModel model) { + dataBox.setModel(new FilterComboBoxModel(model)); + } + + public Object getSelectedItem() { + return dataBox.getSelectedItem(); + } + + public void setSelectedItem(Object object) { + dataBox.setSelectedItem(object); + } + + public boolean addActionListener(ActionListener e) { + return actionListeners.add(e); + } + + public boolean removeActionListener(ActionListener o) { + return actionListeners.remove(o); + } + + public boolean addItemListener(ItemListener e) { + return itemListeners.add(e); + } + + public boolean removeItemListener(ItemListener o) { + return itemListeners.remove(o); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-22 14:00:17 UTC (rev 3537) @@ -99,6 +99,7 @@ isisfish.common.equation=Equation isisfish.common.error=error isisfish.common.file=File +isisfish.common.filter=Filter isisfish.common.finish=Finish isisfish.common.gear=Gear isisfish.common.immigration=immigration Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-22 14:00:17 UTC (rev 3537) @@ -99,6 +99,7 @@ isisfish.common.equation=Equation isisfish.common.error=Erreur isisfish.common.file=Fichier +isisfish.common.filter=Filtrer isisfish.common.finish=Terminer isisfish.common.gear=Engin isisfish.common.immigration=immigration

1 0

r3536 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 16:30:51 +0100 (Mon, 21 Nov 2011) New Revision: 3536 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3536 Log: Fix community script creation Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-11-21 10:41:34 UTC (rev 3535) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-11-21 15:30:51 UTC (rev 3536) @@ -291,7 +291,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName); + script = SimulationPlanStorage.getCommunitySimulationPlan(fileName); break; case CommunityExport: script = ExportStorage.getCommunityExport(fileName);

1 0

r3535 - trunk
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:41:34 +0100 (Mon, 21 Nov 2011) New Revision: 3535 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3535 Log: Prepare release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-21 10:21:00 UTC (rev 3534) +++ trunk/pom.xml 2011-11-21 10:41:34 UTC (rev 3535) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-3-SNAPSHOT</version> + <version>4.0.0.0-SNAPSHOT</version>  <dependencies>

1 0

r3534 - trunk/src/main/java/fr/ifremer/isisfish/ui/config
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:21:00 +0100 (Mon, 21 Nov 2011) New Revision: 3534 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3534 Log: Add log.warn Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:19:40 UTC (rev 3533) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:21:00 UTC (rev 3534) @@ -33,7 +33,8 @@ import javax.swing.JOptionPane; import org.apache.commons.lang3.StringUtils; -import org.jfree.util.Log; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -49,6 +50,8 @@ */ public class RConfigHandler { + private static Log log = LogFactory.getLog(RConfigHandler.class); + /** * Initialise l'ui. * @@ -96,8 +99,8 @@ engine.eval("library('lhs')"); } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find 'lhs'", ex); + if (log.isWarnEnabled()) { + log.warn("Can find 'lhs'", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); @@ -107,8 +110,8 @@ engine.eval("library('sensitivity')"); } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find 'sensitivity'", ex); + if (log.isWarnEnabled()) { + log.warn("Can find 'sensitivity'", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); @@ -121,8 +124,8 @@ } } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find call R", ex); + if (log.isWarnEnabled()) { + log.warn("Can find call R", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE);

1 0

r3533 - trunk/src/main/java/fr/ifremer/isisfish/ui/config
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:19:40 +0100 (Mon, 21 Nov 2011) New Revision: 3533 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3533 Log: Add log.warn Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-18 16:01:14 UTC (rev 3532) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:19:40 UTC (rev 3533) @@ -33,6 +33,7 @@ import javax.swing.JOptionPane; import org.apache.commons.lang3.StringUtils; +import org.jfree.util.Log; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -95,6 +96,9 @@ engine.eval("library('lhs')"); } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find 'lhs'", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; @@ -103,6 +107,9 @@ engine.eval("library('sensitivity')"); } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find 'sensitivity'", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; @@ -114,6 +121,9 @@ } } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find call R", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); }

1 0

r3532 - trunk
by echatellier＠users.forge.codelutin.com 18 Nov '11

18 Nov '11

Author: echatellier Date: 2011-11-18 17:01:14 +0100 (Fri, 18 Nov 2011) New Revision: 3532 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3532 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 16:01:10 UTC (rev 3531) +++ trunk/pom.xml 2011-11-18 16:01:14 UTC (rev 3532) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-2</version> + <version>4.0.0.0-beta-3-SNAPSHOT</version>  <dependencies> @@ -709,9 +709,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0-beta-2</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0