Isis-fish-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
April 2009
- 7 participants
- 108 discussions
r2122 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier@users.labs.libre-entreprise.org 20 Apr '09
by chatellier@users.labs.libre-entreprise.org 20 Apr '09
20 Apr '09
Author: chatellier
Date: 2009-04-20 08:49:22 +0000 (Mon, 20 Apr 2009)
New Revision: 2122
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
Log:
Fix unused import, undocumented commented code...
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122)
@@ -1,7 +1,6 @@
<!--
/* *##%
- * Copyright (C) 2005
- * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -16,47 +15,30 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
-
-
- <!--
- + Gear
- +-->
+ *##%*/ -->
<fr.ifremer.isisfish.ui.input.InputContentUI>
<script><![CDATA[
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.GearImpl;
import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
+// constructor code
getVerifier().addCurrentPanel(this);
setButtonTitle(_("isisfish.input.continueMetiers"));
setNextPath("$root/$metiers");
+
+// refresh
public void refresh() {
- if (isSens()){
+ if (isSens()) {
gearTab.addChangeListener(new SensitivityTabbedPaneListener());
} else {
gearTab.addChangeListener(new InputTabbedPaneListener());
}
- getVerifier().addCurrentPanel(selectivityUI ,gearTabUI);
+ getVerifier().addCurrentPanel(selectivityUI, gearTabUI);
}
]]></script>
<JPanel id='body' layout='{new BorderLayout()}'>
<JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear">
- <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab>
+ <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab>
<tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab>
</JTabbedPane>
</JPanel>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122)
@@ -1,7 +1,6 @@
<!--
/* *##%
- * Copyright (C) 2005
- * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -16,21 +15,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
+ *##%*/ -->
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
-
<fr.ifremer.isisfish.ui.input.InputContentUI>
<!-- bean property -->
@@ -45,8 +31,6 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -106,9 +90,10 @@
}
return result;
}
-protected void useEquationChanged(){
- if (getPopInfo() != null)
+protected void useEquationChanged() {
+ if (getPopInfo() != null) {
getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected());
+ }
if (fieldUseEquationMigration.isSelected()){
((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation");
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122)
@@ -1,7 +1,6 @@
<!--
/* *##%
- * Copyright (C) 2005
- * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -16,20 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
+ *##%*/ -->
<fr.ifremer.isisfish.ui.input.InputContentUI>
<!-- bean property -->
@@ -39,29 +25,17 @@
<Boolean id='selectivityPopulationSelected' javaBean='false'/>
- <script>
- <![CDATA[
-
+ <script><![CDATA[
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
-import fr.ifremer.isisfish.entities.Gear;
-import fr.ifremer.isisfish.entities.GearImpl;
import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Formule;
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
import javax.swing.table.DefaultTableModel;
import fr.ifremer.isisfish.entities.Selectivity;
-import fr.ifremer.isisfish.entities.GearImpl;
import fr.ifremer.isisfish.entities.Equation;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.persistence.TopiaEntity;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.MetierImpl;
+// TODO why it's commented ? to remove ?
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -98,8 +72,9 @@
public void mouseExited(MouseEvent e) {
}
});
-public void refresh(){
- if (getBean() != null){
+
+public void refresh() {
+ if (getBean() != null) {
setSelectivityTableModel();
fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
}
@@ -107,16 +82,17 @@
remove.setEnabled(false);
}
+
protected void setSelectivityTableModel() {
DefaultTableModel model = new DefaultTableModel() {
@Override
- public boolean isCellEditable(int row, int column) {
- boolean result = false;
- if (column > 0) {
- result =true;
- }
- return result;
+ public boolean isCellEditable(int row, int column) {
+ boolean result = false;
+ if (column > 0) {
+ result =true;
}
+ return result;
+ }
};
Collection<Selectivity> selectivity = getBean().getPopulationSelectivity();
java.util.List<Population> populations = new ArrayList<Population>();
@@ -134,15 +110,18 @@
EquationTableEditor cellEditor = new EquationTableEditor();
selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor);
}
+
protected void add() {
getAction().addSelectivity((Population)getPopulation(), selectivityEquation.getEditor().getText(), getBean());
setSelectivityTableModel();
}
+
protected void remove() {
getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0)));
setSelectivityTableModel();
}
-protected DefaultComboBoxModel getSelectivityPopulationModel(){
+
+protected DefaultComboBoxModel getSelectivityPopulationModel() {
java.util.List<Species> species = getRegion().getSpecies();
DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel();
if (species != null) {
@@ -157,13 +136,13 @@
}
return selectivityPopulationModel;
}
-protected void selectivityChanged(){
+
+protected void selectivityChanged() {
setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null);
setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue());
add.setEnabled(isSelectivityPopulationSelected());
}
- ]]>
- </script>
+ ]]></script>
<Table id='body'>
<row>
<cell fill='both' weightx='1.0' weighty='1.0'>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122)
@@ -1,7 +1,6 @@
<!--
/* *##%
- * Copyright (C) 2005
- * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -16,39 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
+ *##%*/ -->
<fr.ifremer.isisfish.ui.input.InputContentUI>
<!-- bean property -->
<fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/>
- <script>
- <![CDATA[
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.MetierImpl;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.PopulationImpl;
+ <script><![CDATA[
import fr.ifremer.isisfish.entities.Gear;
import fr.ifremer.isisfish.entities.GearImpl;
-import fr.ifremer.isisfish.entities.Species;
+// TODO why it's commented ? to remove ?
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -61,17 +38,17 @@
}
}
});
+
+// refresh
public void refresh(){
getVerifier().setSaveButton(save);
getVerifier().setCancelButton(cancel);
setBean(null);
Gear gear = (Gear)getVerifier().getEntity(Gear.class);
setBean((GearImpl) gear);
-
getVerifier().addCurrentPanel(editor);
}
- ]]>
- </script>
+ ]]></script>
<Table id='body'>
<row>
<cell fill='both' weightx='1.0' weighty='1.0'>
1
0
r2121 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util
by chatellier@users.labs.libre-entreprise.org 20 Apr '09
by chatellier@users.labs.libre-entreprise.org 20 Apr '09
20 Apr '09
Author: chatellier
Date: 2009-04-20 07:54:12 +0000 (Mon, 20 Apr 2009)
New Revision: 2121
Modified:
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java
Log:
Do test in "target" directory.
Remove created directory after tests
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-04-18 10:25:47 UTC (rev 2120)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-04-20 07:54:12 UTC (rev 2121)
@@ -105,7 +105,7 @@
*/
@Test
public void testCompile() throws IOException, ClassNotFoundException {
- File f = File.createTempFile("testCompile", ".java");
+ File f = File.createTempFile("testCompile", ".java", TestUtils.getTargetdir());
String filename = FileUtil.basename(f, ".java");
String code = getFirstClassContent(filename);
FileUtil.writeString(f, code);
@@ -138,12 +138,12 @@
@Test
public void testCompileDepend() throws IOException, ClassNotFoundException {
- File fA = File.createTempFile("testCompileA", ".java");
+ File fA = File.createTempFile("testCompileA", ".java", TestUtils.getTargetdir());
String filenameA = FileUtil.basename(fA, ".java");
String codeA = getFirstClassContent(filenameA);
FileUtil.writeString(fA, codeA);
- File fB = File.createTempFile("testCompileB", ".java");
+ File fB = File.createTempFile("testCompileB", ".java", TestUtils.getTargetdir());
String filenameB = FileUtil.basename(fB, ".java");
String codeB = getSecondClassContent(filenameB, filenameA);
FileUtil.writeString(fB, codeB);
@@ -177,5 +177,6 @@
fclassB.delete();
fA.delete();
fB.delete();
+ FileUtil.deleteRecursively(dest);
}
}
1
0
r2120 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by bpoussin@users.labs.libre-entreprise.org 18 Apr '09
by bpoussin@users.labs.libre-entreprise.org 18 Apr '09
18 Apr '09
Author: bpoussin
Date: 2009-04-18 10:25:47 +0000 (Sat, 18 Apr 2009)
New Revision: 2120
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java
Log:
correction bug de TopiaContext. On utilisait certaine fois le
context de simulation alors que le SimulationStorage n'etait pas
celui de la simulation. Un test a ete ajoute pour eviter cette erreur
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-04-17 12:26:08 UTC (rev 2119)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-04-18 10:25:47 UTC (rev 2120)
@@ -84,11 +84,11 @@
/** to use log facility, just put in your code: log.info(\"...\"); */
static private Log log = LogFactory.getLog(ResultStorage.class);
-
+
protected SimulationStorage simulation = null;
// transient protected HashMap<String, MatrixND> globalMatrix = new HashMap<String, MatrixND>();
transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK);
-
+
/** cache to maintains some result. key: String(date + ':' + name), value: matrix
* TODO: cache will be more efficient if it keep at min the number of result by year */
transient protected ReferenceMap cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
@@ -105,7 +105,7 @@
public ResultStorage(SimulationStorage simulation) {
this.simulation = simulation;
}
-
+
protected void putInCache(Date date, String name, MatrixND mat, TopiaContext context) {
String key = date + ":" + name;
putInCache(key, mat, context);
@@ -142,8 +142,13 @@
if (availableResult == null) {
availableResult = new HashSet<String>();
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
+
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
@@ -165,7 +170,7 @@
}
return availableResult;
}
-
+
/**
* Verifie si un resultat est disponible pour une date donnée
* @param date
@@ -186,7 +191,7 @@
String key = date.getDate() + ":" + name;
getAvailableResult().add(key);
}
-
+
/**
* Permet de savoir si lorsque l'on ajoutera ce resultat, il sera
* sauvé ou non.
@@ -195,7 +200,7 @@
name = name.trim();
if (enabledResult == null) {
enabledResult = new HashSet<String>();
-
+
Collection<String> resultEnabled = simulation.getParameter().getResultEnabled();
enabledResult.addAll(resultEnabled);
List<String> exportNames = simulation.getParameter().getExportNames();
@@ -259,7 +264,7 @@
public void addResult(Date date, String name, MatrixND mat) throws IsisFishException{
addResult(false, date, name, mat);
}
-
+
public void addResult(boolean force, Date date, String name, Population pop, MatrixND mat) throws IsisFishException{
if (force || isEnabled(name)) {
doAddResult(date, name + " " + pop, mat);
@@ -271,11 +276,15 @@
doAddResult(date, name, mat);
}
}
-
+
protected void doAddResult(Date date, String name, MatrixND mat) throws IsisFishException{
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
@@ -319,8 +328,12 @@
public void addActiveRule(Date date, Rule rule) throws IsisFishException {
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
@@ -338,9 +351,9 @@
}
} catch (TopiaException eee) {
throw new IsisFishException("Can't add result", eee);
- }
+ }
}
-
+
/**
* Retourne la liste de tous les résultats. Si le résultat est categorisé
* par une population alors le nom de la population est automatiquement
@@ -348,19 +361,23 @@
*/
@SuppressWarnings("unchecked")
public List<String> getResultName(){
-
+
List<String> result = null;
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
mustClose = true;
}
ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx);
-
-
+
+
result = (List<String>)resultPS.getContext().find(
"Select distinct name from fr.ifremer.isisfish.entities.Result order by name");
if (mustClose) {
@@ -393,8 +410,12 @@
MatrixND mat = getInCache(date, name);
if (mat == null && isAvailableResult(date, name)) {
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
@@ -413,11 +434,11 @@
if (log.isWarnEnabled()) {
log.warn("Can't return matrix '" + name + "' for date " + date, eee);
}
- }
+ }
}
return mat;
}
-
+
/**
* Retourne la matrice stocke pour un pas de temps
* @param date le pas de temps que l'on souhaite
@@ -435,12 +456,12 @@
if (result != null) {
mat = result.getMatrix();
putInCache(date, name, mat, tx);
- }
+ }
} catch (Exception eee) {
if (log.isWarnEnabled()) {
log.warn("Can't return matrix '" + name + "' for date " + date, eee);
}
- }
+ }
}
return mat;
}
@@ -462,8 +483,12 @@
public MatrixND getMatrix(String name){
MatrixND resultMat = null;
try {
- TopiaContext tx = SimulationContext.get().getDbResult();
- boolean mustClose = false;
+ TopiaContext tx = null;
+ boolean mustClose = false;
+
+ if (simulation == SimulationContext.get().getSimulationStorage()) {
+ tx = SimulationContext.get().getDbResult();
+ }
if (tx == null) {
// not in simulation, create transaction
tx = simulation.getStorage().beginTransaction();
@@ -485,7 +510,7 @@
}
return resultMat;
}
-
+
/**
* Retourne une matrice contenant tous les pas de temps.
* @param name le nom des resultats dont on veut une matrice globale.
@@ -557,7 +582,7 @@
log.trace("Ajout de la semantics: "+ Arrays.asList(mattmp.getSemantics()));
}
-
+
for(int s=0; s<mattmp.getNbDim(); s++){
sem[s+1].addAll(mattmp.getSemantics(s));
}
@@ -598,7 +623,7 @@
* @return
*/
public Date getLastDate() {
- int monthNumber = simulation.getParameter().getNumberOfYear() * Month.NUMBER_OF_MONTH;
+ int monthNumber = simulation.getParameter().getNumberOfYear() * Month.NUMBER_OF_MONTH;
Date result = new Date(monthNumber - 1); // -1 because date begin at 0
return result;
}
@@ -678,4 +703,3 @@
// }
} // ResultStorage
-
1
0
Author: chatellier
Date: 2009-04-17 12:26:08 +0000 (Fri, 17 Apr 2009)
New Revision: 2119
Modified:
isis-fish/trunk/pom.xml
Log:
Fix scm values
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-04-17 10:31:30 UTC (rev 2118)
+++ isis-fish/trunk/pom.xml 2009-04-17 12:26:08 UTC (rev 2119)
@@ -535,9 +535,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection>
- <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection>
- <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url>
+ <connection>${maven.scm.connection}</connection>
+ <developerConnection>${maven.scm.developerConnection}</developerConnection>
+ <url>${maven.scm.url}</url>
</scm>
<!--Code Lutin Repository-->
1
0
Author: chatellier
Date: 2009-04-17 10:31:30 +0000 (Fri, 17 Apr 2009)
New Revision: 2118
Modified:
isis-fish/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-04-17 10:31:26 UTC (rev 2117)
+++ isis-fish/trunk/pom.xml 2009-04-17 10:31:30 UTC (rev 2118)
@@ -13,7 +13,7 @@
<groupId>ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>3.2.0.4-rc3</version>
+ <version>3.2.0.4-rc4-SNAPSHOT</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
@@ -535,9 +535,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection>
- <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection>
- <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url>
+ <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection>
+ <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection>
+ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/trunk…</url>
</scm>
<!--Code Lutin Repository-->
1
0
r2117 - in isis-fish/tags: . isis-fish-3.2.0.4-rc3 isis-fish-3.2.0.4-rc3/src/main/resources/i18n
by chatellier@users.labs.libre-entreprise.org 17 Apr '09
by chatellier@users.labs.libre-entreprise.org 17 Apr '09
17 Apr '09
Author: chatellier
Date: 2009-04-17 10:31:26 +0000 (Fri, 17 Apr 2009)
New Revision: 2117
Added:
isis-fish/tags/isis-fish-3.2.0.4-rc3/
isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml
isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties
Removed:
isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml
isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
[maven-release-plugin] copy for tag isis-fish-3.2.0.4-rc3
Copied: isis-fish/tags/isis-fish-3.2.0.4-rc3 (from rev 2114, isis-fish/trunk)
Deleted: isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-04-17 09:49:29 UTC (rev 2114)
+++ isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml 2009-04-17 10:31:26 UTC (rev 2117)
@@ -1,738 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <!-- ************************************************************* -->
- <!-- *** POM Relationships *************************************** -->
- <!-- ************************************************************* -->
- <parent>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinproject</artifactId>
- <version>3.4</version>
- </parent>
-
- <groupId>ifremer</groupId>
- <artifactId>isis-fish</artifactId>
- <version>3.2.0.4-rc3-SNAPSHOT</version>
-
- <!-- POM Relationships : Inheritance : Dependencies -->
- <dependencies>
-
- <!--Compile-->
- <!--Librairies CodeLutin-->
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
- <version>${lutinutil.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin.topia</groupId>
- <artifactId>topia-persistence</artifactId>
- <version>${topia.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>topia-service</artifactId>
- <version>${topia.service.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinmatrix</artifactId>
- <version>${lutinmatrix.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinwidget</artifactId>
- <version>${lutinwidget.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Jaxx-->
- <dependency>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>jaxx-runtime-swing</artifactId>
- <version>${jaxx.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>jaxx-runtime-validator</artifactId>
- <version>${jaxx.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Utilisé dans les scripts -->
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinj2r</artifactId>
- <version>${lutinj2r.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Commons-->
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Other-->
- <dependency>
- <groupId>jfreechart</groupId>
- <artifactId>jfreechart</artifactId>
- <version>0.9.3</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>jcommon</groupId>
- <artifactId>jcommon</artifactId>
- <version>0.7.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- XML-RPC Client and server (don't try 3.1.1) -->
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>${xmlrpc.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-server</artifactId>
- <version>${xmlrpc.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- encore utilise pour les pre-scripts -->
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>openmap</groupId>
- <artifactId>openmap</artifactId>
- <version>${openmap.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-common</artifactId>
- <version>${sshtool.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-core</artifactId>
- <version>${sshtool.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.38</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Utilisé lors de l'import xml v2 (entre autre) -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Change this dependence if you change database -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.110</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- aspectwerkz -->
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz-jdk5</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz-core</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- ssj pour les calculs stockastiques -->
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>ssj</artifactId>
- <version>2.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>Blas</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>colt</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>interpreter</artifactId>
- <version>1.6.8</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>language</artifactId>
- <version>1.6.7</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>logger</artifactId>
- <version>1.6.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>optimization</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
- <!-- fin ssj pour les calculs stockastiques -->
-
- <!-- debut svnkit pour communication subversion -->
- <dependency>
- <groupId>org.tmatesoft</groupId>
- <artifactId>svnkit</artifactId>
- <version>1.2.3.5521</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.trilead</groupId>
- <artifactId>trilead-ssh2</artifactId>
- <version>build213-svnkit-1.2</version>
- <scope>runtime</scope>
- </dependency>
- <!-- fin svnkit pour communication subversion -->
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.15</version>
- </dependency>
- </dependencies>
-
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
- <name>IsisFish</name>
- <description>Simulateur de pecherie complexe.</description>
- <inceptionYear>1999</inceptionYear>
-
- <licenses>
- <license>
- <name>GPL</name>
- <url>http://www.gnu.org/copyleft/gpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
- <packaging>jar</packaging>
-
- <properties>
- <!-- id du projet du labs -->
- <labs.id>8</labs.id>
-
- <!-- nom du projet du labs -->
- <labs.project>isis-fish</labs.project>
-
- <!-- Custom version -->
- <jaxx.version>1.3</jaxx.version>
- <topia.version>2.1.4</topia.version>
- <topia.service.version>1.0.2</topia.service.version>
- <lutinmatrix.version>1.3</lutinmatrix.version>
- <lutinutil.version>1.0.4</lutinutil.version>
- <i18n.version>0.9</i18n.version>
- <lutinwidget.version>0.14</lutinwidget.version>
- <generator.version>0.64</generator.version>
- <lutinj2r.version>0.3</lutinj2r.version>
- <jrst.version>0.8.4</jrst.version>
- <license-switcher.version>0.6</license-switcher.version>
- <openmap.version>4.6.4</openmap.version>
- <aspectwerkz.version>2.0</aspectwerkz.version>
- <sshtool.version>0.2.2</sshtool.version>
- <xmlrpc.version>3.1</xmlrpc.version>
- <javadoc.version>2.5</javadoc.version>
-
- <!-- for compilation test to run -->
- <maven.test.forkMode>once</maven.test.forkMode>
-
- <!--Main class in JAR -->
- <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>
-
- <!-- jnlp -->
- <keystorepath>${codelutin.keystorepath}</keystorepath>
- <keystorealias>CodeLutin</keystorealias>
- <keystorepass>codelutin</keystorepass>
- <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory>
-
- <jnlpCodebase>${project.url}</jnlpCodebase>
- <!-- to test jnlp file locally -->
- <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-generator-plugin</artifactId>
- <version>${generator.version}</version>
- <executions>
- <execution>
- <id>Generator</id>
- <phase>generate-sources</phase>
- <configuration>
- <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml>
- <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>
- <fullPackagePath>fr.ifremer.isisfish</fullPackagePath>
- <extractedPackages>fr.ifremer.isisfish</extractedPackages>
- <!--Config generator-->
- <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest>
- <includes>**/*.objectmodel</includes>
- <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates>
- <excludeTemplates>
- <value>org.codelutin.topia.generator.EntityEnumGenerator</value>
- <value>org.codelutin.topia.generator.EntityProviderGenerator</value>
- </excludeTemplates>
- <destDirGen>${maven.gen.dir}/java</destDirGen>
- <defaultPackage>fr.ifremer.isisfish</defaultPackage>
- <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME%
- </copyVersionDir>
- <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
- <copyOverwrite>true</copyOverwrite>
- </configuration>
- <goals>
- <goal>zargo2xmi</goal>
- <goal>xmi2objectmodel</goal>
- <goal>generate</goal>
- <goal>copyVersionFiles</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codelutin.topia</groupId>
- <artifactId>topia-persistence</artifactId>
- <version>${topia.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
- <version>${jaxx.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <extraImports>
- <value>jaxx.runtime.SwingUtil</value>
- <value>static jaxx.runtime.Util.getStringValue</value>
- </extraImports>
- <addSourcesToClassPath>true</addSourcesToClassPath>
- <addProjectClassPath>true</addProjectClassPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-i18n-plugin</artifactId>
- <version>${i18n.version}</version>
- <configuration>
- <entries>
- <entry>
- <basedir>${maven.gen.dir}/java/</basedir>
- <specificGoal>parserJava</specificGoal>
- <!-- <includes>
- <param>**\/**UI.java</param>
- </includes> -->
- </entry>
- </entries>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Always process jrst files, but only called on pre-site phase -->
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-jrst-plugin</artifactId>
- <version>${jrst.version}</version>
- <configuration>
- <defaultLocale>fr</defaultLocale>
- </configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>jrst</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <links>
- <link>http://java.sun.com/javase/6/docs/api/</link>
- <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link>
- <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link>
- <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <!-- ************************************************************* -->
- <!-- *** Build Environment ************************************** -->
- <!-- ************************************************************* -->
- <scm>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- <url>${maven.scm.url}</url>
- </scm>
-
- <!--Code Lutin Repository-->
- <repositories>
- <repository>
- <id>codelutin-repository</id>
- <name>CodeLutinRepository</name>
- <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- </repository>
- </repositories>
-
- <profiles>
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
-
- <!-- always add license and third-party files to classpath -->
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-license-switcher-plugin</artifactId>
- <version>${license-switcher.version}</version>
- <configuration>
- <licenseName>${license-switcher.licenseName}</licenseName>
- </configuration>
- <executions>
- <execution>
- <id>attach-licenses</id>
- <goals>
- <goal>license</goal>
- <goal>third-party</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- Ajout des libs signe par Sun dans un fichier jnlp separe -->
- <execution>
- <id>JnlpSun</id>
- <phase>verify</phase>
- <configuration>
- <tasks>
- <mkdir dir="${jnlp.build.directory}" />
- <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
- <filterset>
- <filter token="lib-javahelp" value="javahelp-2.0.02.jar" />
- <filter token="lib-activation" value="activation-1.1.jar" />
- <filter token="lib-mail" value="mail-1.4.jar" />
- <filter token="url" value="${jnlpCodebase}" />
- </filterset>
- </copy>
- <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
- <filterset>
- <filter token="lib" value="jxlayer-3.0.1.jar" />
- <filter token="url" value="${jnlpCodebase}" />
- </filterset>
- </copy>
-
- <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false">
- <fileset dir="${project.build.directory}/lib">
- <include name="javahelp-2.0.02.jar" />
- <include name="activation-1.1.jar" />
- <include name="mail-1.4.jar" />
- <include name="jxlayer-3.0.1.jar" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>JnlpToSite</id>
- <phase>pre-site</phase>
- <configuration>
- <tasks>
- <mkdir dir="${maven.site.gen.dir}/resources" />
- <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false">
- <fileset dir="${jnlp.build.directory}">
- <include name="**" />
- </fileset>
- <!-- should be better to use the deployed assembly in lutinbuilder ? -->
- <fileset dir="target">
- <include name="${project.build.finalName}-bin.zip" />
- </fileset>
-
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-alpha-2-cl_20090204</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>jnlp-inline</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <force>false</force>
- <dependencies>
- <excludes>
- <exclude>javax.help:javahelp</exclude>
- <exclude>javax.mail:mail</exclude>
- <exclude>javax.activation:activation</exclude>
- <exclude>org.swinglabs:jxlayer</exclude>
- </excludes>
- </dependencies>
- <libPath>lib</libPath>
- <extensions>
- <sun>sun.jnlp</sun>
- <jxlayer>jxlayer.jnlp</jxlayer>
- </extensions>
- <jnlp>
- <outputFile>isis-fish-v3.jnlp</outputFile>
- <mainClass>${maven.jar.main.class}</mainClass>
- <allPermissions>true</allPermissions>
- <offlineAllowed>true</offlineAllowed>
- </jnlp>
-
- <sign>
- <keystore>${keystorepath}</keystore>
- <keypass />
- <storepass>${keystorepass}</storepass>
- <storetype />
- <alias>${keystorealias}</alias>
- <validity />
- <dnameCn />
- <dnameOu />
- <dnameO />
- <dnameL />
- <dnameSt />
- <dnameC />
- <verify>true</verify>
- <keystoreConfig>
- <delete>false</delete>
- <gen>false</gen>
- </keystoreConfig>
- </sign>
- <pack200>false</pack200>
- <gzip>true</gzip>
- <verbose>false</verbose>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
Copied: isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml (from rev 2116, isis-fish/trunk/pom.xml)
===================================================================
--- isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml (rev 0)
+++ isis-fish/tags/isis-fish-3.2.0.4-rc3/pom.xml 2009-04-17 10:31:26 UTC (rev 2117)
@@ -0,0 +1,738 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
+ <parent>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinproject</artifactId>
+ <version>3.4</version>
+ </parent>
+
+ <groupId>ifremer</groupId>
+ <artifactId>isis-fish</artifactId>
+ <version>3.2.0.4-rc3</version>
+
+ <!-- POM Relationships : Inheritance : Dependencies -->
+ <dependencies>
+
+ <!--Compile-->
+ <!--Librairies CodeLutin-->
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinutil</artifactId>
+ <version>${lutinutil.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin.topia</groupId>
+ <artifactId>topia-persistence</artifactId>
+ <version>${topia.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>topia-service</artifactId>
+ <version>${topia.service.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinmatrix</artifactId>
+ <version>${lutinmatrix.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinwidget</artifactId>
+ <version>${lutinwidget.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Jaxx-->
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-swing</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-validator</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Utilisé dans les scripts -->
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinj2r</artifactId>
+ <version>${lutinj2r.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Commons-->
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-math</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Other-->
+ <dependency>
+ <groupId>jfreechart</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>0.9.3</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jcommon</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>0.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- XML-RPC Client and server (don't try 3.1.1) -->
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-client</artifactId>
+ <version>${xmlrpc.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-server</artifactId>
+ <version>${xmlrpc.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- encore utilise pour les pre-scripts -->
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>openmap</groupId>
+ <artifactId>openmap</artifactId>
+ <version>${openmap.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-common</artifactId>
+ <version>${sshtool.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-core</artifactId>
+ <version>${sshtool.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.38</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Utilisé lors de l'import xml v2 (entre autre) -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Change this dependence if you change database -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.110</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- aspectwerkz -->
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz-jdk5</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz-core</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- ssj pour les calculs stockastiques -->
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>ssj</artifactId>
+ <version>2.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>Blas</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>colt</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>interpreter</artifactId>
+ <version>1.6.8</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>language</artifactId>
+ <version>1.6.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>logger</artifactId>
+ <version>1.6.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>optimization</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- fin ssj pour les calculs stockastiques -->
+
+ <!-- debut svnkit pour communication subversion -->
+ <dependency>
+ <groupId>org.tmatesoft</groupId>
+ <artifactId>svnkit</artifactId>
+ <version>1.2.3.5521</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.trilead</groupId>
+ <artifactId>trilead-ssh2</artifactId>
+ <version>build213-svnkit-1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- fin svnkit pour communication subversion -->
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.15</version>
+ </dependency>
+ </dependencies>
+
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
+ <name>IsisFish</name>
+ <description>Simulateur de pecherie complexe.</description>
+ <inceptionYear>1999</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>GPL</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Settings ****************************************** -->
+ <!-- ************************************************************* -->
+ <packaging>jar</packaging>
+
+ <properties>
+ <!-- id du projet du labs -->
+ <labs.id>8</labs.id>
+
+ <!-- nom du projet du labs -->
+ <labs.project>isis-fish</labs.project>
+
+ <!-- Custom version -->
+ <jaxx.version>1.3</jaxx.version>
+ <topia.version>2.1.4</topia.version>
+ <topia.service.version>1.0.2</topia.service.version>
+ <lutinmatrix.version>1.3</lutinmatrix.version>
+ <lutinutil.version>1.0.4</lutinutil.version>
+ <i18n.version>0.9</i18n.version>
+ <lutinwidget.version>0.14</lutinwidget.version>
+ <generator.version>0.64</generator.version>
+ <lutinj2r.version>0.3</lutinj2r.version>
+ <jrst.version>0.8.4</jrst.version>
+ <license-switcher.version>0.6</license-switcher.version>
+ <openmap.version>4.6.4</openmap.version>
+ <aspectwerkz.version>2.0</aspectwerkz.version>
+ <sshtool.version>0.2.2</sshtool.version>
+ <xmlrpc.version>3.1</xmlrpc.version>
+ <javadoc.version>2.5</javadoc.version>
+
+ <!-- for compilation test to run -->
+ <maven.test.forkMode>once</maven.test.forkMode>
+
+ <!--Main class in JAR -->
+ <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>
+
+ <!-- jnlp -->
+ <keystorepath>${codelutin.keystorepath}</keystorepath>
+ <keystorealias>CodeLutin</keystorealias>
+ <keystorepass>codelutin</keystorepass>
+ <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory>
+
+ <jnlpCodebase>${project.url}</jnlpCodebase>
+ <!-- to test jnlp file locally -->
+ <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-generator-plugin</artifactId>
+ <version>${generator.version}</version>
+ <executions>
+ <execution>
+ <id>Generator</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml>
+ <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>
+ <fullPackagePath>fr.ifremer.isisfish</fullPackagePath>
+ <extractedPackages>fr.ifremer.isisfish</extractedPackages>
+ <!--Config generator-->
+ <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest>
+ <includes>**/*.objectmodel</includes>
+ <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates>
+ <excludeTemplates>
+ <value>org.codelutin.topia.generator.EntityEnumGenerator</value>
+ <value>org.codelutin.topia.generator.EntityProviderGenerator</value>
+ </excludeTemplates>
+ <destDirGen>${maven.gen.dir}/java</destDirGen>
+ <defaultPackage>fr.ifremer.isisfish</defaultPackage>
+ <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME%
+ </copyVersionDir>
+ <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
+ <copyOverwrite>true</copyOverwrite>
+ </configuration>
+ <goals>
+ <goal>zargo2xmi</goal>
+ <goal>xmi2objectmodel</goal>
+ <goal>generate</goal>
+ <goal>copyVersionFiles</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codelutin.topia</groupId>
+ <artifactId>topia-persistence</artifactId>
+ <version>${topia.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>maven-jaxx-plugin</artifactId>
+ <version>${jaxx.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <extraImports>
+ <value>jaxx.runtime.SwingUtil</value>
+ <value>static jaxx.runtime.Util.getStringValue</value>
+ </extraImports>
+ <addSourcesToClassPath>true</addSourcesToClassPath>
+ <addProjectClassPath>true</addProjectClassPath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-i18n-plugin</artifactId>
+ <version>${i18n.version}</version>
+ <configuration>
+ <entries>
+ <entry>
+ <basedir>${maven.gen.dir}/java/</basedir>
+ <specificGoal>parserJava</specificGoal>
+ <!-- <includes>
+ <param>**\/**UI.java</param>
+ </includes> -->
+ </entry>
+ </entries>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>parserJava</goal>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Always process jrst files, but only called on pre-site phase -->
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-jrst-plugin</artifactId>
+ <version>${jrst.version}</version>
+ <configuration>
+ <defaultLocale>fr</defaultLocale>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>jrst</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/javase/6/docs/api/</link>
+ <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link>
+ <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link>
+ <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Environment ************************************** -->
+ <!-- ************************************************************* -->
+ <scm>
+ <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection>
+ <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection>
+ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url>
+ </scm>
+
+ <!--Code Lutin Repository-->
+ <repositories>
+ <repository>
+ <id>codelutin-repository</id>
+ <name>CodeLutinRepository</name>
+ <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>release-profile</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <!-- always add license and third-party files to classpath -->
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-license-switcher-plugin</artifactId>
+ <version>${license-switcher.version}</version>
+ <configuration>
+ <licenseName>${license-switcher.licenseName}</licenseName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-licenses</id>
+ <goals>
+ <goal>license</goal>
+ <goal>third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Ajout des libs signe par Sun dans un fichier jnlp separe -->
+ <execution>
+ <id>JnlpSun</id>
+ <phase>verify</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${jnlp.build.directory}" />
+ <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
+ <filterset>
+ <filter token="lib-javahelp" value="javahelp-2.0.02.jar" />
+ <filter token="lib-activation" value="activation-1.1.jar" />
+ <filter token="lib-mail" value="mail-1.4.jar" />
+ <filter token="url" value="${jnlpCodebase}" />
+ </filterset>
+ </copy>
+ <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
+ <filterset>
+ <filter token="lib" value="jxlayer-3.0.1.jar" />
+ <filter token="url" value="${jnlpCodebase}" />
+ </filterset>
+ </copy>
+
+ <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false">
+ <fileset dir="${project.build.directory}/lib">
+ <include name="javahelp-2.0.02.jar" />
+ <include name="activation-1.1.jar" />
+ <include name="mail-1.4.jar" />
+ <include name="jxlayer-3.0.1.jar" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>JnlpToSite</id>
+ <phase>pre-site</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${maven.site.gen.dir}/resources" />
+ <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false">
+ <fileset dir="${jnlp.build.directory}">
+ <include name="**" />
+ </fileset>
+ <!-- should be better to use the deployed assembly in lutinbuilder ? -->
+ <fileset dir="target">
+ <include name="${project.build.finalName}-bin.zip" />
+ </fileset>
+
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <version>1.0-alpha-2-cl_20090204</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <force>false</force>
+ <dependencies>
+ <excludes>
+ <exclude>javax.help:javahelp</exclude>
+ <exclude>javax.mail:mail</exclude>
+ <exclude>javax.activation:activation</exclude>
+ <exclude>org.swinglabs:jxlayer</exclude>
+ </excludes>
+ </dependencies>
+ <libPath>lib</libPath>
+ <extensions>
+ <sun>sun.jnlp</sun>
+ <jxlayer>jxlayer.jnlp</jxlayer>
+ </extensions>
+ <jnlp>
+ <outputFile>isis-fish-v3.jnlp</outputFile>
+ <mainClass>${maven.jar.main.class}</mainClass>
+ <allPermissions>true</allPermissions>
+ <offlineAllowed>true</offlineAllowed>
+ </jnlp>
+
+ <sign>
+ <keystore>${keystorepath}</keystore>
+ <keypass />
+ <storepass>${keystorepass}</storepass>
+ <storetype />
+ <alias>${keystorealias}</alias>
+ <validity />
+ <dnameCn />
+ <dnameOu />
+ <dnameO />
+ <dnameL />
+ <dnameSt />
+ <dnameC />
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>true</gzip>
+ <verbose>false</verbose>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Deleted: isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-17 09:49:29 UTC (rev 2114)
+++ isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-17 10:31:26 UTC (rev 2117)
@@ -1,1050 +0,0 @@
-Add\ to\ %s\ queue=
-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\:\ =
-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\ file=
-Can't\ evaluate\ simulation\ prescript=
-Can't\ export\ simulation\ %s=
-Can't\ get\ changlog=Impossible d'obtenir de 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
-Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default=
-Can't\ instantiate\ %s=
-Can't\ open\ log\ for\ %s=
-Can't\ simulate\ %s=
-Check\ state\ of\ local\ repository\:\ %s=
-Check\ syntax\ of\ the\ current\ script=
-Checkout\ pom.xml\ to\ %s=
-Command\ '%s'\ fail\ to\ execute=
-Commit\ script\ to\ CVS\ server=
-Copy\ current\ selection\ (Ctrl-c)=
-Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s=
-Create\ a\ new\ script=
-Cut\ current\ selection\ (Ctrl-x)=
-Error\ during\ vcs\ initialisation=
-Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys=
-Export\ selected\ script(s)\ to\ zip\ archive=
-Generate\ next\ simulation=
-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=
-Info=Info
-Jobs\ submited\ is\ not\ ItemSimulation\ but\ was\ %s=
-Last\ entry\ was\ %s\ extract\ name\ %s=
-Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)=
-Local\ repository\ don't\ exist=
-Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s=
-Master\ plan=
-Month\ Gap\ BetweenRepro\ Recruitment=
-Normal\ stop\ thread,\ this\ is\ not\ an\ error=
-Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
-Paste\ current\ selection\ (Ctrl-v)=
-Process\ template\ error=
-Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import=
-Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e
-Remote\ IsisFish\ server=
-Remote\ control\ file\ doesn't\ exists\ %s=
-Rename\ data\ directory\ to\ %s=
-Save\ current\ script=
-Show\ help=
-SimulationExecutor\ started\ with\ %s\ thread\ for\ %s=
-Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to=
-Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s=
-Stop\ the\ process=
-SubProcess\ start\:\ %s\ %s=
-Switch\ repository\ type\ to\ none=
-The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.=
-Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)=
-Try\ to\ log\ on\ %s@%s\:%d=
-Use\ branches,\ switch\ not\ needed=
-User\ stop\ simulation\ %s=
-cant\ start\ nimbus=
-could\ not\ close\ reader\ %1$s=could not close reader %1$s
-could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
-could\ not\ filter\ on\ simulations=could not filter on simulations
-could\ not\ found\ %s=
-could\ not\ found\ log\ file\ %1$s=could not found log file %1$s
-could\ not\ found\ region\ %s=
-could\ not\ found\ simulation\ %s=
-could\ not\ read\ at\ offset\ %1$s\ for\ reason\ %2$s=could not read at offset %1$s for reason %2$s
-destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
-destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite=
-directory\ %s\ must\ be\ a\ directory=
-filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines.
-in\ hour=
-isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html>
-isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme.
-isisfish.about.title=\u00C0 propos de Isis-Fish...
-isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s
-isisfish.advancedParams.freeParameters=Param\u00E8tres libres
-isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies
-isisfish.advancedParams.scriptLevelLogger=Niveau de tracage des scripts
-isisfish.advancedParams.simulLevelLogger=Niveau de tracage du simulateur
-isisfish.advancedParams.simulationCache=Simulation cache
-isisfish.advancedParams.simulationStatistique=Simulation statistique
-isisfish.advancedParams.simulatorUse=Simulateur \u00E0 utiliser
-isisfish.cell.comments=Commentaires
-isisfish.cell.land=Terre
-isisfish.cell.latitude=Latitude
-isisfish.cell.longitude=Longitude
-isisfish.cell.name=Nom
-isisfish.change.equation=Ne peut pas changer l'\u00E9quation
-isisfish.commit.message=Entrer un message de commit
-isisfish.common.add=Ajouter
-isisfish.common.add.short=Aj.
-isisfish.common.alert=alerte
-isisfish.common.apply=Appliquer
-isisfish.common.blank=\
-isisfish.common.cancel=Annuler
-isisfish.common.check=V\u00E9rifier
-isisfish.common.clear=Effacer
-isisfish.common.date=Date
-isisfish.common.debug=Debug
-isisfish.common.ellipsis=...
-isisfish.common.emigration=\u00E9migration
-isisfish.common.empty=vide
-isisfish.common.error=Erreur
-isisfish.common.finish=Terminer
-isisfish.common.gear=Engin
-isisfish.common.immigration=immigration
-isisfish.common.info=Info
-isisfish.common.migration=migration
-isisfish.common.month=mois %1$s
-isisfish.common.name=Nom
-isisfish.common.new=Nouveau
-isisfish.common.newMatrix=Nouvelle matrice
-isisfish.common.next=Suivant
-isisfish.common.ok=Ok
-isisfish.common.openEditor=Ouvrir l'\u00E9diteur
-isisfish.common.populationGroup=Groupe de population
-isisfish.common.populations=Populations
-isisfish.common.port=port
-isisfish.common.prev=Pr\u00E9c\u00E9dent
-isisfish.common.region=R\u00E9gion
-isisfish.common.remove=Supprimer
-isisfish.common.reset=reset
-isisfish.common.rules=R\u00E8gles
-isisfish.common.save=Sauver
-isisfish.common.saveModel=Sauver comme mod\u00E8le
-isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation
-isisfish.common.season=Saison
-isisfish.common.setOfVessels=Ensemble de navires
-isisfish.common.simulate=Simuler
-isisfish.common.stop=Arr\u00EAter
-isisfish.common.strategies=Strat\u00E9gies
-isisfish.common.sum=somme
-isisfish.common.tag=Tag
-isisfish.common.tripType=Type de trajet
-isisfish.common.value=Valeur
-isisfish.common.warn=Warning
-isisfish.common.year=ann\u00E9e
-isisfish.common.zone=Zone
-isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts
-isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser
-isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es
-isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations
-isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation
-isisfish.config.main.defaultMapFile.description=TODO
-isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation
-isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation
-isisfish.config.main.defaultTagValue.description=TODO
-isisfish.config.main.encoding.description=l'encoding du syst\u00E8me
-isisfish.config.main.javadocDirectory.description=
-isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts
-isisfish.config.main.launchUI.description=
-isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement
-isisfish.config.main.locale.description=la locale utilisateur
-isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant
-isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant
-isisfish.config.main.projectName.description=le nom du projet
-isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion
-isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant
-isisfish.config.main.resultExport.description=TODO
-isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=
-isisfish.config.main.simulation.ssh.control.check.interval.description=
-isisfish.config.main.simulation.ssh.datapath.description=
-isisfish.config.main.simulation.ssh.isis.home.description=
-isisfish.config.main.simulation.ssh.login.description=
-isisfish.config.main.simulation.ssh.server.description=
-isisfish.config.main.simulation.ssh.tmppath.description=
-isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant
-isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles avec erreur
-isisfish.config.main.simulationShowOnlyQueue.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles effectu\u00E9es localement
-isisfish.config.main.smtpServer.description=le nom du serveur smtp \u00E0 utiliser pour envoyer les courriels
-isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process
-isisfish.config.main.userMail.description=le courriel de l'utilisateur
-isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur
-isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser
-isisfish.config.vcs.keyFile.description=le chemin complet du fichier de clef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e
-isisfish.config.vcs.localDatabasePath.description=
-isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase
-isisfish.config.vcs.passphrase.description=la passe-phrase utilis\u00E9e pour prot\u00E9ger la clef priv\u00E9e ssh
-isisfish.config.vcs.remoteDatabase.description=le nom du module de donn\u00E9es sur le serveur vcs
-isisfish.config.vcs.remotePath.description=le chemin jusqu'au parent du module de donn\u00E9es sur le serveur vcs
-isisfish.config.vcs.type.description=le type de communication vcs utilis\u00E9
-isisfish.config.vcs.typeRepo.description=le type de r\u00E9pository vcs utilis\u00E9
-isisfish.config.vcs.useSshConnexion.description=pour indiquer si l'on utilise une connexion s\u00E9curis\u00E9e pour communiquer avec le serveur vcs (ssh2)
-isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs
-isisfish.config.vcs.userPassword.description=
-isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel
-isisfish.dataResult.export.csv=Exporter en CSV
-isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton
-isisfish.dataResult.label=label9
-isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable
-isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2
-isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2
-isisfish.date.toString=%1$s %2$s
-isisfish.effortDescription.crewFoodCost=Co\u00FBt de l'alimentation pour l'\u00E9quipage
-isisfish.effortDescription.crewShareRate=Taux de partage de l'\u00E9quipage
-isisfish.effortDescription.crewSize=Taille de l'\u00E9quipage
-isisfish.effortDescription.fishingOperation=Op\u00E9ration de p\u00EAche
-isisfish.effortDescription.fishingOperationDuration=Dur\u00E9e de la p\u00EAche
-isisfish.effortDescription.fixedCrewSalary=Salaire d'\u00E9quipage fixe
-isisfish.effortDescription.gearsNumberPerOperation=Nombre d'engins par op\u00E9ration
-isisfish.effortDescription.landingCosts=Co\u00FBts d'accastillage
-isisfish.effortDescription.otherRunningCost=Autres co\u00FBts
-isisfish.effortDescription.repairAndMaintenanceGearCost=Co\u00FBts de maintenance
-isisfish.effortDescription.title=inputEffortDescription
-isisfish.effortDescription.toString=EffortDescription for %1$s with %2$s
-isisfish.effortDescription.unitCostOfFishing=Co\u00FBt unitaire de la p\u00EAche
-isisfish.equation.editor.title=Editeur d'\u00E9quation
-isisfish.error.acceptable.population=La\t nouvelle valeur n'est pas une valeur valide pour cette population
-isisfish.error.add.card=Erreur lors de l'ajout du r\u00E9sultat \u00E0 la carte.
-isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation
-isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data.
-isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph.
-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.check.region=
-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\u00E9es
-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
-isisfish.error.delete.vcs.files=Can't delete vcs files
-isisfish.error.dialog.message=Une erreur a \u00E9t\u00E9 d\u00E9tect\u00E9e
-isisfish.error.dialog.title=Erreur
-isisfish.error.during.simulation=Error during simulation
-isisfish.error.emigration.negative=emigration negative
-isisfish.error.empty.code.rubbin=le code rubbin est vide
-isisfish.error.empty.emigration=emigration vide
-isisfish.error.empty.id.geographic=l'identifiant g\u00E9ographique est vide
-isisfish.error.empty.immigration=immigration vide
-isisfish.error.empty.migration=Migration vide
-isisfish.error.empty.name=le nom est vide
-isisfish.error.empty.params.name=le nom du param\u00E8tre est vide
-isisfish.error.empty.population=Population est vide
-isisfish.error.empty.scientific.name=le nom scientifique est vide
-isisfish.error.empty.season=info saison vide
-isisfish.error.empty.selectivity=s\u00E9lectivit\u00E9 est vide
-isisfish.error.empty.species=espece capturable vide
-isisfish.error.empty.species.name=le nom d'espece est vide
-isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide
-isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s
-isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s
-isisfish.error.evalute.plan.script=Can't evaluate plan script
-isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1
-isisfish.error.factor.invalid=Le facteur n'est pas valide
-isisfish.error.file.already.exists=The file %1$s already exist
-isisfish.error.get.fisheryRegion=Can't get FisheryRegion
-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\u00E9cente que la version souhait\u00E9e.
-isisfish.error.init.map=Can't init map.
-isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s
-isisfish.error.instanciate=Can't instanciate %1$s
-isisfish.error.instanciate.export=Can't instanciate export %1$s
-isisfish.error.invalid.costs.fix=les co\u00FBts 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'\u00E9quation 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
-isisfish.error.invalid.natural.death=mortalit\u00E9 naturelle sur les classes naissantes invalide
-isisfish.error.invalid.number=le nombre est invalide
-isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable
-isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles
-isisfish.error.invalidate.natural.death=mortalite naturelle invalide
-isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s
-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.load.map=Can't load map 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.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme.
-isisfish.error.migration.negative=Migration negative
-isisfish.error.no.matrix=No matrix for\:
-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\u00E9finit
-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.class=this class does not
-isisfish.error.not.found.code=could not found codeclass for %1$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.found.field.class=could not found field %1$s for class %2$s
-isisfish.error.not.null.class.grown=classe mature vaut nul
-isisfish.error.not.null.mean.weight=poids moyen nul
-isisfish.error.not.null.natiral.death=mortalite naturelle nulle
-isisfish.error.not.possible.metier=Pas de m\u00E9tier possible
-isisfish.error.not.support.class=La classe %s ne supporte pas les descritions
-isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0
-isisfish.error.obtain.analyseplan=Can't obtain description of AnalysePlan
-isisfish.error.obtain.doc.export=Can't obtain @Doc on class Export
-isisfish.error.obtain.doc.resultName=Can't obtain @Doc on ResultName
-isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class
-isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s
-isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s
-isisfish.error.obtain.field.export=Can't obtain field @Doc for Export %1$s
-isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %1$s
-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
-isisfish.error.parse.long=Can't parse long %1$s
-isisfish.error.plan.parameter=Can't get plan parameter from compiled class
-isisfish.error.prepare.data=Can't prepare data
-isisfish.error.prepare.information.simulation=Can't prepare information for simulation
-isisfish.error.read.simulation=Can't read simulation information %1$s
-isisfish.error.read.simulation.parameters=Impossible de lire les param\u00EAtres du fichier \: %1$s
-isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0
-isisfish.error.region.name.empty=Le nom de la R\u00E9gion est vide
-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.region=
-isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s
-isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s
-isisfish.error.script.create=isisfish.error.script.create
-isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s
-isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s
-isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s
-isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s
-isisfish.error.sensitivity.parameter=
-isisfish.error.simulation.log.openAppender=n'a pas pu ouvrir l'appender de la simulation %1$s pour la raison %2$s
-isisfish.error.simulation.remote.global=Impossible de lancer une simulation sur serveur distant
-isisfish.error.simulation.remote.wrongportvalue=Le port de connexion a une valeur incorrecte \: %s
-isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s
-isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s
-isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s
-isisfish.error.source.parameter=Can't get parameter from source
-isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them
-isisfish.error.undefined.classes=pas de classes d\u00E9finies
-isisfish.error.undefined.correspondence.zones.reproduction.recruitment=pas de correspondance entre les zones de reproduction et les zones de recrutement
-isisfish.error.undefined.gear=l'engin n'est pas d\u00E9fini
-isisfish.error.undefined.mesh=aucune maille de d\u00E9fini
-isisfish.error.undefined.mesh.sector=aucune maille dans le secteur
-isisfish.error.undefined.meta.population=aucune meta population de d\u00E9fini
-isisfish.error.undefined.natural.death=pas de mortalit\u00E9 naturelle sur les classes naissantes
-isisfish.error.undefined.sector=aucun secteur de d\u00E9fini
-isisfish.error.undefined.stategy=aucune strat\u00E9gie de d\u00E9fini
-isisfish.error.undefined.stategy.months=La strat\u00E9gie n'est pas d\u00E9finie pour certain mois
-isisfish.error.undefined.zone.population=il n'y a pas de zone de population de d\u00E9finie
-isisfish.error.undefined.zone.recruitment=il n'y a pas de zone de recrutement de d\u00E9finie
-isisfish.error.undefined.zone.reproduction=il n'y a pas de zone de reproduction de d\u00E9finie
-isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s
-isisfish.error.wait.simThread=Can't wait SimThread
-isisfish.error.warning.title=Attention
-isisfish.error.write.simulation=Can't write information %1$s
-isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire
-isisfish.exit.title=Exit
-isisfish.export.directory=Dossier d'export
-isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s
-isisfish.export.title=Export des r\u00E9sultats
-isisfish.factor.coefficient=Co\u00E9fficient (en %)
-isisfish.factor.comment=Commentaires
-isisfish.factor.continue=Facteur continu
-isisfish.factor.discret=Facteur discret
-isisfish.factor.factor=Facteur
-isisfish.factor.firstValue=Premi\u00E8re valeur
-isisfish.factor.increment=Cardinalit\u00E9
-isisfish.factor.lastValue=Derni\u00E8re valeur
-isisfish.factor.name=Nom du facteur
-isisfish.factor.operateur=Op\u00E9rateur
-isisfish.factor.selectDiscretNumber=Nombre de facteurs
-isisfish.factor.title=Saisie d'un facteur
-isisfish.factor.validDiscretNumber=Valider
-isisfish.factor.value=Valeur
-isisfish.filter=Filtrer
-isisfish.filter.apply=Appliquer le filtre
-isisfish.filter.cancel=Annuler
-isisfish.filter.log.levelDebug=debug
-isisfish.filter.log.levelError=erreur
-isisfish.filter.log.levelFatal=fatale
-isisfish.filter.log.levelInfo=info
-isisfish.filter.log.levelTrace=trace
-isisfish.filter.log.levelWarn=warning
-isisfish.filter.log.tooltip.levelDebug=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.levelError=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.levelFatal=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.levelInfo=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.levelTrace=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.levelWarn=s\u00E9lectionner pour filtrer ce niveau
-isisfish.filter.log.tooltip.message=Entrer un terme \u00E0 rechercher et appuyer sur Entr\u00E9e
-isisfish.filter.reset=R\u00E9initialiser
-isisfish.filter.result=R\u00E9sultats
-isisfish.filter.result.found=R\u00E9sultats (%d/%d)
-isisfish.filter.select=S\u00E9lectionner
-isisfish.filter.select.simulation=S\u00E9lectionner une simulation
-isisfish.filter.simulation=Filtrer les simulations
-isisfish.filter.simulation.analysePlanNumber=num\u00E9ro d'analyse
-isisfish.filter.simulation.description=description
-isisfish.filter.simulation.local=locale
-isisfish.filter.simulation.numberOfYear=nombre d'ann\u00E9e(s)
-isisfish.filter.simulation.regionName=nom de r\u00E9gion
-isisfish.filter.simulation.simulationEnd=date de fin (dd/MM/yyyy)
-isisfish.filter.simulation.simulationName=nom de simulation
-isisfish.filter.simulation.simulationStart=date de d\u00E9but (dd/MM/yyyy)
-isisfish.filter.simulation.simulatorName=nom du simulateur
-isisfish.filter.simulation.tooltip.analysePlanNumber=filter sur le num\u00E9ro d'analyse (uniquement pour les simulations avec plan d'analyse)
-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\u00E9e(s) (recherche extacte)
-isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la r\u00E9gion (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.simulationStart=filtrer sur la date de d\u00E9but de simulation (format dd/MM/yyyy)
-isisfish.filter.simulation.tooltip.simulatorName=filter sur le nom du simulateur utilis\u00E9 (format regex)
-isisfish.filter.simulation.tooltip.useAnalysePlan=filter uniquement les simulations avec plan d'analyse
-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.useStatistic=filter uniquement les simulations avec statistiques
-isisfish.filter.simulation.useAnalysePlan=plan d'analyse
-isisfish.filter.simulation.useOptimization=optimisation
-isisfish.filter.simulation.usePreScript=prescript
-isisfish.filter.simulation.useStatistic=statistiques
-isisfish.fisheryRegion.addMap=Ajouter une carte
-isisfish.fisheryRegion.area=Extr\u00E9mit\u00E9s de la zone de p\u00EAche
-isisfish.fisheryRegion.comments=Commentaires
-isisfish.fisheryRegion.delMap=Supprimer la carte
-isisfish.fisheryRegion.latitude=Lat.
-isisfish.fisheryRegion.latitude.max=Lat. max.
-isisfish.fisheryRegion.latitude.min=Lat. min.
-isisfish.fisheryRegion.longitude=Long.
-isisfish.fisheryRegion.longitude.max=Long. max.
-isisfish.fisheryRegion.longitude.min=Long. min.
-isisfish.fisheryRegion.name=Nom de la r\u00E9gion
-isisfish.fisheryRegion.ofCells=de mailles (option)
-isisfish.fisheryRegion.selectFile=S\u00E9lectionnez un fichier
-isisfish.fisheryRegion.spatial=R\u00E9solution spatiale
-isisfish.gear.comments=Commentaires
-isisfish.gear.effortUnit=Unit\u00E9 d'effort
-isisfish.gear.name=Nom
-isisfish.gear.rangeValues=Range of values
-isisfish.gear.standardisationFactor=Facteur de standardisation
-isisfish.gear.technicalParameter=Param\u00E8tre technique
-isisfish.gear.title=Engin
-isisfish.graphBean.graph.render=Choisir un rendu de graphe
-isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel
-isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo
-isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane
-isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1
-isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel
-isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1
-isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2
-isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3
-isisfish.graphCombo.render.bar.horizontal=Rendu en barre horizontale
-isisfish.graphCombo.render.bar.horizontal.stacked=Rendu en barre horizontale empil\u00E9e
-isisfish.graphCombo.render.bar.vertical=Rendu en barre verticale
-isisfish.graphCombo.render.bar.vertical.3d=Rendu en barre verticale 3D
-isisfish.graphCombo.render.bar.vertical.stacked=Rendu en barre verticale empil\u00E9e
-isisfish.graphCombo.render.line=Rendu en ligne
-isisfish.graphCombo.render.min.max=Rendu en MinMax
-isisfish.graphCombo.render.surface=Rendu en Aire
-isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29
-isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label
-isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list
-isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1
-isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton
-isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e
-isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30
-isisfish.input.continueCells=Continuer vers les mailles
-isisfish.input.continueGears=Continuer vers les engins
-isisfish.input.continueMetiers=Continuer vers les metiers
-isisfish.input.continuePopulations=Continuer vers les populations
-isisfish.input.continuePorts=Continuer vers les ports
-isisfish.input.continueSetOfVessels=Continuer vers les ensembles de navires
-isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces
-isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies
-isisfish.input.continueTripTypes=Continuer vers les types de trajets
-isisfish.input.continueVesselTypes=Continuer vers les types de navires
-isisfish.input.continueZones=Continuer vers les zones
-isisfish.input.menu.addRegion=Ajouter une r\u00E9gion
-isisfish.input.menu.commit=Sauvegarder les changements
-isisfish.input.menu.copyRegion=Copier r\u00E9gion
-isisfish.input.menu.exportRegion=Exporter la r\u00E9gion
-isisfish.input.menu.importRegion=Importer une r\u00E9gion
-isisfish.input.menu.importRegionSimulation=Importer la r\u00E9gion d'une simulation
-isisfish.input.menu.importRegionV2=Importer une r\u00E9gion de la v2 d'IsisFish
-isisfish.input.menu.importRenameRegion=Importer une r\u00E9gion et la renommer
-isisfish.input.menu.removeLocaly=Supprimer localement
-isisfish.input.menu.removeLocalyRemotely=Supprimer localement et \u00E0 distance
-isisfish.input.menu.server=Serveur
-isisfish.input.newRegion=Nouvelle r\u00E9gion
-isisfish.input.selectRegion=S\u00E9lectionnez une r\u00E9gion
-isisfish.input.title=Saisie de la p\u00EAcherie
-isisfish.launch.anonymous=lecture seule
-isisfish.launch.debugMode=debug mode
-isisfish.launch.email=courriel
-isisfish.launch.firstname=nom
-isisfish.launch.init.done=init done in %1$s.
-isisfish.launch.lasstname=pr\u00E9nom
-isisfish.launch.server.authenticationMethod=droit d'acc\u00E8s au serveur
-isisfish.launch.server.login=nom utilisateur
-isisfish.launch.server.ssh.confirm.passphrase=confirmer la passphrase
-isisfish.launch.server.ssh.key.change=Changer la clef ssh
-isisfish.launch.server.ssh.key.generate=G\u00E9n\u00E9rer la clef ssh
-isisfish.launch.server.ssh.no.passphrase=pas de passphrase
-isisfish.launch.server.ssh.passphrase=passphrase
-isisfish.launch.server.ssh.privateKeyFile=clef priv\u00E9e ssh
-isisfish.launch.server.ssh.publicKeyFile=clef publique ssh
-isisfish.launch.ssh=lecture-\u00E9criture (ssh)
-isisfish.launch.start=Lancement Isis-fish... %1$s
-isisfish.launch.stop=Stopping simulation...
-isisfish.launching=after init done in %1$s.
-isisfish.log.addAppender=ajoute un appender [%1$s]
-isisfish.log.body=Message \u00E0 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 \u00E9t\u00E9 envoy\u00E9 \u00E0 %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\u00E9
-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
-isisfish.log.tooltip.sendMail=Cliquer pour envoyer le courriel contentant les fichiers
-isisfish.message.add.objets.simulation=Ajout des nouveaux objets cr\u00E9\u00E9s durant la simulation
-isisfish.message.backup.database.finished=backup database termin\u00E9
-isisfish.message.backup.database.progress=backup database en cours
-isisfish.message.cancel.finished=Cancel finished
-isisfish.message.check.finished=v\u00E9rification termin\u00E9e
-isisfish.message.check.region=
-isisfish.message.checking.cell=
-isisfish.message.choose.archive=choose archive file or directory
-isisfish.message.commit.cancelled=commit annul\u00E9
-isisfish.message.commit.finished=commit termin\u00E9
-isisfish.message.commit.region.canceled=Commit de la r\u00E9gion annul\u00E9
-isisfish.message.commiting.region=En train de commiter la r\u00E9gion %1$s ...
-isisfish.message.compilation.time=Temps de compilation %1$ss
-isisfish.message.confirm.delete.object=Voulez-vous vraiment supprimer l'objet %1$s
-isisfish.message.confirm.remove.region=Voulez-vous vraiement supprimer la r\u00E9gion %1$s ?
-isisfish.message.confirm.remove.script=Voulez-vous vraiment supprimer le script '%1$s' ?
-isisfish.message.copy.finished=Copie termin\u00E9e
-isisfish.message.copy.region=Copier la r\u00E9gion vers %1$s
-isisfish.message.creating.region=En train de cr\u00E9er la r\u00E9gion %1$s
-isisfish.message.creation.done=cr\u00E9ation termin\u00E9e %1$s
-isisfish.message.creation.finished=Cr\u00E9ation termin\u00E9e
-isisfish.message.delete.canceled=supression annul\u00E9e
-isisfish.message.delete.entities=Supprimer les entit\u00E9s
-isisfish.message.delete.entity=Supprimer l'entit\u00E9
-isisfish.message.delete.finished=Suppression termin\u00E9e
-isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivants seront aussi supprim\u00E9s \n\n
-isisfish.message.evaluation.finished=\u00E9valuation termin\u00E9e
-isisfish.message.export.done=Export termin\u00E9
-isisfish.message.export.zip=Exporter dans le fichier zip %1$s
-isisfish.message.file.overwrite=Le fichier existe, Voulez-vous l'\u00E9craser ?
-isisfish.message.import=Importer %1$s
-isisfish.message.import.equation.convert=Conversion manuelle de l'\u00E9quation
-isisfish.message.import.finished=Import termin\u00E9
-isisfish.message.import.region.name=Entre le nom de la r\u00E9egion \u00E0 importer
-isisfish.message.import.region.xml=R\u00E9gion XML (Isis-Fish V2.x)
-isisfish.message.import.region.zipped=Zipped Region
-isisfish.message.import.scripts.file.cancelled=Importation des scripts annul\u00E9
-isisfish.message.import.xml.v2.file=Import xml v2 file
-isisfish.message.import.zip=Import zip file
-isisfish.message.launchui.notlaunch=
-isisfish.message.load.finished=Chargement termin\u00E9
-isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s)
-isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ...
-isisfish.message.loading.region=Chargement de la r\u00E9gion
-isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer
-isisfish.message.new.filename=Entrer le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule)
-isisfish.message.new.region.name=Entrer le nom de la nouvell r\u00E9gion
-isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e
-isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ?
-isisfish.message.presimulation.script.execution=Ex\u00E9cution des scripts de Presimulation
-isisfish.message.recruitment.number.month=Input the number of month of recruitment
-isisfish.message.region.commited=R\u00E9gion commit\u00E9e
-isisfish.message.region.loaded=R\u00E9gion charg\u00E9e
-isisfish.message.region.remove.canceled=Suppression de r\u00E9gion annul\u00E9
-isisfish.message.region.removed=R\u00E9gion supprim\u00E9e
-isisfish.message.remove.canceled=Suppression annul\u00E9e
-isisfish.message.remove.finished=Suppresison termin\u00E9
-isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s ...
-isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion
-isisfish.message.save.finished=Sauvegarde termin\u00E9e
-isisfish.message.saveModel.finished=Sauvegarde du mod\u00E8le termin\u00E9e
-isisfish.message.script.commit=Indiquez vos modifications
-isisfish.message.setting.cache.aspects=Mise en place des aspects Cache
-isisfish.message.setting.trace.aspects=Mise en place des aspects Trace
-isisfish.message.simulation.ended=Simulation termin\u00E9e
-isisfish.message.simulation.execution=Simulation execution
-isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation
-isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e
-isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e
-isisfish.metier.comments=Commentaires
-isisfish.metier.name=Nom
-isisfish.metier.rangeValues=Param\u00E8tre d'engin
-isisfish.metier.title=M\u00E9tier
-isisfish.metierMonitor.metiers=M\u00E9tiers
-isisfish.metierMonitor.strategies=Strat\u00E9gies
-isisfish.metierSeasonInfo.toString=%1$s saison %2$s-%3$s
-isisfish.metierSeasonInfoSpecies.mainSpecies=Esp\u00E8ces principales pour le m\u00E9tier
-isisfish.metierSeasonInfoSpecies.selectSeason=S\u00E9lectionnez une saison
-isisfish.metierSeasonInfoSpecies.selectSpecies=Choix de l'esp\u00E8ce
-isisfish.metierSeasonInfoSpecies.species=Esp\u00E8ce
-isisfish.metierSeasonInfoSpecies.targetFactor=Facteur cible
-isisfish.metierSeasonInfoSpecies.title=Esp\u00E8ces capturables
-isisfish.metierSeasonInfoZone.comments=Commentaires
-isisfish.metierSeasonInfoZone.season=Saison
-isisfish.metierSeasonInfoZone.selectSeason=S\u00E9lectionnez une saison
-isisfish.metierSeasonInfoZone.title=Saison / Zones
-isisfish.monitor.title=Application Monitor
-isisfish.month.april=avril
-isisfish.month.august=ao\u00FBt
-isisfish.month.december=d\u00E9cembre
-isisfish.month.february=f\u00E9vrier
-isisfish.month.january=janvier
-isisfish.month.july=juillet
-isisfish.month.june=juin
-isisfish.month.march=mars
-isisfish.month.may=mai
-isisfish.month.november=novembre
-isisfish.month.october=octobre
-isisfish.month.september=septembre
-isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s'
-isisfish.params.clearFilter=Remise \u00E0 z\u00E9ro du filtre
-isisfish.params.description=Description
-isisfish.params.filter=Filtrer
-isisfish.params.lblLauncher=Lanceur de simulation
-isisfish.params.loadOldSimulation=Charger une ancienne simulation
-isisfish.params.numberYear=Nombre d'ann\u00E9es
-isisfish.params.onlyExportSimulation=Exporter uniquement des simulations
-isisfish.params.populationNumbers=Donn\u00E9es de population
-isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles
-isisfish.params.sensitivityName=Nom de l'analyse de sensibilit\u00E9
-isisfish.params.simulationName=Nom de la simulation
-isisfish.params.title=Param\u00E8tres
-isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n
-isisfish.params.toString.lib.logger.level=niveau du logger de librairies %1$s
-isisfish.params.toString.number.years=Nombre d'ann\u00E9\u00E9s \: %1$s\n\n
-isisfish.params.toString.plan=Plan\: %1$s
-isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n
-isisfish.params.toString.populations=Populations\:
-isisfish.params.toString.rule=Rule\: %1$s
-isisfish.params.toString.script.logger.level=niveau du logger de scripts %1$s
-isisfish.params.toString.script.presimulation=Script de presimulation
-isisfish.params.toString.simul.logger.level=niveau du logger de simulateur %1$s
-isisfish.params.toString.simulation.done=Simulation r\u00E9alis\u00E9e avec %1$s\:
-isisfish.params.toString.strategies=Strat\u00E9gies d'exploitation\:
-isisfish.params.useAnalysePlan=Utiliser le plan de simulation
-isisfish.params.usePreSimulationScript=Utiliser un script de pr\u00E9-simulation
-isisfish.population.capturability=Capturabilit\u0E009e
-isisfish.population.comments=Commentaires
-isisfish.population.group=Groupe
-isisfish.population.groups=Groupes
-isisfish.population.mappingZoneReproZoneRecru=MappingZoneReproZoneRecru
-isisfish.population.matrixAbundance=Matrice d'abondance
-isisfish.population.matrixAbundance1D=matrixAbundance1D
-isisfish.population.recruitment=Recrutement
-isisfish.population.reproduction=Reproduction
-isisfish.population.season=Saison
-isisfish.population.zones=Zones
-isisfish.populationBasics.geographicID=Identifiant g\u00E9ographique
-isisfish.populationBasics.growth=Croissance
-isisfish.populationBasics.growthReverse=Croissance inverse
-isisfish.populationBasics.maturityGroup=Groupe de maturit\u00E9
-isisfish.populationBasics.name=nom
-isisfish.populationBasics.numberGroup=Nombre de groupes
-isisfish.populationBasics.plusGroup=plusGroup
-isisfish.populationBasics.recreateClasses=Recruter les classes
-isisfish.populationBasics.title=Saisie des Populations
-isisfish.populationCapturability.comments=Commentaires
-isisfish.populationCapturability.selectCoefficient=S\u00E9lectionnez un coefficient par saison et par classe
-isisfish.populationCapturability.title=Saisie de la capturabilit\u00E9
-isisfish.populationEquation.meanWeight=Poids moyen
-isisfish.populationEquation.naturalDeathRate=Taux de mortalit\u00E9 naturelle
-isisfish.populationEquation.price=Prix
-isisfish.populationEquation.title=Saisie des \u00E9quations
-isisfish.populationGroup.age=Age
-isisfish.populationGroup.comments=Commentaires
-isisfish.populationGroup.length=Longueur
-isisfish.populationGroup.meanWeigth=Poids principal
-isisfish.populationGroup.naturalDeathRate=Taux de mortalit\u00E9 naturelle
-isisfish.populationGroup.price=Prix
-isisfish.populationGroup.reproductionRate=Taux de reproduction
-isisfish.populationGroup.title=Saisie des groupes de population
-isisfish.populationGroup.toString=%1$s Groupe %2$s
-isisfish.populationMigration.comments=Commentaires
-isisfish.populationMigration.selectSeason=S\u00E9lectionnez une saison
-isisfish.populationMigration.title=Migration
-isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation
-isisfish.populationMigrationEmigration.coefficient=Coefficient
-isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part
-isisfish.populationMigrationEmigration.title=Population emmigration
-isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e
-isisfish.populationMigrationImmigration.coefficient=Coefficient
-isisfish.populationMigrationImmigration.title=Population immigration
-isisfish.populationMigrationMigration.arrivalZone=Zone d'arriv\u00E9e
-isisfish.populationMigrationMigration.coefficient=Coefficient
-isisfish.populationMigrationMigration.departureZone=Zone de d\u00E9part
-isisfish.populationMigrationMigration.title=Migration de population
-isisfish.populationRecruitment.comments=Commentaires
-isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement
-isisfish.populationRecruitment.reproductionEquation=Equation de reproduction
-isisfish.populationRecruitment.title=Saisie des reproductions
-isisfish.populationSeasonInfo.arrival=Arriv\u00E9e
-isisfish.populationSeasonInfo.departure=D\u00E9part
-isisfish.populationSeasonInfo.distributionSpawing=Distribution de la reproduction
-isisfish.populationSeasonInfo.emigration=Emigration
-isisfish.populationSeasonInfo.group=Groupe
-isisfish.populationSeasonInfo.immigration=Immigration
-isisfish.populationSeasonInfo.migration=Migration
-isisfish.populationSeasonInfo.months=Mois
-isisfish.populationSeasonInfo.toString=%1$s saison %2$s-%3$s
-isisfish.populationSeasons.changeGroup=Changement de groupe
-isisfish.populationSeasons.comments=Commentaires
-isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction
-isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison
-isisfish.populationSeasons.title=Saisons
-isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones d'apparitions et de recrutement
-isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations
-isisfish.populationZones.selectRecruitmentAreas=S\u00E9lectionnez les zones de recrutement
-isisfish.populationZones.selectSpawningAreas=S\u00E9lectionnez les zones de reproduction
-isisfish.populationZones.title=Zones
-isisfish.port.cell=Maille du port
-isisfish.port.comments=Commentaires
-isisfish.port.name=Nom
-isisfish.preScript.backParameter=Retour aux param\u00E8tres
-isisfish.preScript.title=Script de pr\u00E9-simulation
-isisfish.queue.clearDone=Retirer les simulations termin\u00E9es
-isisfish.queue.id=Identifiant
-isisfish.queue.launcher=Lanceur de simulation
-isisfish.queue.plan=Plan
-isisfish.queue.progression=Progression
-isisfish.queue.showLog=Voir les logs de la simulation
-isisfish.queue.simulationLaunch=Lanceur de la queue des simulations
-isisfish.queue.status=\u00C9tat
-isisfish.queue.stopSimulation=Arr\u00EAter la simulation
-isisfish.queue.title=Queue
-isisfish.result.abundance=Abondance
-isisfish.result.add=Ajouter un r\u00E9sultat
-isisfish.result.begin.simulation=En d\u00E9but de simulation\:
-isisfish.result.capture=Capturer
-isisfish.result.capture.metier=Capturer par m\u00E9tier
-isisfish.result.choose.simulation=Choisir une simulation
-isisfish.result.datas=Donn\u00E9es
-isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton
-isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane
-isisfish.result.dimension=Dimension
-isisfish.result.end.simulation=En fin de Simulation\:
-isisfish.result.export=Export
-isisfish.result.export.file=Exporter un fichier texte
-isisfish.result.file=Fichier
-isisfish.result.graph=Graphe
-isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton
-isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2
-isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel
-isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9
-isisfish.result.map=Carte
-isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton
-isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport
-isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1
-isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2
-isisfish.result.new.window=Ouvrir une nouvelle fen\u00EAtre
-isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton
-isisfish.result.quit=Quitter
-isisfish.result.reject.metier=Rejet par metier
-isisfish.result.remove.simulation=Supprimer Simulation
-isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton
-isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat
-isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll
-isisfish.result.show.simulation.log=Voir les logs
-isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation
-isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1
-isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage
-isisfish.result.stress.metier=Effort par metier
-isisfish.result.summary=R\u00E9sum\u00E9
-isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton
-isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33
-isisfish.result.title=R\u00E9sultat
-isisfish.result.tooltip.show.simulation.log=Cliquer pour afficher la console des logs de la simulation
-isisfish.result.unload.metier=Debarquement par metier
-isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1
-isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel
-isisfish.resultChoice.save=R\u00E9sultats \u00E0 sauvegarder
-isisfish.resultChoice.saved=R\u00E9sultats sauvegard\u00E9
-isisfish.resultChoice.title=Choix de r\u00E9sultats
-isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid
-isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea
-isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2
-isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1
-isisfish.script.check=V\u00E9rifier
-isisfish.script.commit=Commit
-isisfish.script.copy=Copier
-isisfish.script.cut=Couper
-isisfish.script.evaluate=\u00C9valuer
-isisfish.script.export=Exporter des scripts dans une archive zip
-isisfish.script.export.cancel=annuler
-isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner
-isisfish.script.export.chooseDir=...
-isisfish.script.export.ok=exporter
-isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter
-isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts
-isisfish.script.import=Importer des scripts depuis une archive zip
-isisfish.script.import.cancel=annuler
-isisfish.script.import.checkAll=Tout (d\u00E9-)s\u00E9lectionner
-isisfish.script.import.labelAdd=Le(s) fichier(s) suivant(s) sera(ont) ajout\u00E9(s), Confirmer l'ajout
-isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement
-isisfish.script.import.ok=importer
-isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer
-isisfish.script.menu.checkSyntax=V\u00E9rifier la syntaxe
-isisfish.script.menu.code=Code
-isisfish.script.menu.commit=Commiter des scripts sur le serveur
-isisfish.script.menu.copy=Copier
-isisfish.script.menu.cut=Couper
-isisfish.script.menu.deleteLocaly=Supprimer localement
-isisfish.script.menu.deleteLocalyServer=Supprimer localement et sur le serveur
-isisfish.script.menu.diff=Voir les diff\u00E9rences avec la version du serveur
-isisfish.script.menu.edit=\u00C9dition
-isisfish.script.menu.evaluate=Evaluer
-isisfish.script.menu.file=Fichier
-isisfish.script.menu.new=Nouveau
-isisfish.script.menu.paste=Coller
-isisfish.script.menu.save=Sauver
-isisfish.script.menu.txtEditorHelp=Aide en ligne...
-isisfish.script.menu.txtExport=Exporter
-isisfish.script.menu.txtHelp=Aide
-isisfish.script.menu.txtImport=Importer
-isisfish.script.menu.txtJavaHelp=Aide Java...
-isisfish.script.menu.txtNewAnalysePlan=Nouveau plan d'analyse
-isisfish.script.menu.txtNewEquationModel=Nouvelle formule
-isisfish.script.menu.txtNewExport=Nouveau script d'export
-isisfish.script.menu.txtNewRule=Nouvelle r\u00E8gle
-isisfish.script.menu.txtNewScript=Nouveau script
-isisfish.script.menu.txtNewSensitivity=Nouveau calculateur de sensibilit\u00E9
-isisfish.script.menu.txtNewSimulator=Nouveau simulateur
-isisfish.script.menu.txtVCS=Serveur
-isisfish.script.menu.update=Synchronisation
-isisfish.script.new=Nouveau
-isisfish.script.paste=Coller
-isisfish.script.save=Sauver
-isisfish.script.title=Editeur de scripts
-isisfish.script.txtExport=Exporter
-isisfish.season.toString=saison %1$s-%2$s
-isisfish.selectivity.equation=Equation
-isisfish.selectivity.selectPopulation=S\u00E9lectionnez une population
-isisfish.selectivity.title=S\u00E9lectivit\u00E9
-isisfish.sens.backParameter=Retour aux param\u00E8tres
-isisfish.sens.title=Plan de simulation
-isisfish.sensitivity.displaysecondpass=Afficher les r\u00E9sultats
-isisfish.sensitivity.export=Export
-isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats
-isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats
-isisfish.sensitivity.select=M\u00E9thode
-isisfish.sensitivity.title=S\u00E9lection des facteurs
-isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9
-isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH
-isisfish.setOfVessels.comments=Commentaires
-isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes
-isisfish.setOfVessels.name=Nom
-isisfish.setOfVessels.numberOfVessels=Nombre de navires
-isisfish.setOfVessels.technicalEfficiency=
-isisfish.setOfVessels.title=Caract\u00E9ristiques
-isisfish.setOfVessels.vesselType=Type de navire
-isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel
-isisfish.simpleResult.more.information=Cliquer sur une cellule pour plus d'informations...
-isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap
-isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar
-isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12
-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\u00E9tres d'une simulation
-isisfish.simulation.menu.save=Sauver les param\u00E8tres de la simulation
-isisfish.simulation.menu.simulation=Simulation
-isisfish.simulation.name=Nom de la simulation
-isisfish.simulation.remote.message.connection=Connexion \u00E0 Caparmor
-isisfish.simulation.remote.message.downloadresults=T\u00E9l\u00E9chargement des r\u00E9sultats
-isisfish.simulation.remote.message.upload=Upload de la simulation
-isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation
-isisfish.simulation.title=Lanceur de simulation
-isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus
-isisfish.simulator.launcher.remote=sur le serveur Caparmor
-isisfish.simulator.launcher.subprocess=dans un sous processus
-isisfish.simulator.simulaction.badid=Impossible de lancer la simulation '%s' \: l'identifiant existe d\u00E9j\u00E0 \!
-isisfish.simulator.subprocess.readoutput.error=
-isisfish.species.age=Age
-isisfish.species.cee=CEE
-isisfish.species.comments=Commentaires
-isisfish.species.length=Longueur
-isisfish.species.name=Nom des esp\u00E8ces
-isisfish.species.rubbinCode=Code Rubbin
-isisfish.species.scientificName=Nom scientifique
-isisfish.species.structured=Structur\u00E9
-isisfish.ssh.askpassphrase.message=Entrez la passphrase pour la cl\u00E9 '%s' \:
-isisfish.ssh.askpassphrase.title=D\u00E9verrouillage de cl\u00E9 SSH
-isisfish.ssh.askpassphrase.wrongpassphrase=Mauvaise cl\u00E9, entrez une nouvelle passphrase '%s' \:
-isisfish.strategy.comments=Commentaires
-isisfish.strategy.inactivity=Equation d'inactivit\u00E9
-isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9
-isisfish.strategy.name=Nom
-isisfish.strategy.proportionSetOfVessels=Proportion des ensembles de navires
-isisfish.strategy.title=Caract\u00E9ristiques
-isisfish.strategyMonthInfo.metier=M\u00E9tier
-isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9
-isisfish.strategyMonthInfo.numberOfTrips=Nombre de trajets
-isisfish.strategyMonthInfo.proportion=Proportion
-isisfish.strategyMonthInfo.title=StrategyMonthInfo
-isisfish.strategyMonthInfo.toString=%1$s %2$s
-isisfish.timeUnit.day=Jour
-isisfish.timeUnit.hours=Heures
-isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s
-isisfish.tray.simulation.no=Isis-fish - Pas de simulation
-isisfish.tripType.comments=Commentaires
-isisfish.tripType.duration=Dur\u00E9e
-isisfish.tripType.minTime=Temps minimal entre deux voyages
-isisfish.tripType.name=Nom
-isisfish.vcs.ask.passphrase=Entrez votre passe phrase (si votre clef ssh en contient une).
-isisfish.vcs.ask.passphrase.title=Demande de passe phrase
-isisfish.vcs.commit=Message de sauvegarde
-isisfish.vcs.commit.cancel=annuler
-isisfish.vcs.commit.label=Entrer quelques mots concernant la modification des scripts
-isisfish.vcs.commit.ok=confirmer
-isisfish.vcs.init.notfoundcantdownload=La base de donn\u00E9es pour la version %s n'a ni pu \u00EAtre trouv\u00E9e, ni t\u00E9l\u00E9charg\u00E9e.\nVous devez la t\u00E9l\u00E9charger manullement \u00E0 partir du site d'Isis-Fish.
-isisfish.vcs.init.wrongprotocol=Votre base de donn\u00E9es locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et r\u00E9cup\u00E9rer une meilleure version ?
-isisfish.vcs.switchprotocol.confirm=Le protocole d'acc\u00E8s au d\u00E9p\u00F4t des scripts a chang\u00E9.\nVoulez-vous changer vers le nouveau d\u00E9p\u00F4t ?
-isisfish.vcs.switchtag.warningconflict=Votre base de donn\u00E9es a \u00E9t\u00E9 mise \u00E0 jour\nmais les fichiers suivants sont en conflit, merci de les v\u00E9rifier \:\n%s
-isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le d\u00E9p\u00F4t correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de d\u00E9p\u00F4t ?
-isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur
-isisfish.vcs.update.cancel=annuler
-isisfish.vcs.update.checkAll=(de)-select tout
-isisfish.vcs.update.local=Systeme local
-isisfish.vcs.update.local.modified=Fichiers modifi\u00E9s
-isisfish.vcs.update.local.outofdateAndModified=Fichiers localement modifi\u00E9s en conflit avec le serveur
-isisfish.vcs.update.local.tooltip.modified=Fichiers localement modifi\u00E9s \n(confirmer pour revenir \u00E0 la version avant modification ou soum\u00EAtre au serveur)
-isisfish.vcs.update.local.tooltip.outofdateAndModified=Fichiers localement modifi\u00E9s mais ayant une version plus r\u00E9cente sur le serveur\n (confirmer pour revenir \u00E0 la version avant modification ou r\u00E9cup\u00E9rer la nouvelle version du serveur)
-isisfish.vcs.update.local.tooltip.unversionned=Fichiers uniquement pr\u00E9sents sur votre systeme \n(confirmer pour les enregister sur le serveur)
-isisfish.vcs.update.local.unversionned=Nouveaux fichiers
-isisfish.vcs.update.ok=continuer
-isisfish.vcs.update.remote=Serveur distant
-isisfish.vcs.update.remote.missing=Nouveaux fichiers
-isisfish.vcs.update.remote.outofdate=Fichiers plus r\u00E9cents sur le serveur
-isisfish.vcs.update.remote.tooltip.missing=Nouveaux fichiers uniquement pr\u00E9sents sur le serveur \n(confirmer pour les r\u00E9cup\u00E9rer)
-isisfish.vcs.update.remote.tooltip.outofdate=Fichiers dont il existe une version plus r\u00E9cente sur le serveur \n(confirmer pour les r\u00E9cup\u00E9rer)
-isisfish.vcs.update.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les fichiers (\u00E0 action unique) que vous voulez traiter
-isisfish.vcs.update.tooltip.local=vcs.update.tooltip.local
-isisfish.vcs.update.tooltip.remote=vcs.update.tooltip.remote
-isisfish.vcs.updateconfirm=Confirmation des ope\u00E9rations de synchronisation avec le serveur
-isisfish.vcs.updateconfirm.cancel=annuler
-isisfish.vcs.updateconfirm.checkAll=(de)-select tout
-isisfish.vcs.updateconfirm.label=Confirmer les op\u00E9rations qui pourraient \u00E9craser vos fichiers
-isisfish.vcs.updateconfirm.label2='Etes vous sur de vouloir effectuer ces op\u00E9rations ?'
-isisfish.vcs.updateconfirm.ok=confirmer
-isisfish.vcs.updateconfirm.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts que vous voulez traiter
-isisfish.vcs.updaterepository.confirm=Votre d\u00E9p\u00F4t des scripts n'est pas \u00E0 jour. Voulez-vous mettre \u00E0 jour les fichiers suivants ?
-isisfish.vcs.vcssvn.add.error=Impossible d'ajouter un fichier
-isisfish.vcs.vcssvn.add.errorreadonly=Vous ne pouver pas ajouter de fichier, ce d\u00E9p\u00F4t est en lecture seule \!
-isisfish.vcs.vcssvn.checkProtocol.error=Impossible d'obtenir l'adresse correspondant au d\u00E9p\u00F4t local
-isisfish.vcs.vcssvn.checkProtocol.relocate=Transfert du d\u00E9p\u00F4t %s de %s vers %s
-isisfish.vcs.vcssvn.checkout.error=Impossible de mettre \u00E0 jour
-isisfish.vcs.vcssvn.cleanup.error=Impossible de d\u00E9verrouiller la copie locale
-isisfish.vcs.vcssvn.commit.error=Impossible de commiter
-isisfish.vcs.vcssvn.commit.errorreadonly=Vous ne pouvez pas commiter, le d\u00E9p\u00F4t est en lecture seule
-isisfish.vcs.vcssvn.delete.error=Impossible de supprimer des fichiers
-isisfish.vcs.vcssvn.delete.errorreadonly=Vous ne pouvez pas supprimer ce fichier, le d\u00E9p\u00F4t est en lecture seule
-isisfish.vcs.vcssvn.diff.error=Impossible d'obtenir le diff
-isisfish.vcs.vcssvn.gettag.error=Erreur lors de la r\u00E9cup\u00E9ration de l'adresse du d\u00E9p\u00F4t local
-isisfish.vcs.vcssvn.getupdate.error=Impossible d'obtenir le statut des fichiers
-isisfish.vcs.vcssvn.global.filelocalandremotestatus=Le statut du fichier %s est (l\:%s/d\:%s)
-isisfish.vcs.vcssvn.global.filestatus=Le statut de %s est %s
-isisfish.vcs.vcssvn.global.foundUpdatedFile=Ajout de %s comme fichier mis \u00E0 jour
-isisfish.vcs.vcssvn.global.torevision=\u00C0 la r\u00E9vision \: %d
-isisfish.vcs.vcssvn.isconnected.switchoff=Impossible de se connecter au serveur, passage en mode d\u00E9connect\u00E9 \: %s
-isisfish.vcs.vcssvn.isconnected.switchto=Connexion au serveur disponible, passage en mode connect\u00E9 \: %s
-isisfish.vcs.vcssvn.isonremote.error=Le fichier %s n'est pas sur le serveur
-isisfish.vcs.vcssvn.istag.notexist=Le tag %s n'existe pas
-isisfish.vcs.vcssvn.isuptodate.error=Impossible d'obtenir le statut de fichier
-isisfish.vcs.vcssvn.list.error=Impossible de lister
-isisfish.vcs.vcssvn.localstatus.error=Impossible d'obtenir le statut local de fichier
-isisfish.vcs.vcssvn.remotestatus.error=Impossible d'obtenir le statut distant de fichier
-isisfish.vcs.vcssvn.setTag.error=Erreur lors de la r\u00E9cup\u00E9ration de l'adresse du d\u00E9p\u00F4t local
-isisfish.vcs.vcssvn.settag.switchfromto=Switch du tag du d\u00E9p\u00F4t de %s \u00E0 %s
-isisfish.vcs.vcssvn.update.error=Impossible de mettre \u00E0 jour
-isisfish.vcs.vcssvn.update.notinlocal=Impossible de mettre \u00E0 jour des fichiers qui ne sont pas pas dans le d\u00E9p\u00F4t
-isisfish.versionStorage.removed=Supprim\u00E9
-isisfish.vesselType.activityRange=Intervalle d'activit\u00E9
-isisfish.vesselType.comments=Commentaires
-isisfish.vesselType.fuelCost=Co\u00FBt d'un trajet en fuel
-isisfish.vesselType.length=Longueur
-isisfish.vesselType.maxDuration=Dur\u00E9e maximale du trajet
-isisfish.vesselType.miniCrew=Taille minimale d'\u00E9quipage
-isisfish.vesselType.name=Nom
-isisfish.vesselType.speed=Vitesse
-isisfish.welcome.menu.about=\u00C0 propos
-isisfish.welcome.menu.close=Fermer
-isisfish.welcome.menu.configuration=Configuration
-isisfish.welcome.menu.file=Fichier
-isisfish.welcome.menu.frame=Fen\u00EAtre
-isisfish.welcome.menu.help=Aide
-isisfish.welcome.menu.help.isisfish=Site d'Isis-Fish
-isisfish.welcome.menu.help.isisfishapi=API Isis-Fish
-isisfish.welcome.menu.help.javaapi=API Java
-isisfish.welcome.menu.help.lutinmatrixapi=API LutinMatrix
-isisfish.welcome.menu.help.topiaapi=API ToPIA
-isisfish.welcome.menu.input=Saisie
-isisfish.welcome.menu.monitor=Fen\u00EAtre de logs
-isisfish.welcome.menu.queue=Liste des simulations
-isisfish.welcome.menu.result=R\u00E9sultat
-isisfish.welcome.menu.script=Script
-isisfish.welcome.menu.simulation=Lanceur de simulations
-isisfish.welcome.menu.synchro=Synchronisation Serveur
-isisfish.welcome.menu.vcs.configuration=Configuration vcs
-isisfish.welcome.title=Simulation Ifremer
-isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la m\u00EAme taille
-isisfish.wizardGroupCreation.allValues=Input all the values
-isisfish.wizardGroupCreation.computedGrowthCurve=Calcul\u00E9 par une courbe de croissance
-isisfish.wizardGroupCreation.firstAge=Premier age
-isisfish.wizardGroupCreation.firstAgeHelp=First age \= minimal age
-isisfish.wizardGroupCreation.firstGroup=Premier groupe
-isisfish.wizardGroupCreation.firstLength=Premi\u00E8re taille
-isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group
-isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year.
-isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted
-isisfish.wizardGroupCreation.groupWidth=Longueur du groupe
-isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group
-isisfish.wizardGroupCreation.lastAge=Dernier age
-isisfish.wizardGroupCreation.lastAgeHelp=Last age \= maximal age
-isisfish.wizardGroupCreation.maxGroupsLength=Taille maximale de groupes
-isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group
-isisfish.wizardGroupCreation.numberGroup=Nombre de groupes
-isisfish.wizardGroupCreation.numberGroups=Nombre de groupes
-isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics
-isisfish.wizardGroupCreation.selectGroupLengthType=Choisir la longueur du groupe
-isisfish.wizardGroupCreation.timeStep=Pas de temps (en mois)
-isisfish.wizardGroupCreation.title=Cr\u00E9ation du groupe
-isisfish.zone.cells=cellules de la Zone
-isisfish.zone.comments=Commentaires
-isisfish.zone.name=Nom
-maximum\ length=
-minimum\ length=
-not\ started=
-region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
-simulate\ %s\ with\ file\ %s=
Copied: isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties (from rev 2115, isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties)
===================================================================
--- isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties (rev 0)
+++ isis-fish/tags/isis-fish-3.2.0.4-rc3/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-17 10:31:26 UTC (rev 2117)
@@ -0,0 +1,1050 @@
+Add\ to\ %s\ queue=
+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\:\ =
+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\ file=
+Can't\ evaluate\ simulation\ prescript=
+Can't\ export\ simulation\ %s=
+Can't\ get\ changlog=Impossible d'obtenir de 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
+Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default=
+Can't\ instantiate\ %s=
+Can't\ open\ log\ for\ %s=
+Can't\ simulate\ %s=
+Check\ state\ of\ local\ repository\:\ %s=
+Check\ syntax\ of\ the\ current\ script=
+Checkout\ pom.xml\ to\ %s=
+Command\ '%s'\ fail\ to\ execute=
+Commit\ script\ to\ CVS\ server=
+Copy\ current\ selection\ (Ctrl-c)=
+Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s=
+Create\ a\ new\ script=
+Cut\ current\ selection\ (Ctrl-x)=
+Error\ during\ vcs\ initialisation=
+Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys=
+Export\ selected\ script(s)\ to\ zip\ archive=
+Generate\ next\ simulation=
+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=
+Info=Info
+Jobs\ submited\ is\ not\ ItemSimulation\ but\ was\ %s=
+Last\ entry\ was\ %s\ extract\ name\ %s=
+Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)=
+Local\ repository\ don't\ exist=
+Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s=
+Master\ plan=
+Month\ Gap\ BetweenRepro\ Recruitment=
+Normal\ stop\ thread,\ this\ is\ not\ an\ error=
+Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
+Paste\ current\ selection\ (Ctrl-v)=
+Process\ template\ error=
+Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import=
+Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e
+Remote\ IsisFish\ server=
+Remote\ control\ file\ doesn't\ exists\ %s=
+Rename\ data\ directory\ to\ %s=
+Save\ current\ script=
+Show\ help=
+SimulationExecutor\ started\ with\ %s\ thread\ for\ %s=
+Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to=
+Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s=
+Stop\ the\ process=
+SubProcess\ start\:\ %s\ %s=
+Switch\ repository\ type\ to\ none=
+The\ equation\ used\ is\ the\ population's\ growth\ curve,\ it\ needs\ to\ be\ defined\ first.=
+Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)=
+Try\ to\ log\ on\ %s@%s\:%d=
+Use\ branches,\ switch\ not\ needed=
+User\ stop\ simulation\ %s=
+cant\ start\ nimbus=
+could\ not\ close\ reader\ %1$s=could not close reader %1$s
+could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
+could\ not\ filter\ on\ simulations=could not filter on simulations
+could\ not\ found\ %s=
+could\ not\ found\ log\ file\ %1$s=could not found log file %1$s
+could\ not\ found\ region\ %s=
+could\ not\ found\ simulation\ %s=
+could\ not\ read\ at\ offset\ %1$s\ for\ reason\ %2$s=could not read at offset %1$s for reason %2$s
+destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
+destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite=
+directory\ %s\ must\ be\ a\ directory=
+filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines.
+in\ hour=
+isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html>
+isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme.
+isisfish.about.title=\u00C0 propos de Isis-Fish...
+isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s
+isisfish.advancedParams.freeParameters=Param\u00E8tres libres
+isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies
+isisfish.advancedParams.scriptLevelLogger=Niveau de tracage des scripts
+isisfish.advancedParams.simulLevelLogger=Niveau de tracage du simulateur
+isisfish.advancedParams.simulationCache=Simulation cache
+isisfish.advancedParams.simulationStatistique=Simulation statistique
+isisfish.advancedParams.simulatorUse=Simulateur \u00E0 utiliser
+isisfish.cell.comments=Commentaires
+isisfish.cell.land=Terre
+isisfish.cell.latitude=Latitude
+isisfish.cell.longitude=Longitude
+isisfish.cell.name=Nom
+isisfish.change.equation=Ne peut pas changer l'\u00E9quation
+isisfish.commit.message=Entrer un message de commit
+isisfish.common.add=Ajouter
+isisfish.common.add.short=Aj.
+isisfish.common.alert=alerte
+isisfish.common.apply=Appliquer
+isisfish.common.blank=\
+isisfish.common.cancel=Annuler
+isisfish.common.check=V\u00E9rifier
+isisfish.common.clear=Effacer
+isisfish.common.date=Date
+isisfish.common.debug=Debug
+isisfish.common.ellipsis=...
+isisfish.common.emigration=\u00E9migration
+isisfish.common.empty=vide
+isisfish.common.error=Erreur
+isisfish.common.finish=Terminer
+isisfish.common.gear=Engin
+isisfish.common.immigration=immigration
+isisfish.common.info=Info
+isisfish.common.migration=migration
+isisfish.common.month=mois %1$s
+isisfish.common.name=Nom
+isisfish.common.new=Nouveau
+isisfish.common.newMatrix=Nouvelle matrice
+isisfish.common.next=Suivant
+isisfish.common.ok=Ok
+isisfish.common.openEditor=Ouvrir l'\u00E9diteur
+isisfish.common.populationGroup=Groupe de population
+isisfish.common.populations=Populations
+isisfish.common.port=port
+isisfish.common.prev=Pr\u00E9c\u00E9dent
+isisfish.common.region=R\u00E9gion
+isisfish.common.remove=Supprimer
+isisfish.common.reset=reset
+isisfish.common.rules=R\u00E8gles
+isisfish.common.save=Sauver
+isisfish.common.saveModel=Sauver comme mod\u00E8le
+isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation
+isisfish.common.season=Saison
+isisfish.common.setOfVessels=Ensemble de navires
+isisfish.common.simulate=Simuler
+isisfish.common.stop=Arr\u00EAter
+isisfish.common.strategies=Strat\u00E9gies
+isisfish.common.sum=somme
+isisfish.common.tag=Tag
+isisfish.common.tripType=Type de trajet
+isisfish.common.value=Valeur
+isisfish.common.warn=Warning
+isisfish.common.year=ann\u00E9e
+isisfish.common.zone=Zone
+isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts
+isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser
+isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es
+isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations
+isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation
+isisfish.config.main.defaultMapFile.description=TODO
+isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation
+isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation
+isisfish.config.main.defaultTagValue.description=TODO
+isisfish.config.main.encoding.description=l'encoding du syst\u00E8me
+isisfish.config.main.javadocDirectory.description=
+isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts
+isisfish.config.main.launchUI.description=
+isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement
+isisfish.config.main.locale.description=la locale utilisateur
+isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant
+isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant
+isisfish.config.main.projectName.description=le nom du projet
+isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion
+isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant
+isisfish.config.main.resultExport.description=TODO
+isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=
+isisfish.config.main.simulation.ssh.control.check.interval.description=
+isisfish.config.main.simulation.ssh.datapath.description=
+isisfish.config.main.simulation.ssh.isis.home.description=
+isisfish.config.main.simulation.ssh.login.description=
+isisfish.config.main.simulation.ssh.server.description=
+isisfish.config.main.simulation.ssh.tmppath.description=
+isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant
+isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles avec erreur
+isisfish.config.main.simulationShowOnlyQueue.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles effectu\u00E9es localement
+isisfish.config.main.smtpServer.description=le nom du serveur smtp \u00E0 utiliser pour envoyer les courriels
+isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process
+isisfish.config.main.userMail.description=le courriel de l'utilisateur
+isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur
+isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser
+isisfish.config.vcs.keyFile.description=le chemin complet du fichier de clef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e
+isisfish.config.vcs.localDatabasePath.description=
+isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase
+isisfish.config.vcs.passphrase.description=la passe-phrase utilis\u00E9e pour prot\u00E9ger la clef priv\u00E9e ssh
+isisfish.config.vcs.remoteDatabase.description=le nom du module de donn\u00E9es sur le serveur vcs
+isisfish.config.vcs.remotePath.description=le chemin jusqu'au parent du module de donn\u00E9es sur le serveur vcs
+isisfish.config.vcs.type.description=le type de communication vcs utilis\u00E9
+isisfish.config.vcs.typeRepo.description=le type de r\u00E9pository vcs utilis\u00E9
+isisfish.config.vcs.useSshConnexion.description=pour indiquer si l'on utilise une connexion s\u00E9curis\u00E9e pour communiquer avec le serveur vcs (ssh2)
+isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs
+isisfish.config.vcs.userPassword.description=
+isisfish.dataResult.descriptionLabel=defaultToolTip-fr.ifremer.resultat.DataResult.descriptionLabel
+isisfish.dataResult.export.csv=Exporter en CSV
+isisfish.dataResult.exportButton=defaultToolTip-fr.ifremer.resultat.DataResult.exportButton
+isisfish.dataResult.label=label9
+isisfish.dataResult.matriceTable=defaultToolTip-fr.ifremer.resultat.DataResult.matriceTable
+isisfish.dataResult.scrolledwindow2=defaultToolTip-fr.ifremer.resultat.DataResult.scrolledwindow2
+isisfish.dataResult.table2=defaultToolTip-fr.ifremer.resultat.DataResult.table2
+isisfish.date.toString=%1$s %2$s
+isisfish.effortDescription.crewFoodCost=Co\u00FBt de l'alimentation pour l'\u00E9quipage
+isisfish.effortDescription.crewShareRate=Taux de partage de l'\u00E9quipage
+isisfish.effortDescription.crewSize=Taille de l'\u00E9quipage
+isisfish.effortDescription.fishingOperation=Op\u00E9ration de p\u00EAche
+isisfish.effortDescription.fishingOperationDuration=Dur\u00E9e de la p\u00EAche
+isisfish.effortDescription.fixedCrewSalary=Salaire d'\u00E9quipage fixe
+isisfish.effortDescription.gearsNumberPerOperation=Nombre d'engins par op\u00E9ration
+isisfish.effortDescription.landingCosts=Co\u00FBts d'accastillage
+isisfish.effortDescription.otherRunningCost=Autres co\u00FBts
+isisfish.effortDescription.repairAndMaintenanceGearCost=Co\u00FBts de maintenance
+isisfish.effortDescription.title=inputEffortDescription
+isisfish.effortDescription.toString=EffortDescription for %1$s with %2$s
+isisfish.effortDescription.unitCostOfFishing=Co\u00FBt unitaire de la p\u00EAche
+isisfish.equation.editor.title=Editeur d'\u00E9quation
+isisfish.error.acceptable.population=La\t nouvelle valeur n'est pas une valeur valide pour cette population
+isisfish.error.add.card=Erreur lors de l'ajout du r\u00E9sultat \u00E0 la carte.
+isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation
+isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data.
+isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph.
+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.check.region=
+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\u00E9es
+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
+isisfish.error.delete.vcs.files=Can't delete vcs files
+isisfish.error.dialog.message=Une erreur a \u00E9t\u00E9 d\u00E9tect\u00E9e
+isisfish.error.dialog.title=Erreur
+isisfish.error.during.simulation=Error during simulation
+isisfish.error.emigration.negative=emigration negative
+isisfish.error.empty.code.rubbin=le code rubbin est vide
+isisfish.error.empty.emigration=emigration vide
+isisfish.error.empty.id.geographic=l'identifiant g\u00E9ographique est vide
+isisfish.error.empty.immigration=immigration vide
+isisfish.error.empty.migration=Migration vide
+isisfish.error.empty.name=le nom est vide
+isisfish.error.empty.params.name=le nom du param\u00E8tre est vide
+isisfish.error.empty.population=Population est vide
+isisfish.error.empty.scientific.name=le nom scientifique est vide
+isisfish.error.empty.season=info saison vide
+isisfish.error.empty.selectivity=s\u00E9lectivit\u00E9 est vide
+isisfish.error.empty.species=espece capturable vide
+isisfish.error.empty.species.name=le nom d'espece est vide
+isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide
+isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s
+isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s
+isisfish.error.evalute.plan.script=Can't evaluate plan script
+isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1
+isisfish.error.factor.invalid=Le facteur n'est pas valide
+isisfish.error.file.already.exists=The file %1$s already exist
+isisfish.error.get.fisheryRegion=Can't get FisheryRegion
+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\u00E9cente que la version souhait\u00E9e.
+isisfish.error.init.map=Can't init map.
+isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s
+isisfish.error.instanciate=Can't instanciate %1$s
+isisfish.error.instanciate.export=Can't instanciate export %1$s
+isisfish.error.invalid.costs.fix=les co\u00FBts 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'\u00E9quation 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
+isisfish.error.invalid.natural.death=mortalit\u00E9 naturelle sur les classes naissantes invalide
+isisfish.error.invalid.number=le nombre est invalide
+isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable
+isisfish.error.invalid.values.params=Param\u00E8tre controlable hors valeurs possibles
+isisfish.error.invalidate.natural.death=mortalite naturelle invalide
+isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s
+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.load.map=Can't load map 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.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme.
+isisfish.error.migration.negative=Migration negative
+isisfish.error.no.matrix=No matrix for\:
+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\u00E9finit
+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.class=this class does not
+isisfish.error.not.found.code=could not found codeclass for %1$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.found.field.class=could not found field %1$s for class %2$s
+isisfish.error.not.null.class.grown=classe mature vaut nul
+isisfish.error.not.null.mean.weight=poids moyen nul
+isisfish.error.not.null.natiral.death=mortalite naturelle nulle
+isisfish.error.not.possible.metier=Pas de m\u00E9tier possible
+isisfish.error.not.support.class=La classe %s ne supporte pas les descritions
+isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0
+isisfish.error.obtain.analyseplan=Can't obtain description of AnalysePlan
+isisfish.error.obtain.doc.export=Can't obtain @Doc on class Export
+isisfish.error.obtain.doc.resultName=Can't obtain @Doc on ResultName
+isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class
+isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s
+isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s
+isisfish.error.obtain.field.export=Can't obtain field @Doc for Export %1$s
+isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %1$s
+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
+isisfish.error.parse.long=Can't parse long %1$s
+isisfish.error.plan.parameter=Can't get plan parameter from compiled class
+isisfish.error.prepare.data=Can't prepare data
+isisfish.error.prepare.information.simulation=Can't prepare information for simulation
+isisfish.error.read.simulation=Can't read simulation information %1$s
+isisfish.error.read.simulation.parameters=Impossible de lire les param\u00EAtres du fichier \: %1$s
+isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0
+isisfish.error.region.name.empty=Le nom de la R\u00E9gion est vide
+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.region=
+isisfish.error.save.script.compilation=Can't save script to compilation\: %1$s
+isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s
+isisfish.error.script.create=isisfish.error.script.create
+isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s
+isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s
+isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s
+isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s
+isisfish.error.sensitivity.parameter=
+isisfish.error.simulation.log.openAppender=n'a pas pu ouvrir l'appender de la simulation %1$s pour la raison %2$s
+isisfish.error.simulation.remote.global=Impossible de lancer une simulation sur serveur distant
+isisfish.error.simulation.remote.wrongportvalue=Le port de connexion a une valeur incorrecte \: %s
+isisfish.error.simulation.resultXml.close=Can't close simulation result XML for reason %1$s
+isisfish.error.simulation.resultXml.open=Can't open simulation result XML for reason %1$s
+isisfish.error.simulation.resultXml.write=Can't write simulation result XML for reason %1$s
+isisfish.error.source.parameter=Can't get parameter from source
+isisfish.error.strategy.order=Strategy %1$s don't have 12 StrategyMonthInfo but %2$s. Recreate them
+isisfish.error.undefined.classes=pas de classes d\u00E9finies
+isisfish.error.undefined.correspondence.zones.reproduction.recruitment=pas de correspondance entre les zones de reproduction et les zones de recrutement
+isisfish.error.undefined.gear=l'engin n'est pas d\u00E9fini
+isisfish.error.undefined.mesh=aucune maille de d\u00E9fini
+isisfish.error.undefined.mesh.sector=aucune maille dans le secteur
+isisfish.error.undefined.meta.population=aucune meta population de d\u00E9fini
+isisfish.error.undefined.natural.death=pas de mortalit\u00E9 naturelle sur les classes naissantes
+isisfish.error.undefined.sector=aucun secteur de d\u00E9fini
+isisfish.error.undefined.stategy=aucune strat\u00E9gie de d\u00E9fini
+isisfish.error.undefined.stategy.months=La strat\u00E9gie n'est pas d\u00E9finie pour certain mois
+isisfish.error.undefined.zone.population=il n'y a pas de zone de population de d\u00E9finie
+isisfish.error.undefined.zone.recruitment=il n'y a pas de zone de recrutement de d\u00E9finie
+isisfish.error.undefined.zone.reproduction=il n'y a pas de zone de reproduction de d\u00E9finie
+isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s
+isisfish.error.wait.simThread=Can't wait SimThread
+isisfish.error.warning.title=Attention
+isisfish.error.write.simulation=Can't write information %1$s
+isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire
+isisfish.exit.title=Exit
+isisfish.export.directory=Dossier d'export
+isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s
+isisfish.export.title=Export des r\u00E9sultats
+isisfish.factor.coefficient=Co\u00E9fficient (en %)
+isisfish.factor.comment=Commentaires
+isisfish.factor.continue=Facteur continu
+isisfish.factor.discret=Facteur discret
+isisfish.factor.factor=Facteur
+isisfish.factor.firstValue=Premi\u00E8re valeur
+isisfish.factor.increment=Cardinalit\u00E9
+isisfish.factor.lastValue=Derni\u00E8re valeur
+isisfish.factor.name=Nom du facteur
+isisfish.factor.operateur=Op\u00E9rateur
+isisfish.factor.selectDiscretNumber=Nombre de facteurs
+isisfish.factor.title=Saisie d'un facteur
+isisfish.factor.validDiscretNumber=Valider
+isisfish.factor.value=Valeur
+isisfish.filter=Filtrer
+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
+isisfish.filter.log.levelInfo=info
+isisfish.filter.log.levelTrace=trace
+isisfish.filter.log.levelWarn=warning
+isisfish.filter.log.tooltip.levelDebug=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.levelError=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.levelFatal=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.levelInfo=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.levelTrace=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.levelWarn=s\u00E9lectionner pour filtrer ce niveau
+isisfish.filter.log.tooltip.message=Entrer un terme \u00E0 rechercher et appuyer sur Entr\u00E9e
+isisfish.filter.reset=R\u00E9initialiser
+isisfish.filter.result=R\u00E9sultats
+isisfish.filter.result.found=R\u00E9sultats (%d/%d)
+isisfish.filter.select=S\u00E9lectionner
+isisfish.filter.select.simulation=S\u00E9lectionner une simulation
+isisfish.filter.simulation=Filtrer les simulations
+isisfish.filter.simulation.analysePlanNumber=num\u00E9ro d'analyse
+isisfish.filter.simulation.description=description
+isisfish.filter.simulation.local=locale
+isisfish.filter.simulation.numberOfYear=nombre d'ann\u00E9e(s)
+isisfish.filter.simulation.regionName=nom de r\u00E9gion
+isisfish.filter.simulation.simulationEnd=date de fin (dd/MM/yyyy)
+isisfish.filter.simulation.simulationName=nom de simulation
+isisfish.filter.simulation.simulationStart=date de d\u00E9but (dd/MM/yyyy)
+isisfish.filter.simulation.simulatorName=nom du simulateur
+isisfish.filter.simulation.tooltip.analysePlanNumber=filter sur le num\u00E9ro d'analyse (uniquement pour les simulations avec plan d'analyse)
+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\u00E9e(s) (recherche extacte)
+isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la r\u00E9gion (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.simulationStart=filtrer sur la date de d\u00E9but de simulation (format dd/MM/yyyy)
+isisfish.filter.simulation.tooltip.simulatorName=filter sur le nom du simulateur utilis\u00E9 (format regex)
+isisfish.filter.simulation.tooltip.useAnalysePlan=filter uniquement les simulations avec plan d'analyse
+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.useStatistic=filter uniquement les simulations avec statistiques
+isisfish.filter.simulation.useAnalysePlan=plan d'analyse
+isisfish.filter.simulation.useOptimization=optimisation
+isisfish.filter.simulation.usePreScript=prescript
+isisfish.filter.simulation.useStatistic=statistiques
+isisfish.fisheryRegion.addMap=Ajouter une carte
+isisfish.fisheryRegion.area=Extr\u00E9mit\u00E9s de la zone de p\u00EAche
+isisfish.fisheryRegion.comments=Commentaires
+isisfish.fisheryRegion.delMap=Supprimer la carte
+isisfish.fisheryRegion.latitude=Lat.
+isisfish.fisheryRegion.latitude.max=Lat. max.
+isisfish.fisheryRegion.latitude.min=Lat. min.
+isisfish.fisheryRegion.longitude=Long.
+isisfish.fisheryRegion.longitude.max=Long. max.
+isisfish.fisheryRegion.longitude.min=Long. min.
+isisfish.fisheryRegion.name=Nom de la r\u00E9gion
+isisfish.fisheryRegion.ofCells=de mailles (option)
+isisfish.fisheryRegion.selectFile=S\u00E9lectionnez un fichier
+isisfish.fisheryRegion.spatial=R\u00E9solution spatiale
+isisfish.gear.comments=Commentaires
+isisfish.gear.effortUnit=Unit\u00E9 d'effort
+isisfish.gear.name=Nom
+isisfish.gear.rangeValues=Range of values
+isisfish.gear.standardisationFactor=Facteur de standardisation
+isisfish.gear.technicalParameter=Param\u00E8tre technique
+isisfish.gear.title=Engin
+isisfish.graphBean.graph.render=Choisir un rendu de graphe
+isisfish.graphBean.graphPanel=defaultToolTip-fr.ifremer.graph.GraphBean.graphPanel
+isisfish.graphBean.graphRendererCombo=defaultToolTip-fr.ifremer.graph.GraphBean.graphRendererCombo
+isisfish.graphBean.graphSplitPane=defaultToolTip-fr.ifremer.graph.GraphBean.graphSplitPane
+isisfish.graphBean.label=defaultToolTip-fr.ifremer.graph.GraphBean.label1
+isisfish.graphBean.palettePanel=defaultToolTip-fr.ifremer.graph.GraphBean.palettePanel
+isisfish.graphBean.scrolledwindow=defaultToolTip-fr.ifremer.graph.GraphBean.scrolledwindow1
+isisfish.graphBean.table=defaultToolTip-fr.ifremer.graph.GraphBean.table2
+isisfish.graphBean.table3=defaultToolTip-fr.ifremer.graph.GraphBean.table3
+isisfish.graphCombo.render.bar.horizontal=Rendu en barre horizontale
+isisfish.graphCombo.render.bar.horizontal.stacked=Rendu en barre horizontale empil\u00E9e
+isisfish.graphCombo.render.bar.vertical=Rendu en barre verticale
+isisfish.graphCombo.render.bar.vertical.3d=Rendu en barre verticale 3D
+isisfish.graphCombo.render.bar.vertical.stacked=Rendu en barre verticale empil\u00E9e
+isisfish.graphCombo.render.line=Rendu en ligne
+isisfish.graphCombo.render.min.max=Rendu en MinMax
+isisfish.graphCombo.render.surface=Rendu en Aire
+isisfish.infoItem..table=defaultToolTip-fr.ifremer.resultat.InfoItem.table29
+isisfish.infoItem.label=defaultToolTip-fr.ifremer.resultat.InfoItem.label
+isisfish.infoItem.list=defaultToolTip-fr.ifremer.resultat.InfoItem.list
+isisfish.infoItem.scrolledwindow=defaultToolTip-fr.ifremer.resultat.InfoItem.scrolledwindow1
+isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton
+isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e
+isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30
+isisfish.input.continueCells=Continuer vers les mailles
+isisfish.input.continueGears=Continuer vers les engins
+isisfish.input.continueMetiers=Continuer vers les metiers
+isisfish.input.continuePopulations=Continuer vers les populations
+isisfish.input.continuePorts=Continuer vers les ports
+isisfish.input.continueSetOfVessels=Continuer vers les ensembles de navires
+isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces
+isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies
+isisfish.input.continueTripTypes=Continuer vers les types de trajets
+isisfish.input.continueVesselTypes=Continuer vers les types de navires
+isisfish.input.continueZones=Continuer vers les zones
+isisfish.input.menu.addRegion=Ajouter une r\u00E9gion
+isisfish.input.menu.commit=Sauvegarder les changements
+isisfish.input.menu.copyRegion=Copier r\u00E9gion
+isisfish.input.menu.exportRegion=Exporter la r\u00E9gion
+isisfish.input.menu.importRegion=Importer une r\u00E9gion
+isisfish.input.menu.importRegionSimulation=Importer la r\u00E9gion d'une simulation
+isisfish.input.menu.importRegionV2=Importer une r\u00E9gion de la v2 d'IsisFish
+isisfish.input.menu.importRenameRegion=Importer une r\u00E9gion et la renommer
+isisfish.input.menu.removeLocaly=Supprimer localement
+isisfish.input.menu.removeLocalyRemotely=Supprimer localement et \u00E0 distance
+isisfish.input.menu.server=Serveur
+isisfish.input.newRegion=Nouvelle r\u00E9gion
+isisfish.input.selectRegion=S\u00E9lectionnez une r\u00E9gion
+isisfish.input.title=Saisie de la p\u00EAcherie
+isisfish.launch.anonymous=lecture seule
+isisfish.launch.debugMode=debug mode
+isisfish.launch.email=courriel
+isisfish.launch.firstname=nom
+isisfish.launch.init.done=init done in %1$s.
+isisfish.launch.lasstname=pr\u00E9nom
+isisfish.launch.server.authenticationMethod=droit d'acc\u00E8s au serveur
+isisfish.launch.server.login=nom utilisateur
+isisfish.launch.server.ssh.confirm.passphrase=confirmer la passphrase
+isisfish.launch.server.ssh.key.change=Changer la clef ssh
+isisfish.launch.server.ssh.key.generate=G\u00E9n\u00E9rer la clef ssh
+isisfish.launch.server.ssh.no.passphrase=pas de passphrase
+isisfish.launch.server.ssh.passphrase=passphrase
+isisfish.launch.server.ssh.privateKeyFile=clef priv\u00E9e ssh
+isisfish.launch.server.ssh.publicKeyFile=clef publique ssh
+isisfish.launch.ssh=lecture-\u00E9criture (ssh)
+isisfish.launch.start=Lancement Isis-fish... %1$s
+isisfish.launch.stop=Stopping simulation...
+isisfish.launching=after init done in %1$s.
+isisfish.log.addAppender=ajoute un appender [%1$s]
+isisfish.log.body=Message \u00E0 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 \u00E9t\u00E9 envoy\u00E9 \u00E0 %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\u00E9
+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
+isisfish.log.tooltip.sendMail=Cliquer pour envoyer le courriel contentant les fichiers
+isisfish.message.add.objets.simulation=Ajout des nouveaux objets cr\u00E9\u00E9s durant la simulation
+isisfish.message.backup.database.finished=backup database termin\u00E9
+isisfish.message.backup.database.progress=backup database en cours
+isisfish.message.cancel.finished=Cancel finished
+isisfish.message.check.finished=v\u00E9rification termin\u00E9e
+isisfish.message.check.region=
+isisfish.message.checking.cell=
+isisfish.message.choose.archive=choose archive file or directory
+isisfish.message.commit.cancelled=commit annul\u00E9
+isisfish.message.commit.finished=commit termin\u00E9
+isisfish.message.commit.region.canceled=Commit de la r\u00E9gion annul\u00E9
+isisfish.message.commiting.region=En train de commiter la r\u00E9gion %1$s ...
+isisfish.message.compilation.time=Temps de compilation %1$ss
+isisfish.message.confirm.delete.object=Voulez-vous vraiment supprimer l'objet %1$s
+isisfish.message.confirm.remove.region=Voulez-vous vraiement supprimer la r\u00E9gion %1$s ?
+isisfish.message.confirm.remove.script=Voulez-vous vraiment supprimer le script '%1$s' ?
+isisfish.message.copy.finished=Copie termin\u00E9e
+isisfish.message.copy.region=Copier la r\u00E9gion vers %1$s
+isisfish.message.creating.region=En train de cr\u00E9er la r\u00E9gion %1$s
+isisfish.message.creation.done=cr\u00E9ation termin\u00E9e %1$s
+isisfish.message.creation.finished=Cr\u00E9ation termin\u00E9e
+isisfish.message.delete.canceled=supression annul\u00E9e
+isisfish.message.delete.entities=Supprimer les entit\u00E9s
+isisfish.message.delete.entity=Supprimer l'entit\u00E9
+isisfish.message.delete.finished=Suppression termin\u00E9e
+isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivants seront aussi supprim\u00E9s \n\n
+isisfish.message.evaluation.finished=\u00E9valuation termin\u00E9e
+isisfish.message.export.done=Export termin\u00E9
+isisfish.message.export.zip=Exporter dans le fichier zip %1$s
+isisfish.message.file.overwrite=Le fichier existe, Voulez-vous l'\u00E9craser ?
+isisfish.message.import=Importer %1$s
+isisfish.message.import.equation.convert=Conversion manuelle de l'\u00E9quation
+isisfish.message.import.finished=Import termin\u00E9
+isisfish.message.import.region.name=Entre le nom de la r\u00E9egion \u00E0 importer
+isisfish.message.import.region.xml=R\u00E9gion XML (Isis-Fish V2.x)
+isisfish.message.import.region.zipped=Zipped Region
+isisfish.message.import.scripts.file.cancelled=Importation des scripts annul\u00E9
+isisfish.message.import.xml.v2.file=Import xml v2 file
+isisfish.message.import.zip=Import zip file
+isisfish.message.launchui.notlaunch=
+isisfish.message.load.finished=Chargement termin\u00E9
+isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s)
+isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ...
+isisfish.message.loading.region=Chargement de la r\u00E9gion
+isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer
+isisfish.message.new.filename=Entrer le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule)
+isisfish.message.new.region.name=Entrer le nom de la nouvell r\u00E9gion
+isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e
+isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ?
+isisfish.message.presimulation.script.execution=Ex\u00E9cution des scripts de Presimulation
+isisfish.message.recruitment.number.month=Input the number of month of recruitment
+isisfish.message.region.commited=R\u00E9gion commit\u00E9e
+isisfish.message.region.loaded=R\u00E9gion charg\u00E9e
+isisfish.message.region.remove.canceled=Suppression de r\u00E9gion annul\u00E9
+isisfish.message.region.removed=R\u00E9gion supprim\u00E9e
+isisfish.message.remove.canceled=Suppression annul\u00E9e
+isisfish.message.remove.finished=Suppresison termin\u00E9
+isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s ...
+isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion
+isisfish.message.save.finished=Sauvegarde termin\u00E9e
+isisfish.message.saveModel.finished=Sauvegarde du mod\u00E8le termin\u00E9e
+isisfish.message.script.commit=Indiquez vos modifications
+isisfish.message.setting.cache.aspects=Mise en place des aspects Cache
+isisfish.message.setting.trace.aspects=Mise en place des aspects Trace
+isisfish.message.simulation.ended=Simulation termin\u00E9e
+isisfish.message.simulation.execution=Simulation execution
+isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation
+isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e
+isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e
+isisfish.metier.comments=Commentaires
+isisfish.metier.name=Nom
+isisfish.metier.rangeValues=Param\u00E8tre d'engin
+isisfish.metier.title=M\u00E9tier
+isisfish.metierMonitor.metiers=M\u00E9tiers
+isisfish.metierMonitor.strategies=Strat\u00E9gies
+isisfish.metierSeasonInfo.toString=%1$s saison %2$s-%3$s
+isisfish.metierSeasonInfoSpecies.mainSpecies=Esp\u00E8ces principales pour le m\u00E9tier
+isisfish.metierSeasonInfoSpecies.selectSeason=S\u00E9lectionnez une saison
+isisfish.metierSeasonInfoSpecies.selectSpecies=Choix de l'esp\u00E8ce
+isisfish.metierSeasonInfoSpecies.species=Esp\u00E8ce
+isisfish.metierSeasonInfoSpecies.targetFactor=Facteur cible
+isisfish.metierSeasonInfoSpecies.title=Esp\u00E8ces capturables
+isisfish.metierSeasonInfoZone.comments=Commentaires
+isisfish.metierSeasonInfoZone.season=Saison
+isisfish.metierSeasonInfoZone.selectSeason=S\u00E9lectionnez une saison
+isisfish.metierSeasonInfoZone.title=Saison / Zones
+isisfish.monitor.title=Application Monitor
+isisfish.month.april=avril
+isisfish.month.august=ao\u00FBt
+isisfish.month.december=d\u00E9cembre
+isisfish.month.february=f\u00E9vrier
+isisfish.month.january=janvier
+isisfish.month.july=juillet
+isisfish.month.june=juin
+isisfish.month.march=mars
+isisfish.month.may=mai
+isisfish.month.november=novembre
+isisfish.month.october=octobre
+isisfish.month.september=septembre
+isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s'
+isisfish.params.clearFilter=Remise \u00E0 z\u00E9ro du filtre
+isisfish.params.description=Description
+isisfish.params.filter=Filtrer
+isisfish.params.lblLauncher=Lanceur de simulation
+isisfish.params.loadOldSimulation=Charger une ancienne simulation
+isisfish.params.numberYear=Nombre d'ann\u00E9es
+isisfish.params.onlyExportSimulation=Exporter uniquement des simulations
+isisfish.params.populationNumbers=Donn\u00E9es de population
+isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles
+isisfish.params.sensitivityName=Nom de l'analyse de sensibilit\u00E9
+isisfish.params.simulationName=Nom de la simulation
+isisfish.params.title=Param\u00E8tres
+isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n
+isisfish.params.toString.lib.logger.level=niveau du logger de librairies %1$s
+isisfish.params.toString.number.years=Nombre d'ann\u00E9\u00E9s \: %1$s\n\n
+isisfish.params.toString.plan=Plan\: %1$s
+isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n
+isisfish.params.toString.populations=Populations\:
+isisfish.params.toString.rule=Rule\: %1$s
+isisfish.params.toString.script.logger.level=niveau du logger de scripts %1$s
+isisfish.params.toString.script.presimulation=Script de presimulation
+isisfish.params.toString.simul.logger.level=niveau du logger de simulateur %1$s
+isisfish.params.toString.simulation.done=Simulation r\u00E9alis\u00E9e avec %1$s\:
+isisfish.params.toString.strategies=Strat\u00E9gies d'exploitation\:
+isisfish.params.useAnalysePlan=Utiliser le plan de simulation
+isisfish.params.usePreSimulationScript=Utiliser un script de pr\u00E9-simulation
+isisfish.population.capturability=Capturabilit\u0E009e
+isisfish.population.comments=Commentaires
+isisfish.population.group=Groupe
+isisfish.population.groups=Groupes
+isisfish.population.mappingZoneReproZoneRecru=MappingZoneReproZoneRecru
+isisfish.population.matrixAbundance=Matrice d'abondance
+isisfish.population.matrixAbundance1D=matrixAbundance1D
+isisfish.population.recruitment=Recrutement
+isisfish.population.reproduction=Reproduction
+isisfish.population.season=Saison
+isisfish.population.zones=Zones
+isisfish.populationBasics.geographicID=Identifiant g\u00E9ographique
+isisfish.populationBasics.growth=Croissance
+isisfish.populationBasics.growthReverse=Croissance inverse
+isisfish.populationBasics.maturityGroup=Groupe de maturit\u00E9
+isisfish.populationBasics.name=nom
+isisfish.populationBasics.numberGroup=Nombre de groupes
+isisfish.populationBasics.plusGroup=plusGroup
+isisfish.populationBasics.recreateClasses=Recruter les classes
+isisfish.populationBasics.title=Saisie des Populations
+isisfish.populationCapturability.comments=Commentaires
+isisfish.populationCapturability.selectCoefficient=S\u00E9lectionnez un coefficient par saison et par classe
+isisfish.populationCapturability.title=Saisie de la capturabilit\u00E9
+isisfish.populationEquation.meanWeight=Poids moyen
+isisfish.populationEquation.naturalDeathRate=Taux de mortalit\u00E9 naturelle
+isisfish.populationEquation.price=Prix
+isisfish.populationEquation.title=Saisie des \u00E9quations
+isisfish.populationGroup.age=Age
+isisfish.populationGroup.comments=Commentaires
+isisfish.populationGroup.length=Longueur
+isisfish.populationGroup.meanWeigth=Poids principal
+isisfish.populationGroup.naturalDeathRate=Taux de mortalit\u00E9 naturelle
+isisfish.populationGroup.price=Prix
+isisfish.populationGroup.reproductionRate=Taux de reproduction
+isisfish.populationGroup.title=Saisie des groupes de population
+isisfish.populationGroup.toString=%1$s Groupe %2$s
+isisfish.populationMigration.comments=Commentaires
+isisfish.populationMigration.selectSeason=S\u00E9lectionnez une saison
+isisfish.populationMigration.title=Migration
+isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation
+isisfish.populationMigrationEmigration.coefficient=Coefficient
+isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part
+isisfish.populationMigrationEmigration.title=Population emmigration
+isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e
+isisfish.populationMigrationImmigration.coefficient=Coefficient
+isisfish.populationMigrationImmigration.title=Population immigration
+isisfish.populationMigrationMigration.arrivalZone=Zone d'arriv\u00E9e
+isisfish.populationMigrationMigration.coefficient=Coefficient
+isisfish.populationMigrationMigration.departureZone=Zone de d\u00E9part
+isisfish.populationMigrationMigration.title=Migration de population
+isisfish.populationRecruitment.comments=Commentaires
+isisfish.populationRecruitment.recruitmentDistribution=Distribution du recrutement
+isisfish.populationRecruitment.reproductionEquation=Equation de reproduction
+isisfish.populationRecruitment.title=Saisie des reproductions
+isisfish.populationSeasonInfo.arrival=Arriv\u00E9e
+isisfish.populationSeasonInfo.departure=D\u00E9part
+isisfish.populationSeasonInfo.distributionSpawing=Distribution de la reproduction
+isisfish.populationSeasonInfo.emigration=Emigration
+isisfish.populationSeasonInfo.group=Groupe
+isisfish.populationSeasonInfo.immigration=Immigration
+isisfish.populationSeasonInfo.migration=Migration
+isisfish.populationSeasonInfo.months=Mois
+isisfish.populationSeasonInfo.toString=%1$s saison %2$s-%3$s
+isisfish.populationSeasons.changeGroup=Changement de groupe
+isisfish.populationSeasons.comments=Commentaires
+isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction
+isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison
+isisfish.populationSeasons.title=Saisons
+isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones d'apparitions et de recrutement
+isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations
+isisfish.populationZones.selectRecruitmentAreas=S\u00E9lectionnez les zones de recrutement
+isisfish.populationZones.selectSpawningAreas=S\u00E9lectionnez les zones de reproduction
+isisfish.populationZones.title=Zones
+isisfish.port.cell=Maille du port
+isisfish.port.comments=Commentaires
+isisfish.port.name=Nom
+isisfish.preScript.backParameter=Retour aux param\u00E8tres
+isisfish.preScript.title=Script de pr\u00E9-simulation
+isisfish.queue.clearDone=Retirer les simulations termin\u00E9es
+isisfish.queue.id=Identifiant
+isisfish.queue.launcher=Lanceur de simulation
+isisfish.queue.plan=Plan
+isisfish.queue.progression=Progression
+isisfish.queue.showLog=Voir les logs de la simulation
+isisfish.queue.simulationLaunch=Lanceur de la queue des simulations
+isisfish.queue.status=\u00C9tat
+isisfish.queue.stopSimulation=Arr\u00EAter la simulation
+isisfish.queue.title=Queue
+isisfish.result.abundance=Abondance
+isisfish.result.add=Ajouter un r\u00E9sultat
+isisfish.result.begin.simulation=En d\u00E9but de simulation\:
+isisfish.result.capture=Capturer
+isisfish.result.capture.metier=Capturer par m\u00E9tier
+isisfish.result.choose.simulation=Choisir une simulation
+isisfish.result.datas=Donn\u00E9es
+isisfish.result.datasRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.donneeRadioButton
+isisfish.result.desktopPane=defaultToolTip-fr.ifremer.resultat.ResultatView.desktopPane
+isisfish.result.dimension=Dimension
+isisfish.result.end.simulation=En fin de Simulation\:
+isisfish.result.export=Export
+isisfish.result.export.file=Exporter un fichier texte
+isisfish.result.file=Fichier
+isisfish.result.graph=Graphe
+isisfish.result.graphRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.graphRadioButton
+isisfish.result.hpaned=defaultToolTip-fr.ifremer.resultat.ResultatEdit.hpaned2
+isisfish.result.infoPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.infoPanel
+isisfish.result.label=defaultToolTip-fr.ifremer.resultat.ResultatView.label9
+isisfish.result.map=Carte
+isisfish.result.mapRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.mapRadioButton
+isisfish.result.menuExport=defaultToolTip-fr.ifremer.resultat.ResultatEdit.menuExport
+isisfish.result.menubar=defaultToolTip-fr.ifremer.resultat.ResultatView.menubar1
+isisfish.result.menuitem=defaultToolTip-fr.ifremer.resultat.ResultatView.menuitem2
+isisfish.result.new.window=Ouvrir une nouvelle fen\u00EAtre
+isisfish.result.openWindowButton=defaultToolTip-fr.ifremer.resultat.ResultatView.openWindowButton
+isisfish.result.quit=Quitter
+isisfish.result.reject.metier=Rejet par metier
+isisfish.result.remove.simulation=Supprimer Simulation
+isisfish.result.removeSimulationButton=defaultToolTip-fr.ifremer.resultat.ResultatView.supprimerSimulationButton
+isisfish.result.resultat=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resultat
+isisfish.result.scroll=defaultToolTip-fr.ifremer.resultat.ResultatEdit.scroll
+isisfish.result.show.simulation.log=Voir les logs
+isisfish.result.simulation=defaultToolTip-fr.ifremer.resultat.ResultatView.simulation
+isisfish.result.statusBar=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusbar1
+isisfish.result.statusImage=defaultToolTip-fr.ifremer.resultat.ResultatEdit.statusImage
+isisfish.result.stress.metier=Effort par metier
+isisfish.result.summary=R\u00E9sum\u00E9
+isisfish.result.summaryRadioButton=defaultToolTip-fr.ifremer.resultat.ResultatEdit.resumeRadioButton
+isisfish.result.table=defaultToolTip-fr.ifremer.resultat.ResultatView.table33
+isisfish.result.title=R\u00E9sultat
+isisfish.result.tooltip.show.simulation.log=Cliquer pour afficher la console des logs de la simulation
+isisfish.result.unload.metier=Debarquement par metier
+isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1
+isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel
+isisfish.resultChoice.save=R\u00E9sultats \u00E0 sauvegarder
+isisfish.resultChoice.saved=R\u00E9sultats sauvegard\u00E9
+isisfish.resultChoice.title=Choix de r\u00E9sultats
+isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid
+isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea
+isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2
+isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1
+isisfish.script.check=V\u00E9rifier
+isisfish.script.commit=Commit
+isisfish.script.copy=Copier
+isisfish.script.cut=Couper
+isisfish.script.evaluate=\u00C9valuer
+isisfish.script.export=Exporter des scripts dans une archive zip
+isisfish.script.export.cancel=annuler
+isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner
+isisfish.script.export.chooseDir=...
+isisfish.script.export.ok=exporter
+isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter
+isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts
+isisfish.script.import=Importer des scripts depuis une archive zip
+isisfish.script.import.cancel=annuler
+isisfish.script.import.checkAll=Tout (d\u00E9-)s\u00E9lectionner
+isisfish.script.import.labelAdd=Le(s) fichier(s) suivant(s) sera(ont) ajout\u00E9(s), Confirmer l'ajout
+isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement
+isisfish.script.import.ok=importer
+isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer
+isisfish.script.menu.checkSyntax=V\u00E9rifier la syntaxe
+isisfish.script.menu.code=Code
+isisfish.script.menu.commit=Commiter des scripts sur le serveur
+isisfish.script.menu.copy=Copier
+isisfish.script.menu.cut=Couper
+isisfish.script.menu.deleteLocaly=Supprimer localement
+isisfish.script.menu.deleteLocalyServer=Supprimer localement et sur le serveur
+isisfish.script.menu.diff=Voir les diff\u00E9rences avec la version du serveur
+isisfish.script.menu.edit=\u00C9dition
+isisfish.script.menu.evaluate=Evaluer
+isisfish.script.menu.file=Fichier
+isisfish.script.menu.new=Nouveau
+isisfish.script.menu.paste=Coller
+isisfish.script.menu.save=Sauver
+isisfish.script.menu.txtEditorHelp=Aide en ligne...
+isisfish.script.menu.txtExport=Exporter
+isisfish.script.menu.txtHelp=Aide
+isisfish.script.menu.txtImport=Importer
+isisfish.script.menu.txtJavaHelp=Aide Java...
+isisfish.script.menu.txtNewAnalysePlan=Nouveau plan d'analyse
+isisfish.script.menu.txtNewEquationModel=Nouvelle formule
+isisfish.script.menu.txtNewExport=Nouveau script d'export
+isisfish.script.menu.txtNewRule=Nouvelle r\u00E8gle
+isisfish.script.menu.txtNewScript=Nouveau script
+isisfish.script.menu.txtNewSensitivity=Nouveau calculateur de sensibilit\u00E9
+isisfish.script.menu.txtNewSimulator=Nouveau simulateur
+isisfish.script.menu.txtVCS=Serveur
+isisfish.script.menu.update=Synchronisation
+isisfish.script.new=Nouveau
+isisfish.script.paste=Coller
+isisfish.script.save=Sauver
+isisfish.script.title=Editeur de scripts
+isisfish.script.txtExport=Exporter
+isisfish.season.toString=saison %1$s-%2$s
+isisfish.selectivity.equation=Equation
+isisfish.selectivity.selectPopulation=S\u00E9lectionnez une population
+isisfish.selectivity.title=S\u00E9lectivit\u00E9
+isisfish.sens.backParameter=Retour aux param\u00E8tres
+isisfish.sens.title=Plan de simulation
+isisfish.sensitivity.displaysecondpass=Afficher les r\u00E9sultats
+isisfish.sensitivity.export=Export
+isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats
+isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats
+isisfish.sensitivity.select=M\u00E9thode
+isisfish.sensitivity.title=S\u00E9lection des facteurs
+isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9
+isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH
+isisfish.setOfVessels.comments=Commentaires
+isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes
+isisfish.setOfVessels.name=Nom
+isisfish.setOfVessels.numberOfVessels=Nombre de navires
+isisfish.setOfVessels.technicalEfficiency=
+isisfish.setOfVessels.title=Caract\u00E9ristiques
+isisfish.setOfVessels.vesselType=Type de navire
+isisfish.simpleResult.legendPanel=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.legendPanel
+isisfish.simpleResult.more.information=Cliquer sur une cellule pour plus d'informations...
+isisfish.simpleResult.resultatMap=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMap
+isisfish.simpleResult.resultatMapToolBar=defaultToolTip-fr.ifremer.isisfish.map.SimpleIsisMapBeanBean.resultatMapToolBar
+isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12
+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\u00E9tres d'une simulation
+isisfish.simulation.menu.save=Sauver les param\u00E8tres de la simulation
+isisfish.simulation.menu.simulation=Simulation
+isisfish.simulation.name=Nom de la simulation
+isisfish.simulation.remote.message.connection=Connexion \u00E0 Caparmor
+isisfish.simulation.remote.message.downloadresults=T\u00E9l\u00E9chargement des r\u00E9sultats
+isisfish.simulation.remote.message.upload=Upload de la simulation
+isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation
+isisfish.simulation.title=Lanceur de simulation
+isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus
+isisfish.simulator.launcher.remote=sur le serveur Caparmor
+isisfish.simulator.launcher.subprocess=dans un sous processus
+isisfish.simulator.simulaction.badid=Impossible de lancer la simulation '%s' \: l'identifiant existe d\u00E9j\u00E0 \!
+isisfish.simulator.subprocess.readoutput.error=
+isisfish.species.age=Age
+isisfish.species.cee=CEE
+isisfish.species.comments=Commentaires
+isisfish.species.length=Longueur
+isisfish.species.name=Nom des esp\u00E8ces
+isisfish.species.rubbinCode=Code Rubbin
+isisfish.species.scientificName=Nom scientifique
+isisfish.species.structured=Structur\u00E9
+isisfish.ssh.askpassphrase.message=Entrez la passphrase pour la cl\u00E9 '%s' \:
+isisfish.ssh.askpassphrase.title=D\u00E9verrouillage de cl\u00E9 SSH
+isisfish.ssh.askpassphrase.wrongpassphrase=Mauvaise cl\u00E9, entrez une nouvelle passphrase '%s' \:
+isisfish.strategy.comments=Commentaires
+isisfish.strategy.inactivity=Equation d'inactivit\u00E9
+isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9
+isisfish.strategy.name=Nom
+isisfish.strategy.proportionSetOfVessels=Proportion des ensembles de navires
+isisfish.strategy.title=Caract\u00E9ristiques
+isisfish.strategyMonthInfo.metier=M\u00E9tier
+isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9
+isisfish.strategyMonthInfo.numberOfTrips=Nombre de trajets
+isisfish.strategyMonthInfo.proportion=Proportion
+isisfish.strategyMonthInfo.title=StrategyMonthInfo
+isisfish.strategyMonthInfo.toString=%1$s %2$s
+isisfish.timeUnit.day=Jour
+isisfish.timeUnit.hours=Heures
+isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s
+isisfish.tray.simulation.no=Isis-fish - Pas de simulation
+isisfish.tripType.comments=Commentaires
+isisfish.tripType.duration=Dur\u00E9e
+isisfish.tripType.minTime=Temps minimal entre deux voyages
+isisfish.tripType.name=Nom
+isisfish.vcs.ask.passphrase=Entrez votre passe phrase (si votre clef ssh en contient une).
+isisfish.vcs.ask.passphrase.title=Demande de passe phrase
+isisfish.vcs.commit=Message de sauvegarde
+isisfish.vcs.commit.cancel=annuler
+isisfish.vcs.commit.label=Entrer quelques mots concernant la modification des scripts
+isisfish.vcs.commit.ok=confirmer
+isisfish.vcs.init.notfoundcantdownload=La base de donn\u00E9es pour la version %s n'a ni pu \u00EAtre trouv\u00E9e, ni t\u00E9l\u00E9charg\u00E9e.\nVous devez la t\u00E9l\u00E9charger manullement \u00E0 partir du site d'Isis-Fish.
+isisfish.vcs.init.wrongprotocol=Votre base de donn\u00E9es locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et r\u00E9cup\u00E9rer une meilleure version ?
+isisfish.vcs.switchprotocol.confirm=Le protocole d'acc\u00E8s au d\u00E9p\u00F4t des scripts a chang\u00E9.\nVoulez-vous changer vers le nouveau d\u00E9p\u00F4t ?
+isisfish.vcs.switchtag.warningconflict=Votre base de donn\u00E9es a \u00E9t\u00E9 mise \u00E0 jour\nmais les fichiers suivants sont en conflit, merci de les v\u00E9rifier \:\n%s
+isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le d\u00E9p\u00F4t correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de d\u00E9p\u00F4t ?
+isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur
+isisfish.vcs.update.cancel=annuler
+isisfish.vcs.update.checkAll=(de)-select tout
+isisfish.vcs.update.local=Systeme local
+isisfish.vcs.update.local.modified=Fichiers modifi\u00E9s
+isisfish.vcs.update.local.outofdateAndModified=Fichiers localement modifi\u00E9s en conflit avec le serveur
+isisfish.vcs.update.local.tooltip.modified=Fichiers localement modifi\u00E9s \n(confirmer pour revenir \u00E0 la version avant modification ou soum\u00EAtre au serveur)
+isisfish.vcs.update.local.tooltip.outofdateAndModified=Fichiers localement modifi\u00E9s mais ayant une version plus r\u00E9cente sur le serveur\n (confirmer pour revenir \u00E0 la version avant modification ou r\u00E9cup\u00E9rer la nouvelle version du serveur)
+isisfish.vcs.update.local.tooltip.unversionned=Fichiers uniquement pr\u00E9sents sur votre systeme \n(confirmer pour les enregister sur le serveur)
+isisfish.vcs.update.local.unversionned=Nouveaux fichiers
+isisfish.vcs.update.ok=continuer
+isisfish.vcs.update.remote=Serveur distant
+isisfish.vcs.update.remote.missing=Nouveaux fichiers
+isisfish.vcs.update.remote.outofdate=Fichiers plus r\u00E9cents sur le serveur
+isisfish.vcs.update.remote.tooltip.missing=Nouveaux fichiers uniquement pr\u00E9sents sur le serveur \n(confirmer pour les r\u00E9cup\u00E9rer)
+isisfish.vcs.update.remote.tooltip.outofdate=Fichiers dont il existe une version plus r\u00E9cente sur le serveur \n(confirmer pour les r\u00E9cup\u00E9rer)
+isisfish.vcs.update.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les fichiers (\u00E0 action unique) que vous voulez traiter
+isisfish.vcs.update.tooltip.local=vcs.update.tooltip.local
+isisfish.vcs.update.tooltip.remote=vcs.update.tooltip.remote
+isisfish.vcs.updateconfirm=Confirmation des ope\u00E9rations de synchronisation avec le serveur
+isisfish.vcs.updateconfirm.cancel=annuler
+isisfish.vcs.updateconfirm.checkAll=(de)-select tout
+isisfish.vcs.updateconfirm.label=Confirmer les op\u00E9rations qui pourraient \u00E9craser vos fichiers
+isisfish.vcs.updateconfirm.label2='Etes vous sur de vouloir effectuer ces op\u00E9rations ?'
+isisfish.vcs.updateconfirm.ok=confirmer
+isisfish.vcs.updateconfirm.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts que vous voulez traiter
+isisfish.vcs.updaterepository.confirm=Votre d\u00E9p\u00F4t des scripts n'est pas \u00E0 jour. Voulez-vous mettre \u00E0 jour les fichiers suivants ?
+isisfish.vcs.vcssvn.add.error=Impossible d'ajouter un fichier
+isisfish.vcs.vcssvn.add.errorreadonly=Vous ne pouver pas ajouter de fichier, ce d\u00E9p\u00F4t est en lecture seule \!
+isisfish.vcs.vcssvn.checkProtocol.error=Impossible d'obtenir l'adresse correspondant au d\u00E9p\u00F4t local
+isisfish.vcs.vcssvn.checkProtocol.relocate=Transfert du d\u00E9p\u00F4t %s de %s vers %s
+isisfish.vcs.vcssvn.checkout.error=Impossible de mettre \u00E0 jour
+isisfish.vcs.vcssvn.cleanup.error=Impossible de d\u00E9verrouiller la copie locale
+isisfish.vcs.vcssvn.commit.error=Impossible de commiter
+isisfish.vcs.vcssvn.commit.errorreadonly=Vous ne pouvez pas commiter, le d\u00E9p\u00F4t est en lecture seule
+isisfish.vcs.vcssvn.delete.error=Impossible de supprimer des fichiers
+isisfish.vcs.vcssvn.delete.errorreadonly=Vous ne pouvez pas supprimer ce fichier, le d\u00E9p\u00F4t est en lecture seule
+isisfish.vcs.vcssvn.diff.error=Impossible d'obtenir le diff
+isisfish.vcs.vcssvn.gettag.error=Erreur lors de la r\u00E9cup\u00E9ration de l'adresse du d\u00E9p\u00F4t local
+isisfish.vcs.vcssvn.getupdate.error=Impossible d'obtenir le statut des fichiers
+isisfish.vcs.vcssvn.global.filelocalandremotestatus=Le statut du fichier %s est (l\:%s/d\:%s)
+isisfish.vcs.vcssvn.global.filestatus=Le statut de %s est %s
+isisfish.vcs.vcssvn.global.foundUpdatedFile=Ajout de %s comme fichier mis \u00E0 jour
+isisfish.vcs.vcssvn.global.torevision=\u00C0 la r\u00E9vision \: %d
+isisfish.vcs.vcssvn.isconnected.switchoff=Impossible de se connecter au serveur, passage en mode d\u00E9connect\u00E9 \: %s
+isisfish.vcs.vcssvn.isconnected.switchto=Connexion au serveur disponible, passage en mode connect\u00E9 \: %s
+isisfish.vcs.vcssvn.isonremote.error=Le fichier %s n'est pas sur le serveur
+isisfish.vcs.vcssvn.istag.notexist=Le tag %s n'existe pas
+isisfish.vcs.vcssvn.isuptodate.error=Impossible d'obtenir le statut de fichier
+isisfish.vcs.vcssvn.list.error=Impossible de lister
+isisfish.vcs.vcssvn.localstatus.error=Impossible d'obtenir le statut local de fichier
+isisfish.vcs.vcssvn.remotestatus.error=Impossible d'obtenir le statut distant de fichier
+isisfish.vcs.vcssvn.setTag.error=Erreur lors de la r\u00E9cup\u00E9ration de l'adresse du d\u00E9p\u00F4t local
+isisfish.vcs.vcssvn.settag.switchfromto=Switch du tag du d\u00E9p\u00F4t de %s \u00E0 %s
+isisfish.vcs.vcssvn.update.error=Impossible de mettre \u00E0 jour
+isisfish.vcs.vcssvn.update.notinlocal=Impossible de mettre \u00E0 jour des fichiers qui ne sont pas pas dans le d\u00E9p\u00F4t
+isisfish.versionStorage.removed=Supprim\u00E9
+isisfish.vesselType.activityRange=Intervalle d'activit\u00E9
+isisfish.vesselType.comments=Commentaires
+isisfish.vesselType.fuelCost=Co\u00FBt d'un trajet en fuel
+isisfish.vesselType.length=Longueur
+isisfish.vesselType.maxDuration=Dur\u00E9e maximale du trajet
+isisfish.vesselType.miniCrew=Taille minimale d'\u00E9quipage
+isisfish.vesselType.name=Nom
+isisfish.vesselType.speed=Vitesse
+isisfish.welcome.menu.about=\u00C0 propos
+isisfish.welcome.menu.close=Fermer
+isisfish.welcome.menu.configuration=Configuration
+isisfish.welcome.menu.file=Fichier
+isisfish.welcome.menu.frame=Fen\u00EAtre
+isisfish.welcome.menu.help=Aide
+isisfish.welcome.menu.help.isisfish=Site d'Isis-Fish
+isisfish.welcome.menu.help.isisfishapi=API Isis-Fish
+isisfish.welcome.menu.help.javaapi=API Java
+isisfish.welcome.menu.help.lutinmatrixapi=API LutinMatrix
+isisfish.welcome.menu.help.topiaapi=API ToPIA
+isisfish.welcome.menu.input=Saisie
+isisfish.welcome.menu.monitor=Fen\u00EAtre de logs
+isisfish.welcome.menu.queue=Liste des simulations
+isisfish.welcome.menu.result=R\u00E9sultat
+isisfish.welcome.menu.script=Script
+isisfish.welcome.menu.simulation=Lanceur de simulations
+isisfish.welcome.menu.synchro=Synchronisation Serveur
+isisfish.welcome.menu.vcs.configuration=Configuration vcs
+isisfish.welcome.title=Simulation Ifremer
+isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la m\u00EAme taille
+isisfish.wizardGroupCreation.allValues=Input all the values
+isisfish.wizardGroupCreation.computedGrowthCurve=Calcul\u00E9 par une courbe de croissance
+isisfish.wizardGroupCreation.firstAge=Premier age
+isisfish.wizardGroupCreation.firstAgeHelp=First age \= minimal age
+isisfish.wizardGroupCreation.firstGroup=Premier groupe
+isisfish.wizardGroupCreation.firstLength=Premi\u00E8re taille
+isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group
+isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year.
+isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted
+isisfish.wizardGroupCreation.groupWidth=Longueur du groupe
+isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group
+isisfish.wizardGroupCreation.lastAge=Dernier age
+isisfish.wizardGroupCreation.lastAgeHelp=Last age \= maximal age
+isisfish.wizardGroupCreation.maxGroupsLength=Taille maximale de groupes
+isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group
+isisfish.wizardGroupCreation.numberGroup=Nombre de groupes
+isisfish.wizardGroupCreation.numberGroups=Nombre de groupes
+isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics
+isisfish.wizardGroupCreation.selectGroupLengthType=Choisir la longueur du groupe
+isisfish.wizardGroupCreation.timeStep=Pas de temps (en mois)
+isisfish.wizardGroupCreation.title=Cr\u00E9ation du groupe
+isisfish.zone.cells=cellules de la Zone
+isisfish.zone.comments=Commentaires
+isisfish.zone.name=Nom
+maximum\ length=
+minimum\ length=
+not\ started=
+region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
+simulate\ %s\ with\ file\ %s=
1
0
Author: chatellier
Date: 2009-04-17 10:31:21 +0000 (Fri, 17 Apr 2009)
New Revision: 2116
Modified:
isis-fish/trunk/pom.xml
Log:
[maven-release-plugin] prepare release isis-fish-3.2.0.4-rc3
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-04-17 10:18:40 UTC (rev 2115)
+++ isis-fish/trunk/pom.xml 2009-04-17 10:31:21 UTC (rev 2116)
@@ -13,7 +13,7 @@
<groupId>ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>3.2.0.4-rc3-SNAPSHOT</version>
+ <version>3.2.0.4-rc3</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
@@ -535,9 +535,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- <url>${maven.scm.url}</url>
+ <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</connection>
+ <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.…</developerConnection>
+ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url>
</scm>
<!--Code Lutin Repository-->
1
0
r2115 - isis-fish/trunk/src/main/resources/i18n
by chatellier@users.labs.libre-entreprise.org 17 Apr '09
by chatellier@users.labs.libre-entreprise.org 17 Apr '09
17 Apr '09
Author: chatellier
Date: 2009-04-17 10:18:40 +0000 (Fri, 17 Apr 2009)
New Revision: 2115
Modified:
isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Fix "fatale"
Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-17 09:49:29 UTC (rev 2114)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-17 10:18:40 UTC (rev 2115)
@@ -382,7 +382,7 @@
isisfish.filter.cancel=Annuler
isisfish.filter.log.levelDebug=debug
isisfish.filter.log.levelError=erreur
-isisfish.filter.log.levelFatal=fatale
+isisfish.filter.log.levelFatal=fatal
isisfish.filter.log.levelInfo=info
isisfish.filter.log.levelTrace=trace
isisfish.filter.log.levelWarn=warning
1
0
r2114 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor main/java/fr/ifremer/isisfish/ui/sensitivity main/java/fr/ifremer/isisfish/ui/simulator main/resources/templates/script test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher te
by jcouteau@users.labs.libre-entreprise.org 17 Apr '09
by jcouteau@users.labs.libre-entreprise.org 17 Apr '09
17 Apr '09
Author: jcouteau
Date: 2009-04-17 09:49:29 +0000 (Fri, 17 Apr 2009)
New Revision: 2114
Added:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java
Log:
Refactoring on sensitivity.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -38,11 +38,11 @@
* {@inheritDoc}
*/
@Override
- public void start(Domain<? extends Serializable> domain) {
+ public void start(Domain domain) {
xmlBuffer.append("<domain>");
xmlBuffer.append("<fixed");
- ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain;
+ ContinuousDomain cDomain = (ContinuousDomain)domain;
xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">");
xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />");
@@ -52,8 +52,8 @@
* {@inheritDoc}
*/
@Override
- public <E extends Serializable> void visit(Domain<E> domain,
- Serializable label, Serializable value) {
+ public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain,
+ F label, E value) {
}
@@ -61,7 +61,7 @@
* {@inheritDoc}
*/
@Override
- public void end(Domain<? extends Serializable> domain) {
+ public void end(Domain domain) {
xmlBuffer.append("</fixed>");
xmlBuffer.append("</domain>");
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -71,7 +71,7 @@
*/
@Override
public void visit(DesignPlan designPlan,
- Factor<? extends Serializable> factor) {
+ Factor factor) {
FactorXMLVisitor visitor = new FactorXMLVisitor();
factor.accept(visitor);
xmlBuffer.append(visitor.getXML());
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -38,11 +38,11 @@
* {@inheritDoc}
*/
@Override
- public void start(Domain<? extends Serializable> domain) {
+ public void start(Domain domain) {
xmlBuffer.append("<domain>");
xmlBuffer.append("<fixed");
- DiscreteDomain<?> dDomain = (DiscreteDomain<?>)domain;
+ DiscreteDomain dDomain = (DiscreteDomain)domain;
xmlBuffer.append(" cardinality=\"" + dDomain.getValues().size() + "\"");
xmlBuffer.append(">");
@@ -53,8 +53,8 @@
* {@inheritDoc}
*/
@Override
- public <E extends Serializable> void visit(Domain<E> domain,
- Serializable label, Serializable value) {
+ public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain,
+ F label, E value) {
xmlBuffer.append("<value>" + value + "</value>");
}
@@ -62,7 +62,7 @@
* {@inheritDoc}
*/
@Override
- public void end(Domain<? extends Serializable> domain) {
+ public void end(Domain domain) {
xmlBuffer.append("</enumeration>");
xmlBuffer.append("</fixed>");
xmlBuffer.append("</domain>");
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -18,6 +18,7 @@
package fr.ifremer.isisfish.mexico.xml;
+import java.io.Serializable;
import java.util.List;
import org.apache.commons.beanutils.ConvertUtilsBean;
@@ -65,18 +66,18 @@
// double
if ("real".equals(type)) {
- Factor<Double> factor = new Factor<Double>(name);
+ Factor<Double,Integer> factor = new Factor<Double,Integer>(name);
factor.setPath(path);
Element fixedElement = factorElement.element("domain").element(
"fixed");
// tous les domaines continues
if (property.endsWith("continuous")) {
Element rangeElement = fixedElement.element("range");
- ContinuousDomain<Double> domain;
+ ContinuousDomain domain;
if(property.equals("matrixcontinuous")) {
// matrix specific
Element matrixElement = fixedElement.element("matrix");
- MatrixContinuousDomain<Double> mdomain = new MatrixContinuousDomain<Double>();
+ MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
mdomain.setCoefficient(Double.valueOf(matrixElement.attributeValue("coefficient")));
mdomain.setOperator(matrixElement.attributeValue("operator"));
@@ -90,7 +91,7 @@
else if (property.equals("equationcontinuous")) {
// equation specific
Element equationElement = fixedElement.element("equation");
- EquationContinuousDomain<Double> edomain = new EquationContinuousDomain<Double>();
+ EquationContinuousDomain edomain = new EquationContinuousDomain();
edomain.setCoefficient(Double.valueOf(equationElement.attributeValue("coefficient")));
edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference")));
edomain.setVariableName(equationElement.attributeValue("variable"));
@@ -100,7 +101,7 @@
}
else {
// continous domain
- domain = new ContinuousDomain<Double>();
+ domain = new ContinuousDomain<Double,Double>();
}
domain.setCardinality(Integer.valueOf(fixedElement
@@ -112,7 +113,7 @@
.attributeValue("max")));
factor.setDomain(domain);
} else if ("discrete".equals(property)) {
- DiscreteDomain<Double> domain = new DiscreteDomain<Double>();
+ DiscreteDomain<Double,Integer> domain = new DiscreteDomain<Double,Integer>();
List<Element> valueElements = fixedElement.element(
"enumeration").elements("value");
int label = 0;
@@ -125,18 +126,18 @@
}
plan.getFactors().add(factor);
} else if ("integer".equals(type)) {
- Factor<Integer> factor = new Factor<Integer>(name);
+ Factor<Integer,Integer> factor = new Factor<Integer,Integer>(name);
factor.setPath(path);
Element fixedElement = factorElement.element("domain").element(
"fixed");
if ("continuous".equals(property)) {
- ContinuousDomain<Integer> domain = null;
+ ContinuousDomain domain = null;
Element rangeElement = fixedElement.element("range");
if(property.equals("matrixcontinuous")) {
// matrix specific
Element matrixElement = fixedElement.element("matrix");
- MatrixContinuousDomain<Integer> mdomain = new MatrixContinuousDomain<Integer>();
+ MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
mdomain.setCoefficient(Double.valueOf(matrixElement.attributeValue("coefficient")));
mdomain.setOperator(matrixElement.attributeValue("operator"));
@@ -150,7 +151,7 @@
else if (property.equals("equationcontinuous")) {
// equation specific
Element equationElement = fixedElement.element("equation");
- EquationContinuousDomain<Integer> edomain = new EquationContinuousDomain<Integer>();
+ EquationContinuousDomain edomain = new EquationContinuousDomain();
edomain.setCoefficient(Double.valueOf(equationElement.attributeValue("coefficient")));
edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference")));
edomain.setVariableName(equationElement.attributeValue("variable"));
@@ -160,7 +161,7 @@
}
else {
// continous domain
- domain = new ContinuousDomain<Integer>();
+ domain = new ContinuousDomain<Integer,Integer>();
}
domain.setCardinality(Integer.valueOf(fixedElement
@@ -172,7 +173,7 @@
.attributeValue("max")));
factor.setDomain(domain);
} else if ("discrete".equals(property)) {
- DiscreteDomain<Integer> domain = new DiscreteDomain<Integer>();
+ DiscreteDomain<Integer,Integer> domain = new DiscreteDomain<Integer,Integer>();
List<Element> valueElements = fixedElement.element(
"enumeration").elements("value");
int label = 0;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -38,7 +38,7 @@
* {@inheritDoc}
*/
@Override
- public void start(Domain<? extends Serializable> domain) {
+ public void start(Domain domain) {
super.start(domain);
EquationContinuousDomain eDomain = (EquationContinuousDomain)domain;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -65,7 +65,7 @@
* @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#start(fr.ifremer.isisfish.simulator.sensitivity.Factor)
*/
@Override
- public void start(Factor<? extends Serializable> factor) {
+ public void start(Factor factor) {
xmlBuffer.append("<factor");
xmlBuffer.append(" name=\"" + factor.getName() + "\"");
Serializable referenceValueForType = null;
@@ -108,7 +108,7 @@
* @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#visit(fr.ifremer.isisfish.simulator.sensitivity.Domain)
*/
@Override
- public void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain) {
+ public void visit(Factor factor, Domain domain) {
DomainXMLVisitor visitor = null;
if (factor.getDomain() instanceof MatrixContinuousDomain) {
visitor = new MatrixContinuousDomainXMLVisitor();
@@ -130,7 +130,7 @@
* @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.Factor)
*/
@Override
- public void end(Factor<? extends Serializable> factor) {
+ public void end(Factor factor) {
xmlBuffer.append("</factor>");
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -41,11 +41,11 @@
* {@inheritDoc}
*/
@Override
- public void start(Domain<? extends Serializable> domain) {
+ public void start(Domain domain) {
super.start(domain);
ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
- MatrixContinuousDomain<?> mDomain = (MatrixContinuousDomain<?>)domain;
+ MatrixContinuousDomain mDomain = (MatrixContinuousDomain)domain;
xmlBuffer.append("<matrix coefficient=\"" + mDomain.getCoefficient()+ "\"");
xmlBuffer.append(" operator=\"" + mDomain.getOperator() + "\">");
xmlBuffer.append(beanUtils.convert(mDomain.getMatrix()));
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -72,7 +72,7 @@
* {@inheritDoc}
*/
@Override
- public void visit(Scenario scenario, Factor<? extends Serializable> factor) {
+ public void visit(Scenario scenario, Factor factor) {
FactorXMLVisitor visitor = new FactorXMLVisitor();
factor.accept(visitor);
xmlBuffer.append(visitor.getXML());
Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -0,0 +1,167 @@
+package fr.ifremer.isisfish.simulator.sensitivity;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtilsBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codelutin.j2r.REngine;
+import org.codelutin.j2r.RException;
+import org.codelutin.j2r.RProxy;
+import org.codelutin.topia.persistence.TopiaEntity;
+
+import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
+import fr.ifremer.isisfish.util.ConverterUtil;
+
+public abstract class AbstractSensitivityCalculator implements
+ SensitivityCalculator {
+
+ /** to use log facility, just put in your code: log.info("..."); */
+ private static Log log = LogFactory
+ .getLog(AbstractSensitivityCalculator.class);
+
+ /*
+ * Method to create the isis.factors dataframe in R
+ * @param Design plan of the sensitivity analysis
+ */
+
+ public void setIsisFactorsR(DesignPlan plan, File outputdirectory) {
+
+ String nomFacteur = "nomFacteur<-c(%s)";
+ String factorNames = "";
+ String nominal = "Nominal<-c(%s)";
+ String nominalValues = "";
+ String continu = "Continu<-c(%s)";
+ String continuValues = "";
+ String binf = "Binf<-c(%s)";
+ String binfValues = "";
+ String bsup = "Bsup<-c(%s)";
+ String bsupValues = "";
+ String attributes = "attributes(isis.factors)<-list(%s\"nomModel\"=\"isis-fish-externeR\")";
+ String attributesValues = "";
+ String isisfactors = "isis.factors<-data.frame(nomFacteur,Nominal,Continu,Binf,Bsup)";
+
+ //Create the vectors
+ List<Factor> factors = plan.getFactors();
+ for (int i = 0; i < factors.size(); i++) {
+ Factor factor = factors.get(i);
+ if (i != 0) {
+ factorNames += ",";
+ nominalValues += ",";
+ continuValues += ",";
+ binfValues += ",";
+ bsupValues += ",";
+ }
+
+ //Factor names
+ factorNames += "\"" + factor.getName() + "\"";
+
+ //Nominal values
+ /*ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
+ String path = factor.getPath();
+ String topiaId = path.substring(0,path.lastIndexOf("#"));
+ String propertyName=path.substring(path.lastIndexOf("#") + 1);
+ //Object value = beanUtils.convert("${serializedValue}", ${value.class.name}.class);
+ TopiaEntity entity = db.findByTopiaId(topiaId);
+ Object value = BeanUtils.getProperty(entity, propertyName);*/
+
+ nominalValues += 0.0;
+
+ //Continu values, binf values, bsup values and discrete factors attributes
+ if (factor.getDomain() instanceof ContinuousDomain) {
+ //Continu values
+ continuValues += "TRUE";
+
+ //Binf values
+ binfValues += ((ContinuousDomain) factor.getDomain())
+ .getMinBound();
+
+ //Bsup values
+ bsupValues += ((ContinuousDomain) factor.getDomain())
+ .getMaxBound();
+
+ } else {
+ //Continu values
+ continuValues += "FALSE";
+
+ //Binf values
+ binfValues += "0.0";
+
+ //Bsup values
+ bsupValues += ((DiscreteDomain) factor.getDomain()).getValues()
+ .size();
+
+ //Attribute values
+ attributesValues += "\"" + factor.getName() + "\"=list(";
+ Collection values = ((DiscreteDomain) factor.getDomain())
+ .getValues().values();
+ for (Iterator j = values.iterator(); j.hasNext();) {
+ attributesValues += j + ",";
+ j.next();
+ }
+ attributesValues = attributesValues.substring(0,
+ attributesValues.length() - 1);
+ attributesValues += "),";
+ }
+ if (attributesValues.length() != 0) {
+ attributesValues = attributesValues.substring(0,
+ attributesValues.length() - 1);
+ attributesValues += ",";
+ }
+
+ }
+
+ String Rcall = "";
+
+ REngine engine = new RProxy();
+ try {
+ log.info("setwd(\"" + outputdirectory.getParent() + "\")");
+ engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")");
+
+ log.info("load(\".RData\")");
+ engine.voidEval("load(\".RData\")");
+
+ Rcall = String.format(nomFacteur, factorNames);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ Rcall = String.format(nominal, nominalValues);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ Rcall = String.format(continu, continuValues);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ Rcall = String.format(binf, binfValues);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ Rcall = String.format(bsup, bsupValues);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ log.info(isisfactors);
+ engine.voidEval(isisfactors);
+
+ Rcall = String.format(attributes, attributesValues);
+ log.info(Rcall);
+ engine.voidEval(Rcall);
+
+ log.info("save.image()");
+ engine.voidEval("save.image()");
+
+ } catch (RException eee) {
+ eee.printStackTrace();
+ throw new RuntimeException("R evaluation failed", eee);
+ // Error while retrieving scenario
+ }
+
+ }
+
+}
Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -40,13 +40,13 @@
private static final long serialVersionUID = 977975461743758075L;
/** Liste des facteurs a utiliser */
- protected List<Factor<? extends Serializable>> factors;
+ protected List<Factor> factors;
/**
* Constructor.
*/
public DesignPlan() {
- factors = new ArrayList<Factor<? extends Serializable>>();
+ factors = new ArrayList<Factor>();
}
/**
@@ -54,7 +54,7 @@
*
* @return factors list
*/
- public List<Factor<? extends Serializable>> getFactors() {
+ public List<Factor> getFactors() {
return factors;
}
@@ -63,7 +63,7 @@
*
* @param factors the factors list to set
*/
- public void setFactors(List<Factor<? extends Serializable>> factors) {
+ public void setFactors(List<Factor> factors) {
this.factors = factors;
}
@@ -74,7 +74,7 @@
*/
public void accept(DesignPlanVisitor visitor) {
visitor.start(this);
- for(Factor<? extends Serializable> factor : factors) {
+ for(Factor factor : factors) {
visitor.visit(this, factor);
}
visitor.end(this);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -35,6 +35,7 @@
* - continu : i.e, une borne min, max
*
* @param <E> type des valeurs gérées par le domaine
+ * @param <F> type des labels
*
* @see DiscreteDomain
* @see ContinuousDomain
@@ -45,7 +46,7 @@
* Last update : $Date: 24 févr. 2009 $
* By : $Author: chatellier $
*/
-public interface Domain<E extends Serializable> extends Serializable {
+public interface Domain<E extends Serializable, F extends Serializable> extends Serializable {
/**
* Return value associated to identifier.
@@ -53,7 +54,7 @@
* @param identifier
* @return found value or <tt>null</tt> if not found
*/
- E getValueForIdentifier(Serializable identifier);
+ E getValueForIdentifier(F identifier);
/**
* Accept a new visitor.
@@ -68,5 +69,5 @@
* @return the domain cloned
*/
- public Domain<E> clone();
+ public Domain<E, F> clone();
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -31,6 +31,7 @@
*
* @param <E>
* type des valeurs gérées par le facteur
+ * @param <F> type des labels
*
* La classe doit être {@link Serializable} avec ses valeurs pour permettre
* l'export XML.
@@ -40,7 +41,7 @@
*
* Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $
*/
-public class Factor<E extends Serializable> implements Serializable, Cloneable {
+public class Factor<E extends Serializable, F extends Serializable> implements Serializable, Cloneable {
/** serialVersionUID. */
private static final long serialVersionUID = 1643804268013964453L;
@@ -67,7 +68,7 @@
* @see ContinuousDomain
* @see DiscreteDomain
*/
- protected Domain<E> domain;
+ protected Domain<E,F> domain;
/**
* Factor value.
@@ -147,7 +148,7 @@
*
* @return the domain
*/
- public Domain<E> getDomain() {
+ public Domain<E,F> getDomain() {
return domain;
}
@@ -157,7 +158,7 @@
* @param domain
* the domain to set
*/
- public void setDomain(Domain<E> domain) {
+ public void setDomain(Domain<E,F> domain) {
this.domain = domain;
}
@@ -186,7 +187,7 @@
* @param valueIdentifier
* new value identifier to get
*/
- public void setValueForIdentifier(Serializable valueIdentifier) {
+ public void setValueForIdentifier(F valueIdentifier) {
value = domain.getValueForIdentifier(valueIdentifier);
}
@@ -226,7 +227,7 @@
@Override
public Object clone() {
- Factor<E> f = new Factor<E>();
+ Factor<E,F> f = new Factor<E,F>();
f.domain = domain.clone();
f.name = name;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -44,13 +44,13 @@
*
* Chaque facteur a la {@link Factor#value} a prendre en compte pour la simulation.
*/
- protected List<Factor<? extends Serializable>> factors;
+ protected List<Factor> factors;
/**
* Constructeur.
*/
public Scenario() {
- factors = new ArrayList<Factor<? extends Serializable>>();
+ factors = new ArrayList<Factor>();
}
/**
@@ -61,9 +61,9 @@
* @param factor to copy
* @return add success
*/
- public boolean addFactor(Factor<? extends Serializable> factor) {
+ public boolean addFactor(Factor factor) {
- Factor<? extends Serializable> factorCopy = (Factor<? extends Serializable>) factor
+ Factor factorCopy = (Factor) factor
.clone();
boolean success = factors.add(factorCopy);
return success;
@@ -75,7 +75,7 @@
*
* @return the simulations
*/
- public List<Factor<? extends Serializable>> getFactors() {
+ public List<Factor> getFactors() {
return factors;
}
@@ -84,7 +84,7 @@
*
* @param factors the simulations factors to set
*/
- public void setFactors(List<Factor<? extends Serializable>> factors) {
+ public void setFactors(List<Factor> factors) {
this.factors = factors;
}
@@ -95,7 +95,7 @@
*/
public void accept(ScenarioVisitor visitor) {
visitor.start(this);
- for(Factor<? extends Serializable> factor : factors) {
+ for(Factor factor : factors) {
visitor.visit(this, factor);
}
visitor.end(this);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -29,6 +29,7 @@
* Composé d'un borne min et max.
*
* @param <E> type des valeurs gérées par le domaine
+ * @param <F> type des labels
*
* @author chatellier
* @version $Revision: 1.0 $
@@ -36,7 +37,7 @@
* Last update : $Date: 24 févr. 2009 $
* By : $Author: chatellier $
*/
-public class ContinuousDomain<E extends Serializable> implements Domain<E> {
+public class ContinuousDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> {
/** serialVersionUID. */
private static final long serialVersionUID = -2037768174807839046L;
@@ -102,7 +103,7 @@
*
* In continuous domain, just return identifier
*/
- public E getValueForIdentifier(Serializable identifier) {
+ public E getValueForIdentifier(F identifier) {
// FIXME test cast
return (E)identifier;
}
@@ -135,8 +136,8 @@
this.cardinality = cardinality;
}
- public ContinuousDomain<E> clone(){
- ContinuousDomain<E> cloned = new ContinuousDomain<E>();
+ public ContinuousDomain<E,F> clone(){
+ ContinuousDomain<E,F> cloned = new ContinuousDomain<E,F>();
cloned.setCardinality(this.cardinality);
cloned.setMaxBound(this.maxBound);
cloned.setMinBound(this.minBound);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -32,6 +32,7 @@
* Ensemble de valeurs.
*
* @param <E> type des valeurs gérées par le domaine
+ * @param <F> type des labels
*
* @author chatellier
* @version $Revision: 1.0 $
@@ -39,7 +40,7 @@
* Last update : $Date: 24 févr. 2009 $
* By : $Author: chatellier $
*/
-public class DiscreteDomain<E extends Serializable> implements Domain<E> {
+public class DiscreteDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> {
/** serialVersionUID. */
private static final long serialVersionUID = -192647757737396585L;
@@ -49,13 +50,13 @@
*
* Each "E" values is identified by a Serializable identifier.
*/
- protected SortedMap<Serializable, E> values;
+ protected SortedMap<F, E> values;
/**
* Constructor.
*/
public DiscreteDomain() {
- values = new TreeMap<Serializable, E>();
+ values = new TreeMap<F, E>();
}
/**
@@ -63,7 +64,7 @@
*
* @return the values
*/
- public SortedMap<Serializable, E> getValues() {
+ public SortedMap<F, E> getValues() {
return values;
}
@@ -72,7 +73,7 @@
*
* @param values the values
*/
- public void setValues(SortedMap<Serializable, E> values) {
+ public void setValues(SortedMap<F, E> values) {
this.values = values;
}
@@ -81,7 +82,7 @@
*
* @throws IllegalArgumentException if identifier is not a valid key
*/
- public E getValueForIdentifier(Serializable identifier) throws IllegalArgumentException{
+ public E getValueForIdentifier(F identifier) throws IllegalArgumentException{
if( values == null || !values.containsKey(identifier)) {
throw new IllegalArgumentException("Can't get value for identifier " + identifier);
@@ -97,14 +98,14 @@
*/
public void accept(DomainVisitor visitor) {
visitor.start(this);
- for(Map.Entry<Serializable, E> value : values.entrySet()) {
+ for(Map.Entry<F, E> value : values.entrySet()) {
visitor.visit(this, value.getKey(), value.getValue());
}
visitor.end(this);
}
- public DiscreteDomain<E> clone(){
- DiscreteDomain<E> cloned = new DiscreteDomain<E>();
+ public DiscreteDomain<E,F> clone(){
+ DiscreteDomain<E,F> cloned = new DiscreteDomain<E,F>();
cloned.setValues(this.values);
return cloned;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -22,6 +22,8 @@
import org.codelutin.math.matrix.MapFunction;
+import fr.ifremer.isisfish.entities.Equation;
+
/**
* Domaine continu portant sur variable pouvant prendre diférente valeur par
* rapport à une valeur initiale.
@@ -36,8 +38,8 @@
*
* Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $
*/
-public class EquationContinuousDomain<E extends Serializable> extends
- ContinuousDomain<E> {
+public class EquationContinuousDomain extends
+ ContinuousDomain<Double,Double> {
/** serialVersionUID. */
private static final long serialVersionUID = -2037768174807839046L;
@@ -166,24 +168,20 @@
* In equation continuous domain, value appear in continuous domain values
* only. Here : return identifier.
*/
- public E getValueForIdentifier(Serializable identifier) {
+ public Double getValueForIdentifier(Double identifier) {
- this.value = Double.valueOf((String)identifier);
+ this.value = identifier;
if (operator.equals("+")) {
- return (E) ((Double) (referenceValue + ((referenceValue + coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1))));
+ return ((Double) (referenceValue + ((referenceValue + coefficient) * ((2 * value - 1)))));
} else if (operator.equals("-")) {
- return (E) ((Double) (referenceValue + ((referenceValue - coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1))));
+ return ((Double) (referenceValue + ((referenceValue - coefficient) * ((2 * value - 1)))));
} else if (operator.equals("*")) {
- return (E) ((Double) (referenceValue + ((referenceValue * coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1))));
+ return ((Double) (referenceValue + ((referenceValue * coefficient) * ((2 * value - 1)))));
} else if (operator.equals("/")) {
- return (E) ((Double) (referenceValue + ((referenceValue / coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1))));
+ return ((Double) (referenceValue + ((referenceValue / coefficient) * ((2 * value - 1)))));
}
- return (E) identifier;
+ return identifier;
}
/**
@@ -205,8 +203,8 @@
this.value = value;
}
- public EquationContinuousDomain<E> clone(){
- EquationContinuousDomain<E> cloned = new EquationContinuousDomain<E>();
+ public EquationContinuousDomain clone(){
+ EquationContinuousDomain cloned = new EquationContinuousDomain();
cloned.setCardinality(this.cardinality);
cloned.setMaxBound(this.maxBound);
cloned.setMinBound(this.minBound);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -36,8 +36,8 @@
*
* Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $
*/
-public class MatrixContinuousDomain <E extends Serializable> extends
- ContinuousDomain<E> {
+public class MatrixContinuousDomain extends
+ ContinuousDomain<MatrixND, Double> {
/** serialVersionUID. */
private static final long serialVersionUID = -2037768174807839046L;
@@ -139,38 +139,42 @@
*
* In continuous domain, just return identifier
*/
- public E getValueForIdentifier(final Serializable identifier) {
- this.value = Double.valueOf((String)identifier);
+ public MatrixND getValueForIdentifier(final Serializable identifier) {
+ return getValueForIdentifier((Double)identifier);
+ }
+ /**
+ * {@inheritDoc}.
+ *
+ * In continuous domain, just return identifier
+ */
+ public MatrixND getValueForIdentifier(final Double identifier) {
+ this.value = identifier;
if (operator.equals("+")) {
this.matrix.map(new MapFunction() {
public double apply(double val) {
- return (val + ((val + coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1)));
+ return (val + ((val + coefficient) * ((2 * value - 1))));
}
});
} else if (operator.equals("-")) {
this.matrix.map(new MapFunction() {
public double apply(double val) {
- return (val + ((val - coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1)));
+ return (val + ((val - coefficient) * ((2 * value - 1))));
}
});
} else if (operator.equals("*")) {
this.matrix.map(new MapFunction() {
public double apply(double val) {
- return (val + ((val * coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1)));
+ return (val + ((val * coefficient) * ((2 * value - 1))));
}
});
} else if (operator.equals("/")) {
this.matrix.map(new MapFunction() {
public double apply(double val) {
- return (val + ((val / coefficient) * ((2 * Double
- .valueOf((String) identifier)) - 1)));
+ return (val + ((val / coefficient) * ((2 * value - 1))));
}
});
}
- return (E) this.matrix;
+ return this.matrix;
}
/**
@@ -192,8 +196,8 @@
this.value = value;
}
- public MatrixContinuousDomain<E> clone(){
- MatrixContinuousDomain<E> cloned = new MatrixContinuousDomain<E>();
+ public MatrixContinuousDomain clone(){
+ MatrixContinuousDomain cloned = new MatrixContinuousDomain();
cloned.setCardinality(this.cardinality);
cloned.setMaxBound(this.maxBound);
cloned.setMinBound(this.minBound);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -47,7 +47,7 @@
* @param designPlan design plan
* @param factor factor
*/
- void visit(DesignPlan designPlan, Factor<? extends Serializable> factor);
+ void visit(DesignPlan designPlan, Factor factor);
/**
* End.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -38,7 +38,7 @@
*
* @param domain domain
*/
- void start(Domain<? extends Serializable> domain);
+ void start(Domain<? extends Serializable, ? extends Serializable> domain);
/**
* Visit domain value or property.
@@ -48,12 +48,12 @@
* @param label value label or property name
* @param value value
*/
- <E extends Serializable> void visit(Domain<E> domain, Serializable label, Serializable value);
+ <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, F label, E value);
/**
* End.
*
* @param domain domain
*/
- void end(Domain<? extends Serializable> domain);
+ void end(Domain<? extends Serializable, ? extends Serializable> domain);
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -39,7 +39,7 @@
*
* @param factor factor
*/
- void start(Factor<? extends Serializable> factor);
+ void start(Factor factor);
/**
* Visit domain.
@@ -47,12 +47,12 @@
* @param factor factor
* @param domain domain
*/
- void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain);
+ void visit(Factor factor, Domain domain);
/**
* End.
*
* @param factor factor
*/
- void end(Factor<? extends Serializable> factor);
+ void end(Factor factor);
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -47,7 +47,7 @@
* @param scenario scenario
* @param factor factor
*/
- void visit(Scenario scenario, Factor<? extends Serializable> factor);
+ void visit(Scenario scenario, Factor factor);
/**
* End.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -61,7 +61,7 @@
c.setText("Facteurs : ");
}
else if (userObject instanceof Factor) {
- Factor<?> factor = (Factor)userObject;
+ Factor factor = (Factor)userObject;
//c = new JLabel(factor.getName());
if (factor.getDomain() instanceof EquationContinuousDomain){
EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain();
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -63,7 +63,7 @@
if (userObject instanceof List) {
Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject();
- List<Factor<?>> factors = (List<Factor<?>>)localUserObject;
+ List<Factor> factors = (List<Factor>)localUserObject;
value = new DefaultMutableTreeNode(factors.get(index));
}
}
@@ -85,7 +85,7 @@
if (userObject instanceof List) {
Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject();
- List<Factor<?>> factors = (List<Factor<?>>)localUserObject;
+ List<Factor> factors = (List<Factor>)localUserObject;
childCount = factors.size();
}
}
@@ -109,7 +109,7 @@
if (userObject instanceof List) {
Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject();
- List<Factor<?>> factors = (List<Factor<?>>)localUserObject;
+ List<Factor> factors = (List<Factor>)localUserObject;
childIndex = factors.indexOf(childUserObject);
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-17 09:49:29 UTC (rev 2114)
@@ -142,9 +142,9 @@
return result;
}
};
- java.util.List<Factor<? extends Serializable>> factors = getSimulAction().getFactors();
+ java.util.List<Factor> factors = getSimulAction().getFactors();
- java.util.List<Factor<? extends Serializable>> factorsContinue = new ArrayList<Factor<? extends Serializable>>();
+ java.util.List<Factor> factorsContinue = new ArrayList<Factor>();
java.util.List<String> factorsContinueCardinalities = new ArrayList<String>();
for (Factor f : factors){
Domain domain = f.getDomain();
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -111,7 +111,7 @@
protected List<String> oldSimulNames = null;
protected String simulName = null;
protected SensitivityStorage sensitivityStorage = null;
- protected Map<String, Factor<? extends Serializable>> factors = new HashMap<String, Factor<? extends Serializable>>();
+ protected Map<String, Factor> factors = new HashMap<String, Factor>();
protected Map<String, JComponent> factorComponent = new HashMap<String, JComponent>();
protected DesignPlan designPlan = new DesignPlan();
protected SensitivityCalculator sensitivityCalculator = null;
@@ -871,10 +871,10 @@
}
}
- public List<Factor<? extends Serializable>> getFactors() {
- List<Factor<? extends Serializable>> result = new ArrayList<Factor<? extends Serializable>>();
+ public List<Factor> getFactors() {
+ List<Factor> result = new ArrayList<Factor>();
for (Map.Entry entry : factors.entrySet()) {
- result.add((Factor<? extends Serializable>) entry.getValue());
+ result.add((Factor) entry.getValue());
}
return result;
}
@@ -885,14 +885,14 @@
designPlan.setFactors(getFactors());
}
- public Factor<? extends Serializable> getFactor(String name) {
+ public Factor getFactor(String name) {
return factors.get(name);
}
public void addContinuousFactor(String name, String comment, String path, Double min,
Double max, JComponent c, boolean exist) {
Factor f = new Factor(name);
- ContinuousDomain<Serializable> domain = new ContinuousDomain<Serializable>();
+ ContinuousDomain domain = new ContinuousDomain();
domain.setMinBound(min);
domain.setMaxBound(max);
f.setDomain(domain);
@@ -906,7 +906,7 @@
public void addDiscreteFactor(String name, String comment, String path,
List<Serializable> values, JComponent c, boolean exist) {
Factor f = new Factor(name);
- DiscreteDomain<Serializable> domain = new DiscreteDomain<Serializable>();
+ DiscreteDomain domain = new DiscreteDomain();
int i = 0;
for (Serializable value : values) {
// FIXME test when integer
@@ -941,7 +941,7 @@
Double coef, MatrixND matrix,
String operateur, JComponent c, boolean exist) {
Factor f = new Factor(name);
- MatrixContinuousDomain<Serializable> domain = new MatrixContinuousDomain<Serializable>();
+ MatrixContinuousDomain domain = new MatrixContinuousDomain();
domain.setMatrix(matrix);
domain.setOperator(operateur);
domain.setCoefficient(coef);
Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl
===================================================================
--- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-04-17 09:49:29 UTC (rev 2114)
@@ -28,7 +28,7 @@
* by : $Author: ${author} $
*/
@Doc("TODO Doc for ${name} SensitivityCalculator")
-public class ${name} implements SensitivityCalculator {
+public class ${name} extends AbstractSensitivityCalculator {
/** to use log facility, just put in your code: log.info("..."); */
private static Log log = LogFactory.getLog(${name}.class);
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -66,9 +66,9 @@
matrix1.setValue(new int[] { 2, 1 }, -1);
// factor 1
- Factor<Double> factorContinuous = new Factor<Double>(
+ Factor<Double,Double> factorContinuous = new Factor<Double,Double>(
"factor 1 (double continuous)");
- ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>();
+ ContinuousDomain<Double,Double> domain1 = new ContinuousDomain<Double,Double>();
domain1.setMinBound(0.0);
domain1.setMaxBound(50.0);
factorContinuous.setDomain(domain1);
@@ -76,8 +76,8 @@
.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength");
// factor 2
- Factor<Double> factorDiscrete = new Factor<Double>("factor 2 (double discrete)");
- DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>();
+ Factor<Double,Double> factorDiscrete = new Factor<Double,Double>("factor 2 (double discrete)");
+ DiscreteDomain<Double,Double> domain2 = new DiscreteDomain<Double,Double>();
domain2.getValues().put(0.0, 12.3);
domain2.getValues().put(1.0, 70.9);
domain2.getValues().put(2.0, 21.0);
@@ -89,8 +89,8 @@
factorDiscrete.setValue(3.0);
// factor 3
- Factor<Integer> factorContinuous2 = new Factor<Integer>("factor 3 (integer discrete)");
- DiscreteDomain<Integer> domain3 = new DiscreteDomain<Integer>();
+ Factor<Integer,Double> factorContinuous2 = new Factor<Integer,Double>("factor 3 (integer discrete)");
+ DiscreteDomain<Integer,Double> domain3 = new DiscreteDomain<Integer,Double>();
domain3.getValues().put(0.0, 13);
domain3.getValues().put(0.0, 14);
domain3.getValues().put(0.0, 15);
@@ -99,9 +99,9 @@
.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength");
// factor 4
- Factor<MatrixND> factorMatrixContinuous = new Factor<MatrixND>(
+ Factor<MatrixND,Double> factorMatrixContinuous = new Factor<MatrixND,Double>(
"factor 4 (MatrixContinuous)");
- MatrixContinuousDomain<MatrixND> domain4 = new MatrixContinuousDomain<MatrixND>();
+ MatrixContinuousDomain domain4 = new MatrixContinuousDomain();
domain4.setCoefficient(0.1);
domain4.setMatrix(matrix1);
domain4.setOperator("-");
@@ -110,9 +110,9 @@
.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength");
// factor 5
- Factor<Double> factorEquationContinuous = new Factor<Double>(
+ Factor<Double,Double> factorEquationContinuous = new Factor<Double,Double>(
"factor 5 (EquationContinuous)");
- EquationContinuousDomain<Double> domain5 = new EquationContinuousDomain<Double>();
+ EquationContinuousDomain domain5 = new EquationContinuousDomain();
domain5.setCoefficient(0.1);
domain5.setReferenceValue(45.0);
domain5.setVariableName("L1");
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -128,8 +128,8 @@
childStorageContext.commitTransaction();
// factor
- Factor<Integer> factor = new Factor<Integer>("testint");
- ContinuousDomain<Integer> domain = new ContinuousDomain<Integer>();
+ Factor<Integer,Integer> factor = new Factor<Integer,Integer>("testint");
+ ContinuousDomain<Integer,Integer> domain = new ContinuousDomain<Integer,Integer>();
domain.setMinBound(0);
domain.setMaxBound(50);
factor.setDomain(domain);
@@ -140,7 +140,7 @@
// scenario
Scenario scenario = new Scenario();
- List<Factor<? extends Serializable>> factors = new ArrayList<Factor<? extends Serializable>>();
+ List<Factor> factors = new ArrayList<Factor>();
factors.add(factor);
scenario.setFactors(factors);
@@ -227,16 +227,16 @@
childStorageContext.commitTransaction();
// factor
- Factor<MatrixND> factor1 = new Factor<MatrixND>("testmatrix");
- DiscreteDomain<MatrixND> domain1 = new DiscreteDomain<MatrixND>();
+ Factor<MatrixND,String> factor1 = new Factor<MatrixND,String>("testmatrix");
+ DiscreteDomain<MatrixND,String> domain1 = new DiscreteDomain<MatrixND,String>();
domain1.getValues().put("m1", matrix1);
factor1.setDomain(domain1);
factor1.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor1.setValueForIdentifier("m1");
// factor
- Factor<MatrixND> factor2 = new Factor<MatrixND>("testmatrix");
- DiscreteDomain<MatrixND> domain2 = new DiscreteDomain<MatrixND>();
+ Factor<MatrixND,String> factor2 = new Factor<MatrixND,String>("testmatrix");
+ DiscreteDomain<MatrixND,String> domain2 = new DiscreteDomain<MatrixND,String>();
domain2.getValues().put("m2", matrix1);
factor2.setDomain(domain2);
factor2.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
@@ -244,7 +244,7 @@
// scenario
Scenario scenario = new Scenario();
- List<Factor<? extends Serializable>> factors = new ArrayList<Factor<? extends Serializable>>();
+ List<Factor> factors = new ArrayList<Factor>();
factors.add(factor1);
factors.add(factor2);
scenario.setFactors(factors);
@@ -290,21 +290,21 @@
public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException {
// factor
- Factor<Double> factorEquation = new Factor<Double>("test equation");
- EquationContinuousDomain<Double> domain1 = new EquationContinuousDomain<Double>();
+ Factor<Double,Double> factorEquation = new Factor<Double,Double>("test equation");
+ EquationContinuousDomain domain1 = new EquationContinuousDomain();
domain1.setReferenceValue(3.0);
domain1.setOperator("-");
domain1.setCoefficient(0.1);
domain1.setVariableName("PopulationEquation.K1");
factorEquation.setDomain(domain1);
factorEquation.setPath("org.codelutin.equation1#testFactorPreScriptEquation");
- factorEquation.setValueForIdentifier("0.1");
+ factorEquation.setValueForIdentifier(0.1);
log.info("Script = " + domain1.getClass().getSimpleName());
// scenario
Scenario scenario = new Scenario();
- List<Factor<? extends Serializable>> factors = new ArrayList<Factor<? extends Serializable>>();
+ List<Factor> factors = new ArrayList<Factor>();
factors.add(factorEquation);
scenario.setFactors(factors);
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -73,8 +73,8 @@
DesignPlan designPlan = new DesignPlan();
// factor 1
- Factor<Double> factor1 = new Factor<Double>("factor 1 (double)");
- ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>();
+ Factor<Double,Double> factor1 = new Factor<Double,Double>("factor 1 (double)");
+ ContinuousDomain<Double,Double> domain1 = new ContinuousDomain<Double,Double>();
domain1.setMinBound(0.0);
domain1.setMaxBound(50.0);
domain1.setCardinality(4);
@@ -94,8 +94,8 @@
factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");*/
// factor 3
- Factor<Double> factor3 = new Factor<Double>("factor 3 (double)");
- ContinuousDomain<Double> domain3 = new ContinuousDomain<Double>();
+ Factor<Double,Double> factor3 = new Factor<Double,Double>("factor 3 (double)");
+ ContinuousDomain<Double,Double> domain3 = new ContinuousDomain<Double,Double>();
domain3.setMinBound(12.0);
domain3.setMaxBound(99.0);
domain3.setCardinality(4);
@@ -139,8 +139,8 @@
matrix2.setValue(new int[] { 2, 1 }, -1);
// factor 1
- Factor<MatrixND> factor1 = new Factor<MatrixND>("factor 1 (matrixND)");
- DiscreteDomain<MatrixND> domain1 = new DiscreteDomain<MatrixND>();
+ Factor<MatrixND,Double> factor1 = new Factor<MatrixND,Double>("factor 1 (matrixND)");
+ DiscreteDomain<MatrixND,Double> domain1 = new DiscreteDomain<MatrixND,Double>();
domain1.getValues().put(0.0, matrix1);
domain1.getValues().put(1.0, matrix2);
factor1.setDomain(domain1);
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -50,8 +50,8 @@
@Test
public void testIntFactor() {
- Factor<Integer> factor = new Factor<Integer>("testint");
- ContinuousDomain<Integer> domain = new ContinuousDomain<Integer>();
+ Factor<Integer,Integer> factor = new Factor<Integer,Integer>("testint");
+ ContinuousDomain<Integer,Integer> domain = new ContinuousDomain<Integer,Integer>();
domain.setMinBound(0);
domain.setMaxBound(50);
factor.setDomain(domain);
@@ -94,8 +94,8 @@
matrix2.setValue(new int[] { 1, 2 }, -13000);
// factor
- Factor<MatrixND> factor = new Factor<MatrixND>("testmatrix");
- DiscreteDomain<MatrixND> domain = new DiscreteDomain<MatrixND>();
+ Factor<MatrixND,String> factor = new Factor<MatrixND,String>("testmatrix");
+ DiscreteDomain<MatrixND,String> domain = new DiscreteDomain<MatrixND,String>();
domain.getValues().put("m1", matrix1);
domain.getValues().put("m2", matrix2);
factor.setDomain(domain);
@@ -138,15 +138,15 @@
matrix1.setValue(new int[] { 2, 1 }, -1);
// factor
- Factor<MatrixND> factor = new Factor<MatrixND>("testmatrix");
- MatrixContinuousDomain<MatrixND> domain = new MatrixContinuousDomain<MatrixND>();
+ Factor<MatrixND,Double> factor = new Factor<MatrixND,Double>("testmatrix");
+ MatrixContinuousDomain domain = new MatrixContinuousDomain ();
domain.setMatrix(matrix1);
domain.setCoefficient(0.1);
domain.setOperator("*");
factor.setDomain(domain);
factor
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor.setValueForIdentifier("0.1");
+ factor.setValueForIdentifier(0.1);
Assert.assertEquals(0.92, factor.getValue().getValue(new int[] { 0, 0 }),0.0000001);
Assert.assertEquals(2.76, factor.getValue().getValue(new int[] { 2, 0 }),0.0000001);
@@ -166,21 +166,21 @@
// factor 2
- Factor<MatrixND> factor2 = new Factor<MatrixND>("testmatrix");
- MatrixContinuousDomain<MatrixND> domain2 = new MatrixContinuousDomain<MatrixND>();
+ Factor<MatrixND,Double> factor2 = new Factor<MatrixND,Double>("testmatrix");
+ MatrixContinuousDomain domain2 = new MatrixContinuousDomain();
domain2.setMatrix(matrix2);
domain2.setCoefficient(0.1);
domain2.setOperator("/");
factor2.setDomain(domain2);
factor2
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor2.setValueForIdentifier("0.1");
+ factor2.setValueForIdentifier(0.1);
// val + ((val / coefficient) * ((2 * Double
// .valueOf((String) identifier)) - 1))
- Assert.assertEquals(-7, factor2.getValue().getValue(new int[] { 0, 0 }),0.0000001);
- Assert.assertEquals(-21, factor2.getValue().getValue(new int[] { 2, 0 }),0.0000001);
+ Assert.assertEquals(-7.0, factor2.getValue().getValue(new int[] { 0, 0 }),0.0000001);
+ Assert.assertEquals(-21.0, factor2.getValue().getValue(new int[] { 2, 0 }),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
@@ -195,15 +195,15 @@
matrix3.setValue(new int[] { 2, 1 }, -1);
// factor 3
- Factor<MatrixND> factor3 = new Factor<MatrixND>("testmatrix");
- MatrixContinuousDomain<MatrixND> domain3 = new MatrixContinuousDomain<MatrixND>();
+ Factor<MatrixND,Double> factor3 = new Factor<MatrixND,Double>("testmatrix");
+ MatrixContinuousDomain domain3 = new MatrixContinuousDomain();
domain3.setMatrix(matrix3);
domain3.setCoefficient(0.1);
domain3.setOperator("-");
factor3.setDomain(domain3);
factor3
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor3.setValueForIdentifier("0.1");
+ factor3.setValueForIdentifier(0.1);
Assert.assertEquals(0.28, factor3.getValue().getValue(new int[] { 0, 0 }),0.0000001);
Assert.assertEquals(0.68, factor3.getValue().getValue(new int[] { 2, 0 }),0.0000001);
@@ -221,30 +221,21 @@
matrix4.setValue(new int[] { 2, 1 }, -1);
// factor 3
- Factor<MatrixND> factor4 = new Factor<MatrixND>("testmatrix");
- MatrixContinuousDomain<MatrixND> domain4 = new MatrixContinuousDomain<MatrixND>();
+ Factor<MatrixND,Double> factor4 = new Factor<MatrixND,Double>("testmatrix");
+ MatrixContinuousDomain domain4 = new MatrixContinuousDomain();
domain4.setMatrix(matrix4);
domain4.setCoefficient(0.1);
domain4.setOperator("+");
factor4.setDomain(domain4);
factor4
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor4.setValueForIdentifier("0.1");
+ factor4.setValueForIdentifier(0.1);
Assert.assertEquals(0.12, factor4.getValue().getValue(new int[] { 0, 0 }),0.0000001);
Assert.assertEquals(0.52, factor4.getValue().getValue(new int[] { 2, 0 }),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
- try {
- factor.setValueForIdentifier("blah blah");
- Assert.fail("Can't set identifier not present in domain");
- } catch (IllegalArgumentException e) {
- if (log.isInfoEnabled()) {
- log.info("Exception normally thrown");
- }
- }
-
if (log.isInfoEnabled()) {
log.info("factor#toString() = " + factor);
}
@@ -259,8 +250,8 @@
public void testEquationContinuousFactor() {
// factor
- Factor<Double> factor = new Factor<Double>("testequation");
- EquationContinuousDomain<Double> domain = new EquationContinuousDomain<Double>();
+ Factor<Double,Double> factor = new Factor<Double,Double>("testequation");
+ EquationContinuousDomain domain = new EquationContinuousDomain();
domain.setCoefficient(0.1);
domain.setOperator("*");
domain.setVariableName("Linf");
@@ -268,7 +259,7 @@
factor.setDomain(domain);
factor
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor.setValueForIdentifier("0.1");
+ factor.setValueForIdentifier(0.1);
Assert.assertEquals(2.76, factor.getValue(),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
@@ -278,8 +269,8 @@
// factor 2
- Factor<Double> factor2 = new Factor<Double>("testequation");
- EquationContinuousDomain<Double> domain2 = new EquationContinuousDomain<Double>();
+ Factor<Double,Double> factor2 = new Factor<Double,Double>("testequation");
+ EquationContinuousDomain domain2 = new EquationContinuousDomain();
domain2.setCoefficient(0.1);
domain2.setOperator("/");
domain2.setVariableName("Linf");
@@ -287,15 +278,15 @@
factor2.setDomain(domain2);
factor2
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor2.setValueForIdentifier("0.1");
+ factor2.setValueForIdentifier(0.1);
Assert.assertEquals(-21, Double.valueOf(factor2.getValue()),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
// factor 3
- Factor<Double> factor3 = new Factor<Double>("testequation");
- EquationContinuousDomain<Double> domain3 = new EquationContinuousDomain<Double>();
+ Factor<Double,Double> factor3 = new Factor<Double,Double>("testequation");
+ EquationContinuousDomain domain3 = new EquationContinuousDomain();
domain3.setCoefficient(0.1);
domain3.setOperator("+");
domain3.setVariableName("Linf");
@@ -303,15 +294,15 @@
factor3.setDomain(domain3);
factor3
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor3.setValueForIdentifier("0.1");
+ factor3.setValueForIdentifier(0.1);
Assert.assertEquals(0.52, Double.valueOf(factor3.getValue()),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
// factor 4
- Factor<Double> factor4 = new Factor<Double>("testequation");
- EquationContinuousDomain<Double> domain4 = new EquationContinuousDomain<Double>();
+ Factor<Double,Double> factor4 = new Factor<Double,Double>("testequation");
+ EquationContinuousDomain domain4 = new EquationContinuousDomain();
domain4.setCoefficient(0.1);
domain4.setOperator("-");
domain4.setVariableName("Linf");
@@ -319,21 +310,12 @@
factor4.setDomain(domain4);
factor4
.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
- factor4.setValueForIdentifier("0.1");
+ factor4.setValueForIdentifier(0.1);
Assert.assertEquals(0.68, Double.valueOf(factor4.getValue()),0.0000001);
Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
- try {
- factor.setValueForIdentifier("blah blah");
- Assert.fail("Can't set identifier not present in domain");
- } catch (IllegalArgumentException e) {
- if (log.isInfoEnabled()) {
- log.info("Exception normally thrown");
- }
- }
-
if (log.isInfoEnabled()) {
log.info("factor#toString() = " + factor);
}
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -90,17 +90,17 @@
// return result
SensitivityScenarios sensitivityScenarios = new SensitivityScenarios();
- List<Factor<? extends Serializable>> factors = plan.getFactors();
+ List<Factor> factors = plan.getFactors();
for (int i = 0; i < factors.size() * 2; ++i) {
Scenario scenario = new Scenario();
// choose a 0 < number < factors.size()
int pickedFactor = (int) (Math.random() * factors.size());
- Factor<? extends Serializable> factor = factors.get(pickedFactor);
+ Factor factor = factors.get(pickedFactor);
- Domain<? extends Serializable> domain = factor.getDomain();
+ Domain domain = factor.getDomain();
if (domain instanceof MatrixContinuousDomain) {
- MatrixContinuousDomain<MatrixND> cDomain = (MatrixContinuousDomain<MatrixND>) domain;
+ MatrixContinuousDomain cDomain = (MatrixContinuousDomain) domain;
Double minValue = cDomain.getMinBound();
Double maxValue = cDomain.getMaxBound();
@@ -109,7 +109,7 @@
factor.setValueForIdentifier(maxValue.toString());
scenario.addFactor(factor);
} else if (domain instanceof EquationContinuousDomain) {
- EquationContinuousDomain<Double> cDomain = (EquationContinuousDomain<Double>) domain;
+ EquationContinuousDomain cDomain = (EquationContinuousDomain) domain;
Double minValue = cDomain.getMinBound();
Double maxValue = cDomain.getMaxBound();
@@ -118,7 +118,7 @@
factor.setValueForIdentifier(maxValue.toString());
scenario.addFactor(factor);
} else if (domain instanceof ContinuousDomain) {
- ContinuousDomain<? extends Serializable> cDomain = (ContinuousDomain<? extends Serializable>) domain;
+ ContinuousDomain cDomain = (ContinuousDomain) domain;
Double minValue = cDomain.getMinBound();
Double maxValue = cDomain.getMaxBound();
@@ -127,7 +127,7 @@
factor.setValueForIdentifier(maxValue);
scenario.addFactor(factor);
} else {
- DiscreteDomain<? extends Serializable> dDomain = (DiscreteDomain<? extends Serializable>) domain;
+ DiscreteDomain<? extends Serializable,? extends Serializable> dDomain = (DiscreteDomain) domain;
for (Serializable sValue : dDomain.getValues().keySet()) {
factor.setValueForIdentifier(sValue);
scenario.addFactor(factor);
Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-04-16 13:46:33 UTC (rev 2113)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-04-17 09:49:29 UTC (rev 2114)
@@ -63,10 +63,10 @@
*
* @return la liste des facteur
*/
- protected List<Factor<? extends Serializable>> getFactors() {
+ protected List<Factor> getFactors() {
- Factor<Integer> factor1 = new Factor<Integer>("testint");
- ContinuousDomain<Integer> domain1 = new ContinuousDomain<Integer>();
+ Factor<Integer,Integer> factor1 = new Factor<Integer,Integer>("testint");
+ ContinuousDomain<Integer,Integer> domain1 = new ContinuousDomain<Integer,Integer>();
domain1.setMinBound(0);
domain1.setMaxBound(50);
factor1.setDomain(domain1);
@@ -94,15 +94,15 @@
matrix2.setValue(new int[] { 1, 2 }, -13000);
// factor
- Factor<MatrixND> factor2 = new Factor<MatrixND>("testmatrix");
- DiscreteDomain<MatrixND> domain2 = new DiscreteDomain<MatrixND>();
+ Factor<MatrixND,String> factor2 = new Factor<MatrixND,String>("testmatrix");
+ DiscreteDomain<MatrixND,String> domain2 = new DiscreteDomain<MatrixND,String>();
domain2.getValues().put("m1", matrix1);
domain2.getValues().put("m2", matrix2);
factor2.setDomain(domain2);
factor2.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor2.setValueForIdentifier("m2");
- List<Factor<? extends Serializable>> factors1 = new ArrayList<Factor<? extends Serializable>>();
+ List<Factor> factors1 = new ArrayList<Factor>();
factors1.add(factor1);
factors1.add(factor2);
1
0
r2113 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by tchemit@users.labs.libre-entreprise.org 16 Apr '09
by tchemit@users.labs.libre-entreprise.org 16 Apr '09
16 Apr '09
Author: tchemit
Date: 2009-04-16 13:46:33 +0000 (Thu, 16 Apr 2009)
New Revision: 2113
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx
Log:
super binding sur table...
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-04-16 13:42:48 UTC (rev 2112)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-04-16 13:46:33 UTC (rev 2113)
@@ -84,14 +84,14 @@
}
protected void updateActions() {
- setCanLaunch(!selectionModelQueueTab.isSelectionEmpty());
+ setCanStop(!selectionModelQueueTab.isSelectionEmpty());
setCanShowLog(!selectionModelQueueTabDone.isSelectionEmpty());
setCanClear(queueTableDone.getModel().getRowCount()>0);
}
]]>
</script>
- <Boolean id='canLaunch' javaBean='false'/>
+ <Boolean id='canStop' javaBean='false'/>
<Boolean id='canShowLog' javaBean='false'/>
<Boolean id='canClear' javaBean='false'/>
@@ -119,7 +119,7 @@
<JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/>
</cell>
<cell fill="horizontal" weightx="0.3">
- <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()' enabled='{isCanLaunch()}' />
+ <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()' enabled='{isCanStop()}' />
</cell>
<cell fill="horizontal" weightx="0.3">
<JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='viewLog()' enabled='{isCanShowLog()}' />
1
0