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

r3548 - in trunk/src/main: java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com Nov. 30, 2011

Nov. 30, 2011

Author: echatellier Date: 2011-11-30 15:38:44 +0100 (Wed, 30 Nov 2011) New Revision: 3548 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3548 Log: Reduce button texts Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 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/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 14:38:44 UTC (rev 3548) @@ -29,9 +29,6 @@ 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.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 14:38:44 UTC (rev 3548) @@ -755,13 +755,13 @@ isisfish.queue.stopSimulation=Stop simulation isisfish.queue.title=Queue isisfish.result.begin.simulation=Simulation start \: -isisfish.result.choose.simulation=Choose a Simulation +isisfish.result.choose.simulation=Simulation \: isisfish.result.end.simulation=Simuation end \: isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.map=Map -isisfish.result.new.window=Open a new window -isisfish.result.remove.simulation=Remove simulation +isisfish.result.new.window=Open +isisfish.result.remove.simulation=Remove isisfish.result.selectResult=Result \: isisfish.result.show.simulation.log=Show logs isisfish.result.summary=Summary Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:16 UTC (rev 3547) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 14:38:44 UTC (rev 3548) @@ -755,13 +755,13 @@ isisfish.queue.stopSimulation=Arrêter la simulation isisfish.queue.title=Queue isisfish.result.begin.simulation=En début de simulation \: -isisfish.result.choose.simulation=Choisir une simulation +isisfish.result.choose.simulation=Simulation \: isisfish.result.end.simulation=En fin de Simulation\: isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.map=Carte -isisfish.result.new.window=Ouvrir une nouvelle fenêtre -isisfish.result.remove.simulation=Supprimer Simulation +isisfish.result.new.window=Ouvrir +isisfish.result.remove.simulation=Supprimer isisfish.result.selectResult=Résultat \: isisfish.result.show.simulation.log=Voir les logs isisfish.result.summary=Résumé

1 0

r3547 - in trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui resources/i18n
by echatellier＠users.forge.codelutin.com Nov. 30, 2011

Nov. 30, 2011

Author: echatellier Date: 2011-11-30 10:41:16 +0100 (Wed, 30 Nov 2011) New Revision: 3547 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3547 Log: Modify isis main frame title Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.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/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-11-30 09:41:16 UTC (rev 3547) @@ -49,7 +49,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -614,6 +613,7 @@ // lauch first UI (welcomeUI) WelcomeUI welcome = new WelcomeUI(); + welcome.setTitle(_("isisfish.welcome.title", IsisConfig.getVersion())); // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.DO_NOTHING_ON_CLOSE); welcome.addWindowListener(new WindowAdapter() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-11-30 09:41:16 UTC (rev 3547) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-2.0.html>. #L% --> -<JFrame title="isisfish.welcome.title" width='874' height='736' resizable="true" layout='{new BorderLayout()}'> +<JFrame width='874' height='736' resizable="true" layout='{new BorderLayout()}'> <WelcomeHandler id="handler" /> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-30 09:41:16 UTC (rev 3547) @@ -1067,7 +1067,7 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Simulation launcher isisfish.welcome.menu.synchro=Server synchronization -isisfish.welcome.title=Ifremer Simulation +isisfish.welcome.title=ISIS-Fish %s isisfish.wizardGroupCreation.allGroupsSameSize=All groups have the same size isisfish.wizardGroupCreation.allValues=Input all the values isisfish.wizardGroupCreation.computedGrowthCurve=Computed by a growth curve Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:03 UTC (rev 3546) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-30 09:41:16 UTC (rev 3547) @@ -1067,7 +1067,7 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Lanceur de simulations isisfish.welcome.menu.synchro=Synchronisation Serveur -isisfish.welcome.title=Simulation Ifremer +isisfish.welcome.title=ISIS-Fish %s isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la même taille isisfish.wizardGroupCreation.allValues=Entrer toutes les valeurs isisfish.wizardGroupCreation.computedGrowthCurve=Calculé par une courbe de croissance

1 0

r3546 - trunk/src/main/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com Nov. 30, 2011

Nov. 30, 2011

Author: echatellier Date: 2011-11-30 10:41:03 +0100 (Wed, 30 Nov 2011) New Revision: 3546 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3546 Log: Fix header Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 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-30 09:13:02 UTC (rev 3545) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-30 09:41:03 UTC (rev 3546) @@ -1,25 +1,23 @@ /* * #%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 + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ @@ -226,4 +224,4 @@ public boolean removeActionListener(ActionListener o) { return actionListeners.remove(o); } -} \ No newline at end of file +}

1 0

r3545 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com Nov. 30, 2011

Nov. 30, 2011

Author: echatellier Date: 2011-11-30 10:13:02 +0100 (Wed, 30 Nov 2011) New Revision: 3545 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3545 Log: Fix migration after import Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-28 22:23:47 UTC (rev 3544) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-11-30 09:13:02 UTC (rev 3545) @@ -450,6 +450,9 @@ tx.commitTransaction(); tx.closeContext(); } + + // close storage to force migration in next opening + result.closeStorage(); } // add storage modification event

1 0

r3544 - trunk
by maven-release＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: maven-release Date: 2011-11-28 23:23:47 +0100 (Mon, 28 Nov 2011) New Revision: 3544 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3544 Log: Update mavenpom4redmine to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 12:52:01 UTC (rev 3543) +++ trunk/pom.xml 2011-11-28 22:23:47 UTC (rev 3544) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3543 - trunk/src/main/java/fr/ifremer/isisfish/ui/result
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 13:52:01 +0100 (Mon, 28 Nov 2011) New Revision: 3543 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3543 Log: Remove sysout Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 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-28 12:46:27 UTC (rev 3542) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-28 12:52:01 UTC (rev 3543) @@ -207,7 +207,6 @@ String selectedMatrixName = (String)e.getItem(); MatrixND matrix = resultStorage.getMatrix(selectedMatrixName, resultSimulationFrame.topiaContext); matrixViewerPanel.setMatrix(matrix); - System.out.println("adding matrix"); } } });

1 0

r3542 - trunk
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 13:46:27 +0100 (Mon, 28 Nov 2011) New Revision: 3542 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3542 Log: Fix strange i18n NPE Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 09:47:12 UTC (rev 3541) +++ trunk/pom.xml 2011-11-28 12:46:27 UTC (rev 3542) @@ -71,6 +71,12 @@ <artifactId>nuiton-matrix-gui</artifactId> <version>2.2.1</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

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

Nov. 28, 2011

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 Nov. 28, 2011

Nov. 28, 2011

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 Nov. 25, 2011

Nov. 25, 2011

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