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

r4215 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com 04 May '15

04 May '15

Author: echatellier Date: 2015-05-04 15:59:13 +0000 (Mon, 04 May 2015) New Revision: 4215 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4215 Log: Fix recruitment equation migration Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-05-04 15:40:55 UTC (rev 4214) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-05-04 15:59:13 UTC (rev 4215) @@ -31,6 +31,9 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; import org.nuiton.util.version.Version; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationImpl; + /** * Migration between version 4.3 and 4.4. * @@ -60,7 +63,14 @@ List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - queries.add("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); + + // build new equation for maturity group and reproduction rate + List<Population> pops = tx.findAll("from " + Population.class.getName()); + for (Population pop : pops) { + ((PopulationImpl)pop).setRecruitmentEquationContent("return 0;"); + pop.update(); + } } }

1 0

r4214 - trunk/src/test/java/fr/ifremer/isisfish/ui
by echatellier＠users.forge.codelutin.com 04 May '15

04 May '15

Author: echatellier Date: 2015-05-04 15:40:55 +0000 (Mon, 04 May 2015) New Revision: 4214 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4214 Log: Add assume to not fail test on headless env Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java Modified: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java 2015-05-04 15:18:17 UTC (rev 4213) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java 2015-05-04 15:40:55 UTC (rev 4214) @@ -30,6 +30,7 @@ import org.fest.swing.exception.WaitTimedOutError; import org.fest.swing.fixture.FrameFixture; import org.junit.After; +import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; @@ -47,6 +48,7 @@ @BeforeClass public static void setUpOnce() { + Assume.assumeTrue(!java.awt.GraphicsEnvironment.isHeadless()); FailOnThreadViolationRepaintManager.install(); }

1 0

04 May '15

Author: echatellier Date: 2015-05-04 15:18:17 +0000 (Mon, 04 May 2015) New Revision: 4213 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4213 Log: Testing fest(ival ^^) Added: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java trunk/src/test/java/fr/ifremer/isisfish/ui/input/ trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/ trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/SimulatorIT.java Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/pom.xml 2015-05-04 15:18:17 UTC (rev 4213) @@ -387,6 +387,13 @@ <version>4.12</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.easytesting</groupId> + <artifactId>fest-swing</artifactId> + <version>1.2.1</version> + <scope>test</scope> + </dependency> </dependencies>  @@ -618,7 +625,7 @@ <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> </systemPropertyVariables> </configuration> -  + </executions> </plugin> <plugin> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -729,8 +729,7 @@ } }); - try { - InputStream imageStream = WelcomeUI.class.getResourceAsStream("/images/simulation.gif"); + try (InputStream imageStream = WelcomeUI.class.getResourceAsStream("/images/simulation.gif")) { Image image = ImageIO.read(imageStream); welcome.setIconImage(image); } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -35,6 +35,7 @@ import java.util.WeakHashMap; import javax.swing.JProgressBar; +import javax.swing.SwingUtilities; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; @@ -114,7 +115,11 @@ if (!contains(job)) { jobs.add(job); jobIds.put(id, job); - fireTableRowsInserted(jobs.size() - 1, jobs.size() - 1); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + fireTableRowsInserted(jobs.size() - 1, jobs.size() - 1); + } + }); } } } @@ -122,18 +127,26 @@ public void removeJob(SimulationJob job) { String id = job.getItem().getControl().getId(); synchronized (jobs) { - int index = jobs.indexOf(job); + final int index = jobs.indexOf(job); if (index >= 0) { jobs.remove(index); jobIds.remove(id); - fireTableRowsDeleted(index, index); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + fireTableRowsDeleted(index, index); + } + }); } } } public void clearJob() { jobs.clear(); - fireTableDataChanged(); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + fireTableDataChanged(); + } + }); } public ArrayList<SimulationJob> getJobs() { @@ -389,9 +402,13 @@ String id = control.getId(); synchronized (model.jobs) { SimulationJob job = model.jobIds.get(id); - int index = model.getJobs().indexOf(job); + final int index = model.getJobs().indexOf(job); if (index >= 0) { - fireTableRowsUpdated(index, index); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + fireTableRowsUpdated(index, index); + } + }); } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-05-04 15:18:17 UTC (rev 4213) @@ -29,12 +29,12 @@ <Boolean id="regionLoaded" javaBean="false" /> <JMenuBar id="menu" constraints='BorderLayout.NORTH'> - <JMenu text="isisfish.common.region"> - <JMenuItem text="isisfish.input.menu.importRegion" onActionPerformed="getHandler().importRegion(this)" /> - <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="getHandler().importRegionAndRename(this)" /> + <JMenu text="isisfish.common.region" id="menuRegion"> + <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="getHandler().importRegion(this)" /> + <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="getHandler().importRegionAndRename(this)" /> <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" enabled="false"/> - <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().exportRegion(this)" /> - <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().copyRegion(this)" /> + <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().exportRegion(this)" /> + <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().copyRegion(this)" /> <JSeparator/> <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().removeRegion(this, false)" /> </JMenu> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -35,6 +35,7 @@ import java.util.List; import javax.swing.JMenuItem; +import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -88,9 +89,13 @@ public void simulationStart(SimulationService simService, SimulationJob job) { } @Override - public void simulationStop(SimulationService simService, SimulationJob job) { - GenericComboModel<String> model = (GenericComboModel<String>)resultUI.getSimulationComboBox().getModel(); - model.addElement(job.getId()); + public void simulationStop(SimulationService simService, final SimulationJob job) { + final GenericComboModel<String> model = (GenericComboModel<String>)resultUI.getSimulationComboBox().getModel(); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + model.addElement(job.getId()); + } + }); } @Override public void clearJobDone(SimulationService simService) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2015-05-04 15:18:17 UTC (rev 4213) @@ -81,9 +81,13 @@ } @Override - public void simulationStop(SimulationService simService, SimulationJob job) { - GenericComboModel<String> model = (GenericComboModel)fieldSimulParamsSelect.getModel(); - model.addElement(job.getId()); + public void simulationStop(SimulationService simService, final SimulationJob job) { + final GenericComboModel<String> model = (GenericComboModel)fieldSimulParamsSelect.getModel(); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + model.addElement(job.getId()); + } + }); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -201,14 +201,17 @@ */ private void buildLayout() { dataBox = new JComboBox<T>(); + dataBox.setName("filterBox"); dataBox.addActionListener(new ComboBoxActionListener()); filterField = new JXTextField(t("isisfish.common.filter")); + filterField.setName("filterText"); + filterField.getDocument().addDocumentListener(new FilterDocumentListener()); // 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()); + resetButton.setName("filterReset"); setLayout(new BorderLayout()); add(dataBox, BorderLayout.CENTER); Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -97,6 +97,7 @@ IsisFish.init(); IsisFish.initVCS(); + IsisFish.initCommunityVCS(); // for ui testing // install a new topia migration service callback // to not ask for user for migration during test Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2015-04-28 08:21:17 UTC (rev 4212) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaContext; @@ -57,6 +58,7 @@ * * Last update : $Date$ By : $Author$ */ +@Ignore public class SimulationServiceIT extends AbstractIsisFishTest { /** Class logger. */ Added: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -0,0 +1,73 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui; + +import org.fest.swing.edt.FailOnThreadViolationRepaintManager; +import org.fest.swing.edt.GuiActionRunner; +import org.fest.swing.edt.GuiQuery; +import org.fest.swing.exception.WaitTimedOutError; +import org.fest.swing.fixture.FrameFixture; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; + +import fr.ifremer.isisfish.AbstractIsisFishTest; + +/** + * Test commun qui permet d'instancier une fenetre Isis à partir de laquelle dépendent + * tous les tests. + * + * @author Eric Chatellier + */ +public abstract class AbstractFestIT extends AbstractIsisFishTest { + + protected FrameFixture mainWindow; + + @BeforeClass + public static void setUpOnce() { + FailOnThreadViolationRepaintManager.install(); + } + + @Before + public void setUp() { + WelcomeUI frame = GuiActionRunner.execute(new GuiQuery<WelcomeUI>() { + protected WelcomeUI executeInEDT() { + return new WelcomeUI(); + } + }); + mainWindow = new FrameFixture(frame); + try { + mainWindow.show(); // shows the frame to test + } catch (WaitTimedOutError e) { + // ok, but not a problem, isis is so slow... + } + mainWindow.maximize(); + } + + @After + public void tearDown() { + mainWindow.cleanUp(); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/ui/AbstractFestIT.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -0,0 +1,97 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.input; + +import java.io.File; +import java.io.IOException; + +import org.apache.commons.lang3.SystemUtils; +import org.fest.swing.core.matcher.JButtonMatcher; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import fr.ifremer.isisfish.ui.AbstractFestIT; + +/** + * Swing tests. + * + * @author Eric Chatellier + */ +public class InputIT extends AbstractFestIT { + + @Before + @Override + public void setUp() { + super.setUp(); + mainWindow.tabbedPane("simulTabs").selectTab(0); + } + + protected void openDemoRegion() { + mainWindow.comboBox("fieldCurrentRegion").selectItem("DemoRegion"); + } + + /** + * Just open test. + */ + @Test + public void testOpenDemoRegion() { + openDemoRegion(); + mainWindow.comboBox("fieldCurrentRegion").requireSelection(1); + } + + /** + * Edit and save region test. + */ + @Test + public void testEditRegionName() { + openDemoRegion(); + mainWindow.tree("fisheryRegionTree").selectRow(0); + mainWindow.textBox("fieldRegion").selectAll().enterText("New region name"); + mainWindow.button("save").click(); + Assert.assertEquals(mainWindow.tree("fisheryRegionTree").valueAt(0), "New region name"); + } + + /** + * Open, export, import and rename region test. + * + * @throws IOException + */ + @Test + public void testImportRegion() throws IOException { + openDemoRegion(); + mainWindow.menuItem("menuRegionExport").click(); + File f = new File(SystemUtils.JAVA_IO_TMPDIR, "isis-export.zip"); + f.deleteOnExit(); + mainWindow.fileChooser().selectFile(f).approve(); + mainWindow.menuItem("menuRegionImportRename").click(); + mainWindow.fileChooser().selectFile(f).approve(); + + mainWindow.dialog().textBox().enterText("Testimport"); + mainWindow.dialog().button(JButtonMatcher.withText("OK")).click(); + mainWindow.comboBox("fieldCurrentRegion").selectItem("Testimport"); + Assert.assertEquals(mainWindow.tree("fisheryRegionTree").valueAt(0), "Testimport"); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/SimulatorIT.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/SimulatorIT.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/SimulatorIT.java 2015-05-04 15:18:17 UTC (rev 4213) @@ -0,0 +1,87 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.simulator; + +import org.junit.Before; +import org.junit.Test; + +import fr.ifremer.isisfish.ui.AbstractFestIT; + +/** + * UI fest tests related to simulation params and launch. + * + * @author Eric Chatellier + */ +public class SimulatorIT extends AbstractFestIT { + + @Before + @Override + public void setUp() { + super.setUp(); + mainWindow.tabbedPane("simulTabs").selectTab(1); + } + + /** + * Param and launch a simple simulation. + * + * @throws InterruptedException + */ + @Test + public void testSimulationAndViewResults() throws InterruptedException { + // first tab + mainWindow.tabbedPane("bodyTabbedPane").selectTab(0); + mainWindow.comboBox("fieldSimulParamsRegion").selectItem("DemoRegion"); + mainWindow.textBox("fieldSimulParamsName").setText("test"); + mainWindow.textBox("fieldSimulParamsDesc").setText("Ho la description de ouf :D"); + mainWindow.list("listSimulParamsStrategies").selectItem("stratest"); + mainWindow.list("listSimulParamsPopulations").selectItem("popage"); + + // second tab + mainWindow.tabbedPane("bodyTabbedPane").selectTab(4); + mainWindow.tabbedPane("bodyTabbedPane").selectTab(5); + mainWindow.tabbedPane("bodyTabbedPane").selectTab(6); + + // back to first tab + mainWindow.tabbedPane("bodyTabbedPane").selectTab(0); + mainWindow.comboBox("comboSelLauncher").selectItem(2); + mainWindow.button("buttonSimulParamsSimulate").click(); + + // may be on tab (Queue) + int count = 0; + boolean done = false; + while (count < 10 && !done) { + done = mainWindow.table("queueTableDone").rowCount() == 1; + Thread.sleep(1000); + count++; + } + + // tab (result) + mainWindow.tabbedPane("simulTabs").selectTab(3); + mainWindow.textBox("filterText").setText("test"); + mainWindow.comboBox("filterBox").selectItem(0); + mainWindow.button("openButton").click(); + } + +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/ui/simulator/SimulatorIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r4212 - in trunk/src/main: java/fr/ifremer/isisfish/actions java/fr/ifremer/isisfish/simulator resources/i18n
by echatellier＠users.forge.codelutin.com 28 Apr '15

28 Apr '15

Author: echatellier Date: 2015-04-28 08:21:17 +0000 (Tue, 28 Apr 2015) New Revision: 4212 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4212 Log: Refactoring and misc fixes Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2015-04-28 08:12:57 UTC (rev 4211) +++ trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2015-04-28 08:21:17 UTC (rev 4212) @@ -93,48 +93,56 @@ System.out.println(sb.toString()); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listSimulationPlan(String filter) throws Exception { List<String> names = SimulationPlanStorage.getSimulationPlanNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listExport(String filter) throws Exception { List<String> names = ExportStorage.getExportNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listRule(String filter) throws Exception { List<String> names = RuleStorage.getRuleNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listScript(String filter) throws Exception { List<String> names = ScriptStorage.getScriptNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listRegion(String filter) throws Exception { List<String> names = RegionStorage.getRegionNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listSimulation(String filter) throws Exception { List<String> names = SimulationStorage.getSimulationNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listSimulator(String filter) throws Exception { List<String> names = SimulatorStorage.getSimulatorNames(); applyFilter(filter, names); display(filter, names); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listFormula(String filter) throws Exception { List<String> names = new ArrayList<String>(); for (String name : FormuleStorage.getCategories()) { @@ -150,6 +158,7 @@ // ////////////////////////////////////////////////////////////////////////// + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportRegion(File file, String name, boolean force) throws Exception { log.info("file:" + file + ", name:" + name); if (!force && file.exists()) { @@ -183,6 +192,7 @@ } } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportSimulationPlan(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); @@ -194,7 +204,8 @@ String content = storage.getContent(); FileUtils.writeStringToFile(file, content); } - + + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportRule(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); @@ -207,6 +218,7 @@ FileUtils.writeStringToFile(file, content); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportScript(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); @@ -219,6 +231,7 @@ FileUtils.writeStringToFile(file, content); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportExport(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); @@ -231,6 +244,7 @@ FileUtils.writeStringToFile(file, content); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportSimulator(File file, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); @@ -243,6 +257,7 @@ FileUtils.writeStringToFile(file, content); } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportFormula(File file, String category, String name, boolean force) throws Exception { if (!force && file.exists()) { throw new IllegalArgumentException(t("destination already exists %s use 'force' argument to force overwrite", file)); Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2015-04-28 08:12:57 UTC (rev 4211) +++ trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2015-04-28 08:21:17 UTC (rev 4212) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 1999 - 2015 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,4 +26,3 @@ * Command line actions classes implementation. */ package fr.ifremer.isisfish.actions; - Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-04-28 08:12:57 UTC (rev 4211) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2015-04-28 08:21:17 UTC (rev 4212) @@ -247,7 +247,7 @@ new List[] { pop.getPopulationGroup(), pop.getPopulationZone() }); - ReproductionDataMap mapAAndRs = new ReproductionDataMap(); + ReproductionDataMap reproductionDataMap = new ReproductionDataMap(); // pour chaque for (int e = 0; e < etalement; e++) { @@ -255,12 +255,12 @@ TimeStep t = new TimeStep(step.getStep() - e - pop.getMonthGapBetweenReproRecrutement()); - ReproductionData aAndR = reproductions.get(pop).get(t); + ReproductionData reproductionData = reproductions.get(pop).get(t); - if (aAndR != null) { // si une repro existe pour le mois + if (reproductionData != null) { // si une repro existe pour le mois - mapAAndRs.put(t, aAndR); - MatrixND repro = aAndR.getRepro(); + reproductionDataMap.put(t, reproductionData); + MatrixND repro = reproductionData.getRepro(); // on fait la correspondance entre les zones repro et // recrutement @@ -309,7 +309,7 @@ // recherche les saisons des differents mois entre les deux dates List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); - List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); + List<PopulationSeasonInfo> usedSeasons = new ArrayList<>(); while (step.after(stepRepro)) { stepRepro = stepRepro.next(); @@ -335,7 +335,7 @@ } // calcul recrutement par l'equation - result = pop.getRecruitmentMatrix(step, pop, mapAAndRs, result); + result = pop.getRecruitmentMatrix(step, pop, reproductionDataMap, result); return result; } Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-28 08:12:57 UTC (rev 4211) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-28 08:21:17 UTC (rev 4212) @@ -220,18 +220,18 @@ isisfish.config.main.simulation.ssh.username.description=SSH identifier isisfish.config.main.simulation.sub.max.memory.description=Sub process simulation Xmx allocated memory isisfish.config.main.simulation.sub.max.process.description=Max sub process count (using -1 value will use available processor count) -isisfish.config.main.simulationShowOnlyError.description= +isisfish.config.main.simulationShowOnlyError.description=to indicate whether to keep in the UI simulations completed only those with errors isisfish.config.main.smtpServer.description=Smtp server address isisfish.config.main.subSimulator.description=Sub process simulator launcher name isisfish.config.main.userMail.description=User email address isisfish.config.main.userName.description=User name -isisfish.config.mapped.result.matrix.vector.class.description= -isisfish.config.simulation.matrix.threshold.use.sparse.class.description= -isisfish.config.simulation.matrix.use.lazy.vector.description= -isisfish.config.simulation.matrix.vector.class.description= -isisfish.config.simulation.matrix.vector.sparse.class.description= -isisfish.config.simulation.store.result.cachestep.description= -isisfish.config.simulation.store.result.ondisk.description= +isisfish.config.mapped.result.matrix.vector.class.description=(OBSOLETE) Matrix vector type to use to read result un file results.mapped +isisfish.config.simulation.matrix.threshold.use.sparse.class.description=Threshold to choose between full/hollow matrix. +isisfish.config.simulation.matrix.use.lazy.vector.description=Flag to use copy-on-write matrix +isisfish.config.simulation.matrix.vector.class.description=Matrix type for full matrix +isisfish.config.simulation.matrix.vector.sparse.class.description=Matrix type for hollow matrix +isisfish.config.simulation.store.result.cachestep.description=Number of time steps remembered during simulation. If the result is not in memory, it will be played back on the disc if does exist, which is a bit more expensive. +isisfish.config.simulation.store.result.ondisk.description=Number of results to keep on disk. When you do remote simulations for an analysis plan and want to work on the simulation results after the simulation, it is necessary that the results are stored on disk. isisfish.config.ssh.key.file=SSH key isisfish.config.ssh.key.file.description=Private SSH key path isisfish.config.title=Preferences

1 0

r4211 - trunk
by echatellier＠users.forge.codelutin.com 28 Apr '15

28 Apr '15

Author: echatellier Date: 2015-04-28 08:12:57 +0000 (Tue, 28 Apr 2015) New Revision: 4211 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4211 Log: Update svnkit Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-27 13:55:12 UTC (rev 4210) +++ trunk/pom.xml 2015-04-28 08:12:57 UTC (rev 4211) @@ -342,7 +342,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.7</version> + <version>1.8.9</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r4210 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 27 Apr '15

27 Apr '15

Author: echatellier Date: 2015-04-27 13:55:12 +0000 (Mon, 27 Apr 2015) New Revision: 4210 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4210 Log: Clean i18n files Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-27 09:54:32 UTC (rev 4209) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-27 13:55:12 UTC (rev 4210) @@ -1,18 +1,14 @@ -= %s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.= %s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ %s= -Can't\ create\ simulation\ logger=Can't create simulation logger -Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= -Can't\ export\ simulation\ %s= Can't\ get\ changlog= Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s @@ -44,7 +40,6 @@ Missing\ name= Modifier\ le\ code\ R\ envoyé\ si\ vous\ le\ souhaitez= No\ port\ cell= -Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Pause= Process\ template\ error= @@ -90,7 +85,6 @@ dhyper= directory\ %s\ must\ be\ a\ directory= dlnorm= -filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... @@ -276,14 +270,12 @@ isisfish.effortDescription.unitCostOfFishing=Fishing unit cost isisfish.equation.editor.title=Equation Editor isisfish.error.acceptable.population=New value isn't acceptable value for this population -isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.tray=Can't add system tray icon isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.compile.fileerror=File %s can't be compiled \! isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class -isisfish.error.conversion.data=Erreur lors de la conversion du fichier de données isisfish.error.create.equation=Can't create equation isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s @@ -314,17 +306,13 @@ isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist -isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative -isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. isisfish.error.import.file=Can't import file %1$s -isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus récente que la version souhaitée. isisfish.error.init.map=Can't init map. isisfish.error.input.addentity=Can't add entity "%s" isisfish.error.input.cancelentity=Can't cancel modification on entity isisfish.error.input.createentity=Can't create entity isisfish.error.input.removeentity=Can't remove entity "%s" -isisfish.error.input.save=Can't save modifications isisfish.error.input.saveentity=Can't save entity isisfish.error.input.spacializematrix= isisfish.error.instanciate=Can't instanciate %1$s @@ -332,7 +320,6 @@ isisfish.error.invalid.costs.fix=cost are not valid isisfish.error.invalid.distribution.recruitment=distribution de recrutement invalide isisfish.error.invalid.equation=Invalid equation -isisfish.error.invalid.equation.name=Invalid equation name isisfish.error.invalid.file.name=The script name %1$s is not valid. isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide isisfish.error.invalid.mean.weight=Invalid mean weight @@ -345,22 +332,16 @@ isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s -isisfish.error.log.closeAppender=could not close appender %1$s for category %2$s isisfish.error.log.console.dispose=Une erreur est survenue pendant la fermeture de la console %1$s de log, raison %2$s -isisfish.error.log.createAppender=could not create appender [%1$s] \: %2$s for reason %3$s -isisfish.error.log.foundAppender=\=could not found log appender %1$s for category %2$s isisfish.error.migration.negative=Migration negative isisfish.error.no.matrix=No matrix for \: %s -isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=No sector defined -isisfish.error.no.select.simulation=Could not select simulation isisfish.error.no.target.species=No target species in %1$s for %2$s isisfish.error.not.found.description=Could not found description for %1$s isisfish.error.not.found.field=Could not found field %1$s doc for %2$s isisfish.error.not.null.mean.weight=Null mean weight isisfish.error.not.possible.metier=No metier available isisfish.error.null.semantics=Null semantics for %s -isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s @@ -371,15 +352,12 @@ isisfish.error.read.simulation.parameters=Can't read simulation parameters from file %1$s isisfish.error.region.addmap=Can't add map in region isisfish.error.region.already.exists=This region already exists -isisfish.error.region.cancel= isisfish.error.region.check=Can't check region isisfish.error.region.import=Can't import region -isisfish.error.region.new= isisfish.error.region.removemap=Can't remove map in region isisfish.error.region.save=Can't save modification on region isisfish.error.remove.directory=Can't remove directory %1$s isisfish.error.rename.region=Can't rename region to %1$s -isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters= isisfish.error.script.create=isisfish.error.script.create @@ -391,7 +369,6 @@ isisfish.error.simulation.importparameter=Can't import simulation parameters isisfish.error.simulation.initsimulaction=Can't init simulation isisfish.error.simulation.launchsimulation=Can't launch simulation -isisfish.error.simulation.listoldsimulation=Can't get old simulation list isisfish.error.simulation.listpopulation=Can't get population list isisfish.error.simulation.liststrategies=Can't get strategies list isisfish.error.simulation.loadoldsimulation=Can't load old simulation @@ -423,7 +400,6 @@ isisfish.export.saved=Export saved isisfish.export.title=Results export isisfish.filter.apply=Apply filter -isisfish.filter.cancel=Cancel isisfish.filter.log.levelDebug=Debug isisfish.filter.log.levelError=Error isisfish.filter.log.levelFatal=Fatal @@ -438,37 +414,6 @@ isisfish.filter.log.tooltip.levelWarn=Warn isisfish.filter.log.tooltip.message=Enter a term to search and press Enter isisfish.filter.reset=Reset -isisfish.filter.result=Results -isisfish.filter.result.found=Results (%d/%d) -isisfish.filter.select=Select -isisfish.filter.select.simulation=Select a simulation -isisfish.filter.simulation=Filter simulations -isisfish.filter.simulation.description=Description -isisfish.filter.simulation.local=Local -isisfish.filter.simulation.numberOfYear=Number of year -isisfish.filter.simulation.regionName=Region name -isisfish.filter.simulation.simulationEnd=Simulation end date (dd/MM/yyyy) -isisfish.filter.simulation.simulationName=Simulation name -isisfish.filter.simulation.simulationPlanNumber=Simulation plan number -isisfish.filter.simulation.simulationStart=Simulation start date (dd/MM/yyyy) -isisfish.filter.simulation.simulatorName=Simulator name -isisfish.filter.simulation.tooltip.description=Filter on description (regex) -isisfish.filter.simulation.tooltip.local=Filter only local simulations -isisfish.filter.simulation.tooltip.numberOfYear=Filter on number of year (exact sequence) -isisfish.filter.simulation.tooltip.regionName=Filter on region name (regex) -isisfish.filter.simulation.tooltip.simulationEnd=Filter on region end date (format dd/MM/yyyy) -isisfish.filter.simulation.tooltip.simulationName=Filter on simulation name -isisfish.filter.simulation.tooltip.simulationPlanNumber=Filter on simulation number -isisfish.filter.simulation.tooltip.simulationStart=Filter on simulation start date (format dd/MM/yyyy) -isisfish.filter.simulation.tooltip.simulatorName=Filter on simulator name -isisfish.filter.simulation.tooltip.useOptimization=Filter on simulations with optimization -isisfish.filter.simulation.tooltip.usePreScript=Filter on simulations with pre-script -isisfish.filter.simulation.tooltip.useSimulationPlan= -isisfish.filter.simulation.tooltip.useStatistic=Filter on simulations with statistic -isisfish.filter.simulation.useOptimization=optimization -isisfish.filter.simulation.usePreScript=pre-script -isisfish.filter.simulation.useSimulationPlan=Simulation plan -isisfish.filter.simulation.useStatistic=statistic isisfish.fisheryRegion.addMap=Add map isisfish.fisheryRegion.area=Fishery area boundaries isisfish.fisheryRegion.comments=Comments @@ -507,7 +452,6 @@ isisfish.input.menu.exportRegion=Export region isisfish.input.menu.importRegion=Import region isisfish.input.menu.importRegionSimulation=Import region from simulation -isisfish.input.menu.importRegionV2=Import region from v2 isisfish.input.menu.importRenameRegion=Import region and rename isisfish.input.menu.removeLocaly=Remove localy isisfish.input.menu.removeLocalyRemotely=Remove localy and remotely @@ -550,19 +494,12 @@ isisfish.launch.ssh=read-write (ssh) isisfish.launch.stop=Stopping simulation... isisfish.launching=after init done in %1$s. -isisfish.log.addAppender=add appender [%1$s] isisfish.log.body=Message to add -isisfish.log.closeAppender=closing appender %1$s for category %2$s -isisfish.log.mail.failed=Can't send report by mail. Is your mail server up ? (I'm trying to contact the < %1$s > smtp server) -isisfish.log.mail.send=A report has been sent to %1$s isisfish.log.mail.send.title=Send simulation %1$s by email isisfish.log.mailTo=Destination adress -isisfish.log.removeAppender=remove appender [%1$s] -isisfish.log.restoreLogLevel=swap back level for logger %1$s from level %2$s to level %3$s isisfish.log.sendAll=Send the complete simulation archive isisfish.log.sendMail=Send by email isisfish.log.simulation.name=IsisFish simulation %1$s -isisfish.log.swapLogLevel=swap level for logger %1$s from level %2$s to level%3$s isisfish.log.tooltip.body=The message will be join to email isisfish.log.tooltip.mailTo=Enter destination adress isisfish.log.tooltip.sendAll=Send the complete simulation archive, or just the log file @@ -570,7 +507,6 @@ isisfish.message.add.objets.simulation=Add new objets simulation isisfish.message.backup.database.finished=backup database finished isisfish.message.backup.database.progress=backup database in progress -isisfish.message.cancel.finished=Cancel finished isisfish.message.check.finished=Check finished isisfish.message.check.inprogress=Checking in process... isisfish.message.checking.cell= @@ -596,17 +532,12 @@ isisfish.message.export.export=Exporting results isisfish.message.file.already.exists=File %s already exists, do you want overwrite it ? isisfish.message.file.overwrite=File exists, do you want overwrite it ? -isisfish.message.import=Import %1$s isisfish.message.import.equation.convert=Manual equation convertion isisfish.message.import.finished=Import finished -isisfish.message.import.region.name=Enter name for imported region -isisfish.message.import.region.xml=XMLed Region isisfish.message.import.region.zipped=Zipped Region -isisfish.message.import.scripts.file=Import scripts from a zipped archive isisfish.message.import.scripts.file.cancelled=Import scripts cancelled isisfish.message.import.scripts.file.done=Scripts imported isisfish.message.import.scripts.zipped=Zipped script (*.zip) -isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file isisfish.message.launchui.notlaunch=User interface not started isisfish.message.load.finished=Load finished @@ -672,7 +603,6 @@ isisfish.observation.comment=Comment isisfish.observation.name=Name isisfish.observation.value=Valeur -isisfish.optimisation.observation=Observation isisfish.optimization.export=Export isisfish.optimization.exports=Exports and observations isisfish.optimization.method=Optimization method @@ -684,7 +614,6 @@ isisfish.params.loadOldSimulation=Load old simulation isisfish.params.nopopulation=No selected population isisfish.params.numberMonth=Number of months -isisfish.params.numberYear=Number of year isisfish.params.populationEffectives=%s's effectives isisfish.params.rules=Rules isisfish.params.rules.availables=Available rules @@ -698,7 +627,6 @@ isisfish.params.toString.fishery=Fishery\: %1$s isisfish.params.toString.lib.logger.level=Level of libraries' logger \: %1$s isisfish.params.toString.number.months= -isisfish.params.toString.number.years=Number of years\: %1$s isisfish.params.toString.objective=Objective function \: %s isisfish.params.toString.optimization=Optimization methode \: %s isisfish.params.toString.optimization.generation=Generation\: %s @@ -766,7 +694,6 @@ isisfish.populationGroup.price=Price isisfish.populationGroup.reproductionRate=Reproduction rate isisfish.populationGroup.title=Groups -isisfish.populationGroup.toString=%1$s Group %2$s isisfish.populationMigration.comments=Comments isisfish.populationMigration.selectSeason=Select a season isisfish.populationMigration.title=Migration @@ -785,9 +712,6 @@ isisfish.populationRecruitment.comments=Comments isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Month gap between repro and recruitment isisfish.populationRecruitment.recruitmentDistribution=Recruitment distribution -isisfish.populationRecruitment.reproductionEquation=Reproduction equation -isisfish.populationRecruitment.reproductionEquationIsRecruitment=Stock/Recruitment -isisfish.populationRecruitment.reproductionEquationIsReproduction=Reproduction isisfish.populationRecruitment.title=Recruitment isisfish.populationSeasonInfo.arrival=Arrival isisfish.populationSeasonInfo.departure=Departure @@ -911,7 +835,6 @@ isisfish.script.menu.txtNewSimulator=New simulator isisfish.script.menu.txtVCS=Server isisfish.script.menu.update=Update from server -isisfish.script.new=New isisfish.script.new.tooltip=Create new script isisfish.script.newplus=New ► isisfish.script.paste=Paste @@ -969,7 +892,6 @@ isisfish.setOfVessels.technicalEfficiency=Technical efficiency isisfish.setOfVessels.title=Caracteristics isisfish.setOfVessels.vesselType=Vessel type -isisfish.simpleResult.more.information=Click a cell for more information... isisfish.simulation.log.console.title=Log console for simulation '%1$s' isisfish.simulation.log.showConsole=Display log console for simulation %1$s isisfish.simulation.menu.import=Restore simulation parameters @@ -1201,7 +1123,6 @@ matrixCatchPerStrategyMetPerZoneMet= matrixDiscardsPerStrMetPerZonePop= mean\ and\ standard\ deviation\ of\ the\ distribution\ on\ the\ log\ scale\ with\ default\ values\ of\ '0'\ and\ '1'\ respectively.= -non-centrality\ parameter\ (non-negative).= non-centrality\ parameter.\ If\ omitted\ the\ central\ F\ is\ assumed= number\ of\ trials\ (zero\ or\ more)= probability\ of\ success\ in\ each\ trial.\ '0\ <\ prob\ <\=\ 1'= Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-27 09:54:32 UTC (rev 4209) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-27 13:55:12 UTC (rev 4210) @@ -1,18 +1,14 @@ -= %s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.= %s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s Can't\ add\ simulation\:\ %s= -Can't\ create\ simulation\ logger=Can't create simulation logger -Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= -Can't\ export\ simulation\ %s= Can't\ get\ changlog=Impossible d'obtenir le changelog Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s @@ -44,7 +40,6 @@ Missing\ name= Modifier\ le\ code\ R\ envoyé\ si\ vous\ le\ souhaitez= No\ port\ cell= -Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= Pause= Process\ template\ error= @@ -90,7 +85,6 @@ dhyper= directory\ %s\ must\ be\ a\ directory= dlnorm= -filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... @@ -276,14 +270,12 @@ isisfish.effortDescription.unitCostOfFishing=Coût unitaire de la pêche isisfish.equation.editor.title=Editeur d'équation isisfish.error.acceptable.population=La nouvelle valeur n'est pas une valeur valide pour cette population -isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.tray=Impossible d'ajouter une icone de notification isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.compile.fileerror=Le fichier %s contient des erreurs \! isisfish.error.compile.script=Impossible de compiler le script \: %s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class -isisfish.error.conversion.data=Erreur lors de la conversion du fichier de données isisfish.error.create.equation=Can't create equation isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s @@ -314,17 +306,13 @@ isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.file.already.exists=The file %1$s already exist -isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative -isisfish.error.import.convertible=Erreur lors de l'import, la version du fichier que vous souhaitez importer n'est pas transformable en une version importable. isisfish.error.import.file=Can't import file %1$s -isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus récente que la version souhaitée. isisfish.error.init.map=Can't init map. isisfish.error.input.addentity=Impossible d'ajouter l'entité "%s" isisfish.error.input.cancelentity=Impossible d'annuler les modifications isisfish.error.input.createentity=Impossible de créer une nouvelle entité isisfish.error.input.removeentity=Impossible de supprimer l'entité "%s" -isisfish.error.input.save=Impossible de sauver les modifications isisfish.error.input.saveentity=Impossible de sauver les modifications isisfish.error.input.spacializematrix= isisfish.error.instanciate=Can't instanciate %1$s @@ -332,7 +320,6 @@ isisfish.error.invalid.costs.fix=les coûts fixes sont invalides isisfish.error.invalid.distribution.recruitment=distribution de recrutement invalide isisfish.error.invalid.equation=Equation invalide -isisfish.error.invalid.equation.name=Nom d'équation invalide isisfish.error.invalid.file.name=Le nom du script %1$s n'est pas valide. isisfish.error.invalid.interval.reproduction.recruitment=interval entre la reproduction et le recrutement invalide isisfish.error.invalid.mean.weight=poids moyen invalide @@ -345,22 +332,16 @@ isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s -isisfish.error.log.closeAppender=n'a pas pu ferme l'appender %1$s et la categorie %2$s isisfish.error.log.console.dispose=Une erreur est survenue pendant la fermeture de la console %1$s de log, raison %2$s -isisfish.error.log.createAppender=n'a pas pu creer l'appender [%1$s] \: %2$s pour la raison %3$s -isisfish.error.log.foundAppender=n'a pas trouve l'appender %1$s pour la categorie %2$s isisfish.error.migration.negative=Migration negative isisfish.error.no.matrix=Pas de matrice pour \: %s -isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=il n'y a pas de secteur de définit -isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s isisfish.error.not.null.mean.weight=poids moyen nul isisfish.error.not.possible.metier=Pas de métier possible isisfish.error.null.semantics=Semantiques nulle pour %s -isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s @@ -371,15 +352,12 @@ isisfish.error.read.simulation.parameters=Impossible de lire les paramètres du fichier \: %1$s isisfish.error.region.addmap=Impossible d'ajouter une carte isisfish.error.region.already.exists=Cette région existe déjà -isisfish.error.region.cancel= isisfish.error.region.check=Impossible de vérifier la région isisfish.error.region.import=Impossible d'importer la région -isisfish.error.region.new= isisfish.error.region.removemap=Impossible de supprimer une carte de la région isisfish.error.region.save=Impossible de sauver la région isisfish.error.remove.directory=Can't remove directory %1$s isisfish.error.rename.region=Can't rename region to %1$s -isisfish.error.save.checkSum.compilation=Can't save checkSum to compilation\: %1$s isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s isisfish.error.save.simulation.parameters= isisfish.error.script.create=isisfish.error.script.create @@ -391,7 +369,6 @@ isisfish.error.simulation.importparameter=Impossible d'importer les paramètres de simulation isisfish.error.simulation.initsimulaction=Impossible d'initialiser la simulation isisfish.error.simulation.launchsimulation=Impossible de lancer la simulation -isisfish.error.simulation.listoldsimulation=Impossible de lister les anciennes simulations isisfish.error.simulation.listpopulation=Impossible d'obtenir la liste des populations isisfish.error.simulation.liststrategies=Impossible d'obtenir la liste des statégies isisfish.error.simulation.loadoldsimulation=Impossible de charger une ancienne simulation @@ -423,7 +400,6 @@ isisfish.export.saved=Exports des résultats sauvegardés isisfish.export.title=Export des résultats isisfish.filter.apply=Appliquer le filtre -isisfish.filter.cancel=Annuler isisfish.filter.log.levelDebug=debug isisfish.filter.log.levelError=erreur isisfish.filter.log.levelFatal=fatal @@ -438,37 +414,6 @@ isisfish.filter.log.tooltip.levelWarn=sélectionner pour filtrer ce niveau isisfish.filter.log.tooltip.message=Entrer un terme à rechercher et appuyer sur Entrée isisfish.filter.reset=Réinitialiser -isisfish.filter.result=Résultats -isisfish.filter.result.found=Résultats (%d/%d) -isisfish.filter.select=Sélectionner -isisfish.filter.select.simulation=Sélectionner une simulation -isisfish.filter.simulation=Filtrer les simulations -isisfish.filter.simulation.description=description -isisfish.filter.simulation.local=locale -isisfish.filter.simulation.numberOfYear=nombre d'année(s) -isisfish.filter.simulation.regionName=nom de région -isisfish.filter.simulation.simulationEnd=date de fin (dd/MM/yyyy) -isisfish.filter.simulation.simulationName=nom de simulation -isisfish.filter.simulation.simulationPlanNumber=Numéro de simulation -isisfish.filter.simulation.simulationStart=date de début (dd/MM/yyyy) -isisfish.filter.simulation.simulatorName=nom du simulateur -isisfish.filter.simulation.tooltip.description=filtrer sur la description (format regex) -isisfish.filter.simulation.tooltip.local=filter uniquement les simulations locales -isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'année(s) (recherche exacte) -isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la région (format regex) -isisfish.filter.simulation.tooltip.simulationEnd=filtrer sur la date de fin de simulation (format dd/MM/yyyy) -isisfish.filter.simulation.tooltip.simulationName=filtrer sur le nom de simulation (format regex) -isisfish.filter.simulation.tooltip.simulationPlanNumber=Filtrer si le numéro de simulation (dans un plan) -isisfish.filter.simulation.tooltip.simulationStart=filtrer sur la date de début de simulation (format dd/MM/yyyy) -isisfish.filter.simulation.tooltip.simulatorName=filter sur le nom du simulateur utilisé (format regex) -isisfish.filter.simulation.tooltip.useOptimization=filter uniquement les simulations avec optimisation -isisfish.filter.simulation.tooltip.usePreScript=filter uniquement les simulations avec Prescript -isisfish.filter.simulation.tooltip.useSimulationPlan=filtrer sur les simulations utilisant un plan de simulation -isisfish.filter.simulation.tooltip.useStatistic=filter uniquement les simulations avec statistiques -isisfish.filter.simulation.useOptimization=optimisation -isisfish.filter.simulation.usePreScript=prescript -isisfish.filter.simulation.useSimulationPlan=plan de simulation -isisfish.filter.simulation.useStatistic=statistiques isisfish.fisheryRegion.addMap=Ajouter une carte isisfish.fisheryRegion.area=Extrémités de la zone de pêche isisfish.fisheryRegion.comments=Commentaires @@ -507,7 +452,6 @@ isisfish.input.menu.exportRegion=Exporter la région isisfish.input.menu.importRegion=Importer une région isisfish.input.menu.importRegionSimulation=Importer la région d'une simulation -isisfish.input.menu.importRegionV2=Importer une région de la v2 d'IsisFish isisfish.input.menu.importRenameRegion=Importer une région et la renommer isisfish.input.menu.removeLocaly=Supprimer localement isisfish.input.menu.removeLocalyRemotely=Supprimer localement et à distance @@ -550,19 +494,12 @@ isisfish.launch.ssh=lecture-écriture (ssh) isisfish.launch.stop=Arrêt de la simulation... isisfish.launching=after init done in %1$s. -isisfish.log.addAppender=ajoute un appender [%1$s] isisfish.log.body=Message à joindre -isisfish.log.closeAppender=ferme l'appender [%1$s] pour la categorie %2$s -isisfish.log.mail.failed=Impossible d'envoyer le rapport par courriel. Le serveur smtp fonctionne ? (J'essaye de contacter < %1$s > smtp server) -isisfish.log.mail.send=Un rapport a été envoyé à %1$s isisfish.log.mail.send.title=Envoi de la simulation %1$s par email isisfish.log.mailTo=Adresse du destinataire -isisfish.log.removeAppender=supprime l'appender [%1$s] -isisfish.log.restoreLogLevel=repositionne le niveau du logger %1$s du niveau %2$s au niveau %3$s isisfish.log.sendAll=Envoyer la simulation complete isisfish.log.sendMail=Envoyer par email isisfish.log.simulation.name=IsisFish simulation %1$s -isisfish.log.swapLogLevel=permute le niveau du logger %1$s du niveau %2$s au niveau %3$s isisfish.log.tooltip.body=Le message saisi sera joint au courriel envoyé isisfish.log.tooltip.mailTo=Entrer l'adresse du destinataire du courriel isisfish.log.tooltip.sendAll=Envoyer toute la simulation, ou uniquement le fichier de log @@ -570,7 +507,6 @@ isisfish.message.add.objets.simulation=Ajout des nouveaux objets créés durant la simulation isisfish.message.backup.database.finished=backup database terminé isisfish.message.backup.database.progress=backup database en cours -isisfish.message.cancel.finished=Annulation terminée isisfish.message.check.finished=Vérification terminée isisfish.message.check.inprogress=Vérification en cours... isisfish.message.checking.cell= @@ -596,17 +532,12 @@ isisfish.message.export.export=Export des résultats isisfish.message.file.already.exists=Le fichier %s existe, voulez-vous l'écraser ? isisfish.message.file.overwrite=Le fichier existe, voulez-vous l'écraser ? -isisfish.message.import=Importer %1$s isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé -isisfish.message.import.region.name=Entrer le nom de la région à importer -isisfish.message.import.region.xml=Région XML (ISIS-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region -isisfish.message.import.scripts.file=Importer des scripts depuis une archive zip isisfish.message.import.scripts.file.cancelled=Importation des scripts annulé isisfish.message.import.scripts.file.done=Scripts importés isisfish.message.import.scripts.zipped=Archive de script (*.zip) -isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file isisfish.message.launchui.notlaunch=Interface utilisateur non lancée isisfish.message.load.finished=Chargement terminé @@ -683,7 +614,6 @@ isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.nopopulation=Aucune population sélectionnée isisfish.params.numberMonth=Nombre de mois -isisfish.params.numberYear=Nombre d'années isisfish.params.populationEffectives=Effectifs %s isisfish.params.rules=Règles isisfish.params.rules.availables=Règles disponibles @@ -764,7 +694,6 @@ isisfish.populationGroup.price=Prix isisfish.populationGroup.reproductionRate=Taux de reproduction isisfish.populationGroup.title=Groupes -isisfish.populationGroup.toString=%1$s Groupe %2$s isisfish.populationMigration.comments=Commentaires isisfish.populationMigration.selectSeason=Sélectionnez une saison isisfish.populationMigration.title=Migration @@ -783,9 +712,6 @@ isisfish.populationRecruitment.comments=Commentaires isisfish.populationRecruitment.monthgapgetweenreprorecruitment=Nombre de mois entre ponte et recrutement isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement -isisfish.populationRecruitment.reproductionEquation=Equation de reproduction -isisfish.populationRecruitment.reproductionEquationIsRecruitment=Equation de Stock/Recrutement -isisfish.populationRecruitment.reproductionEquationIsReproduction=Equation de Reproduction isisfish.populationRecruitment.title=Reproductions isisfish.populationSeasonInfo.arrival=Arrivée isisfish.populationSeasonInfo.departure=Départ @@ -909,7 +835,6 @@ isisfish.script.menu.txtNewSimulator=Nouveau simulateur isisfish.script.menu.txtVCS=Serveur isisfish.script.menu.update=Synchronisation -isisfish.script.new=Nouveau isisfish.script.new.tooltip=Crée un nouveau script isisfish.script.newplus=Nouveau ► isisfish.script.paste=Coller @@ -967,7 +892,6 @@ isisfish.setOfVessels.technicalEfficiency=Éfficacité technique isisfish.setOfVessels.title=Caractéristiques isisfish.setOfVessels.vesselType=Type de navire -isisfish.simpleResult.more.information=Cliquer sur une cellule pour plus d'informations... isisfish.simulation.log.console.title=Console de log simulation '%1$s' isisfish.simulation.log.showConsole=affichage de la console de log pour la simulation %1$s isisfish.simulation.menu.import=Restaurer les paramètres d'une simulation @@ -1199,7 +1123,6 @@ matrixCatchPerStrategyMetPerZoneMet= matrixDiscardsPerStrMetPerZonePop= mean\ and\ standard\ deviation\ of\ the\ distribution\ on\ the\ log\ scale\ with\ default\ values\ of\ '0'\ and\ '1'\ respectively.= -non-centrality\ parameter\ (non-negative).= non-centrality\ parameter.\ If\ omitted\ the\ central\ F\ is\ assumed= number\ of\ trials\ (zero\ or\ more)= probability\ of\ success\ in\ each\ trial.\ '0\ <\ prob\ <\=\ 1'=

1 0

r4209 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 27 Apr '15

27 Apr '15

Author: echatellier Date: 2015-04-27 09:54:32 +0000 (Mon, 27 Apr 2015) New Revision: 4209 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4209 Log: Fix en i18n Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-27 09:23:54 UTC (rev 4208) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-27 09:54:32 UTC (rev 4209) @@ -21,7 +21,7 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Coefficient= +Coefficient=Coefficient Command\ '%s'\ fail\ to\ execute= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= Dbimom= @@ -29,7 +29,7 @@ Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Generate\ next\ simulation= -Groups= +Groups=Groups Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= Import\ zipped\ file\ containing\ all\ scripts\ directory\ structure= @@ -112,7 +112,7 @@ isisfish.common.add=Add isisfish.common.apply=Apply isisfish.common.cancel=Cancel -isisfish.common.capturability=Capturability +isisfish.common.capturability=Catchability isisfish.common.check=Check isisfish.common.clear=Clear isisfish.common.close=Close @@ -129,10 +129,10 @@ isisfish.common.filter=Filter isisfish.common.finish=Finish isisfish.common.gear=Gear -isisfish.common.immigration=immigration +isisfish.common.immigration=Immigration isisfish.common.info=info isisfish.common.ko=KO -isisfish.common.migration=migration +isisfish.common.migration=Migration isisfish.common.module=Module isisfish.common.month=month %1$s isisfish.common.months=Months @@ -720,10 +720,10 @@ isisfish.params.useOptimization=Use optimization method isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan -isisfish.population.capturability=Capturability +isisfish.population.capturability=Catchability isisfish.population.comments=Comments isisfish.population.group=Group -isisfish.population.groups= +isisfish.population.groups=Groups isisfish.population.mappingZoneReproZoneRecru=MappingZoneReproZoneRecru isisfish.population.matrixAbundance=Abundance matrix isisfish.population.matrixAbundance1D=matrixAbundance1D @@ -745,8 +745,8 @@ isisfish.populationBasics.title=Population structure isisfish.populationCapturability.comments=Comments isisfish.populationCapturability.selectCoefficient=Select a coefficient per season and per class -isisfish.populationCapturability.title=Capturability -isisfish.populationCapturability.useCapturabilityEquation=Use capturability equation +isisfish.populationCapturability.title=Catchability +isisfish.populationCapturability.useCapturabilityEquation=Use catchability equation isisfish.populationEquation.MaturityOgive=Maturity ogive isisfish.populationEquation.meanWeight=Mean weight isisfish.populationEquation.naturalDeathRate=Natural death rate @@ -754,7 +754,7 @@ isisfish.populationEquation.recruitmentEquation=Recruitment equation isisfish.populationEquation.reproductionEquation=Reproduction equation isisfish.populationEquation.reproductionRate=Reproduction rate -isisfish.populationEquation.title=Equations +isisfish.populationEquation.title=Life history traits isisfish.populationGroup.age=Age isisfish.populationGroup.comments=Comments isisfish.populationGroup.length=Length @@ -765,20 +765,20 @@ isisfish.populationGroup.naturalDeathRate=Natural death rate isisfish.populationGroup.price=Price isisfish.populationGroup.reproductionRate=Reproduction rate -isisfish.populationGroup.title= +isisfish.populationGroup.title=Groups isisfish.populationGroup.toString=%1$s Group %2$s isisfish.populationMigration.comments=Comments isisfish.populationMigration.selectSeason=Select a season isisfish.populationMigration.title=Migration isisfish.populationMigration.useEquation=Use equation -isisfish.populationMigrationEmigration.coefficient= +isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Departure Zone isisfish.populationMigrationEmigration.title=Population emigration isisfish.populationMigrationImmigration.arrivalZone=Arrival Zone -isisfish.populationMigrationImmigration.coefficient= +isisfish.populationMigrationImmigration.coefficient=Coefficient isisfish.populationMigrationImmigration.title=Population immigration isisfish.populationMigrationMigration.arrivalZone=Arrival zone -isisfish.populationMigrationMigration.coefficient= +isisfish.populationMigrationMigration.coefficient=Coefficient isisfish.populationMigrationMigration.departureZone=Departure zone isisfish.populationMigrationMigration.title=Population migration isisfish.populationPrice.title=Price @@ -808,7 +808,7 @@ isisfish.populationSeasons.showSpacialized=Show the spacialized isisfish.populationSeasons.spacialized=Spacialized isisfish.populationSeasons.spacialized.visualisation=Spacialized -isisfish.populationSeasons.title=Saisons +isisfish.populationSeasons.title=Seasons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas

1 0

r4208 - trunk/src/main/java/fr/ifremer/isisfish/equation
by echatellier＠users.forge.codelutin.com 27 Apr '15

27 Apr '15

Author: echatellier Date: 2015-04-27 09:23:54 +0000 (Mon, 27 Apr 2015) New Revision: 4208 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4208 Log: Fix equation Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationRecruitmentEquation.java Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationRecruitmentEquation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationRecruitmentEquation.java 2015-04-27 09:22:43 UTC (rev 4207) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationRecruitmentEquation.java 2015-04-27 09:23:54 UTC (rev 4208) @@ -59,7 +59,7 @@ "fr.ifremer.isisfish.simulator.SimulationContext", "fr.ifremer.isisfish.types.TimeStep", "fr.ifremer.isisfish.entities.Population", - "fr.ifremer.isisfish.types.AbundanceAndReproMap", + "fr.ifremer.isisfish.types.ReproductionDataMap", "org.nuiton.math.matrix.MatrixND"}) public double compute(SimulationContext context, TimeStep step, Population pop, ReproductionDataMap reproductions, MatrixND result) throws Exception;

1 0

r4207 - in trunk/src/test/java/fr/ifremer/isisfish: . equation
by echatellier＠users.forge.codelutin.com 27 Apr '15

27 Apr '15

Author: echatellier Date: 2015-04-27 09:22:43 +0000 (Mon, 27 Apr 2015) New Revision: 4207 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4207 Log: Add new test to test compilation and excecution of equations Added: trunk/src/test/java/fr/ifremer/isisfish/equation/ trunk/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java Added: trunk/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java 2015-04-27 09:22:43 UTC (rev 4207) @@ -0,0 +1,81 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, CodeLutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.equation; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.util.Args; +import fr.ifremer.isisfish.util.EvaluatorHelper; +import java.util.Arrays; +import org.apache.commons.lang3.reflect.MethodUtils; +import org.junit.Assert; +import org.junit.Test; + +/** + * Equation related tests. + * + * @author chatellier + */ +public class EquationTest extends AbstractIsisFishTest { + + /** + * Try to compile all equation with a default content to detect basic + * compile error. + * + * @throws java.lang.ClassNotFoundException + */ + @Test + public void testCompileAllEquations() throws ClassNotFoundException { + test(EmigrationEquation.class, new Object[5]); + test(ImmigrationEquation.class, new Object[5]); + test(MigrationEquation.class, new Object[6]); + test(PopulationCapturabilityEquation.class, new Object[4]); + test(PopulationGrowth.class, null, 0.0, null); + test(PopulationGrowthReverse.class, null, 0.0, null); + test(PopulationMaturityOgiveEquation.class, new Object[2]); + test(PopulationMeanWeight.class, new Object[2]); + test(PopulationNaturalDeathRate.class, new Object[4]); + test(PopulationPrice.class, new Object[2]); + test(PopulationRecruitmentEquation.class, new Object[5]); + test(PopulationReproductionEquation.class, null, null, null, null, 0.0, null, null, null, null); + test(PopulationReproductionRateEquation.class, new Object[2]); + test(SelectivityEquation.class, new Object[4]); + test(SoVTechnicalEfficiencyEquation.class, new Object[3]); + test(StrategyInactivityEquation.class, new Object[3]); + test(TargetSpeciesTargetFactorEquation.class, null, null, null, null, false); + test(VariableEquation.class, new Object[3]); + } + + /** + * Try to set 'return 42.0;' in all equation content and test to get this result. + * + * @param clazz class to test + * @param args equation args + */ + protected void test(Class clazz, Object... args) { + EvaluatorHelper.evaluate("fr.isisfish.equation", + "TestCompileAll", clazz, "return 42.0;", args); + Assert.assertEquals(42, 42, 0.0001); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r4206 - in trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/resources/i18n src/main/resources/icons
by echatellier＠users.forge.codelutin.com 24 Apr '15

24 Apr '15

Author: echatellier Date: 2015-04-24 08:34:43 +0000 (Fri, 24 Apr 2015) New Revision: 4206 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4206 Log: Add screenshot tool Added: trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java trunk/src/main/resources/icons/camera.png Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-04-22 15:09:18 UTC (rev 4205) +++ trunk/pom.xml 2015-04-24 08:34:43 UTC (rev 4206) @@ -524,9 +524,9 @@ <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  - <jaxxVersion>2.23.1</jaxxVersion> + <jaxxVersion>2.24</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> - <topiaVersion>2.9.5.1</topiaVersion> + <topiaVersion>2.9.5.3</topiaVersion> <hibernateVersion>4.3.9.Final</hibernateVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> Added: trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java 2015-04-24 08:34:43 UTC (rev 4206) @@ -0,0 +1,101 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2015 Ifremer, Codelutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui; + +import java.awt.Component; +import java.awt.Rectangle; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.image.BufferedImage; +import java.io.File; +import javax.imageio.ImageIO; +import javax.swing.JFileChooser; +import javax.swing.SwingUtilities; +import jaxx.runtime.JAXXContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Status bar UI handler. + * + * @author chatellier + */ +public class StatusBarHandler { + + /** Class logger. */ + private static Log log = LogFactory.getLog(StatusBarHandler.class); + + /** Attribute used to remember screenshot last directory. */ + protected JFileChooser screenshotFileChooser; + + /** + * Ask user for screenshot save file and take screenshot to that file. + */ + public void screenshot(Component parent) { + if (screenshotFileChooser == null) { + screenshotFileChooser = new JFileChooser(); + screenshotFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); + screenshotFileChooser.setMultiSelectionEnabled(false); + } + + // reset + File previousFile = screenshotFileChooser.getSelectedFile(); + if (previousFile != null) { + screenshotFileChooser.setSelectedFile(new File("")); // hack alert + screenshotFileChooser.setCurrentDirectory(previousFile.getParentFile()); + } + + // find parent + while (!(parent instanceof WelcomeUI)) { + parent = parent.getParent(); + } + final Component realParent = parent; + + // ask user for file + int opt = screenshotFileChooser.showSaveDialog(realParent); + if (opt == JFileChooser.APPROVE_OPTION) { + File file = screenshotFileChooser.getSelectedFile(); + + // add "png" if not yet set + if (!file.getName().endsWith(".png")) { + file = new File(file.getAbsolutePath() + ".png"); + } + final File realFile = file; + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + // take screenshot + try { + Rectangle screenRect = realParent.getBounds(); + BufferedImage capture = new Robot().createScreenCapture(screenRect); + ImageIO.write(capture, "png", realFile); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't show help", ex); + } + } + } + }); + } + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-04-22 15:09:18 UTC (rev 4205) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2015-04-24 08:34:43 UTC (rev 4206) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2006 - 2010 Ifremer, Code Lutin + Copyright (C) 2006 - 2015 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 as @@ -23,8 +23,11 @@ #L% --> <Table> + <StatusBarHandler id="handler" /> <script><![CDATA[ - + protected void $afterCompleteSetup() { + //getHandler().postInit(this); + } /** * Change status message and stop progress bar if running. * @@ -58,6 +61,9 @@ <JButton id="stopCommand" actionCommand="stopCommand" visible="false" text="isisfish.common.stop" toolTipText="Stop the process" /> </cell> --> + <cell> + <JLabel icon="camera.png" toolTipText="isisfish.status.screenshot" onMouseClicked="handler.screenshot(this)" /> + </cell> <cell fill="both"> <jaxx.runtime.swing.StatusMessagePanel /> </cell> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2015-04-22 15:09:18 UTC (rev 4205) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2015-04-24 08:34:43 UTC (rev 4206) @@ -95,7 +95,7 @@ public void postInit(WelcomeUI welcomeUI) { welcomeUI.setContextValue(verifier); - allFrameOpened = new java.util.HashMap<JFrame, WelcomePanelUI>(); + allFrameOpened = new HashMap<JFrame, WelcomePanelUI>(); welcomeUI.getWelcomePanelUI().setContent(new WelcomeTabUI(new JAXXInitialContext().add(verifier))); // increase tooltip display time Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-22 15:09:18 UTC (rev 4205) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-04-24 08:34:43 UTC (rev 4206) @@ -1028,6 +1028,7 @@ isisfish.ssh.askpassphrase.message=Enter passphrase for key '%s' \: isisfish.ssh.askpassphrase.title=SSH key unlocking isisfish.ssh.askpassphrase.wrongpassphrase=Wrong passphrase, enter a new one for key '%s' \: +isisfish.status.screenshot=Take screenshot isisfish.strategy.comments=Comments isisfish.strategy.inactivity=Inactivity equation isisfish.strategy.inactivityEquationUsed=Use inactivity equation Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-22 15:09:18 UTC (rev 4205) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-04-24 08:34:43 UTC (rev 4206) @@ -1026,6 +1026,7 @@ isisfish.ssh.askpassphrase.message=Entrez la passphrase pour la clé '%s' \: isisfish.ssh.askpassphrase.title=Déverrouillage de clé SSH isisfish.ssh.askpassphrase.wrongpassphrase=Mauvaise clé, entrez une nouvelle passphrase '%s' \: +isisfish.status.screenshot=Prendre une captures d'écran isisfish.strategy.comments=Commentaires isisfish.strategy.inactivity=Equation d'inactivité isisfish.strategy.inactivityEquationUsed=Utiliser une équation d'inactivité Added: trunk/src/main/resources/icons/camera.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/icons/camera.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0