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
- 3175 discussions
r1969 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/i18n
by chatellier@users.labs.libre-entreprise.org 16 Mar '09
by chatellier@users.labs.libre-entreprise.org 16 Mar '09
16 Mar '09
Author: chatellier
Date: 2009-03-16 11:06:21 +0000 (Mon, 16 Mar 2009)
New Revision: 1969
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Affiche les fichiers mis ?\195?\160 jour dans un TextArea
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-03-16 10:26:57 UTC (rev 1968)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-03-16 11:06:21 UTC (rev 1969)
@@ -31,15 +31,23 @@
package fr.ifremer.isisfish;
-import java.awt.event.WindowEvent;
import static org.codelutin.i18n.I18n._;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Locale;
+import javax.swing.JLabel;
import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.logging.Log;
@@ -78,9 +86,6 @@
import fr.ifremer.isisfish.vcs.VCSException;
import fr.ifremer.isisfish.vcs.VCSFactory;
import fr.ifremer.isisfish.vcs.VetoableActionListener;
-import java.awt.event.WindowAdapter;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
/**
* This is the main class of <code>IsisFish</code> application.
@@ -234,11 +239,20 @@
// construit une chaine plutot qu'un Arrays.toString() qui
// est illisible
String modifiedFiles = "";
+ String separator = "";
for(File file : files) {
- modifiedFiles += " - " + file.toString() + "\n";
+ modifiedFiles += separator + file.toString();
+ separator = "\n";
}
- result = ask(_("isisfish.vcs.updaterepository.confirm", modifiedFiles));
+ // FIXME maybe make a JAXX UI ?
+ JLabel labelModifiedFiles = new JLabel(_("isisfish.vcs.updaterepository.confirm"));
+ JTextArea areaModifiedFiles = new JTextArea(modifiedFiles);
+ areaModifiedFiles.setEditable(false);
+ areaModifiedFiles.setAutoscrolls(true);
+ JScrollPane sp = new JScrollPane(areaModifiedFiles);
+ sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge
+ result = ask(new Component[] { labelModifiedFiles, sp} );
}
return result;
}
@@ -252,7 +266,7 @@
* @param msg question to ask
* @return true if user confirm question
*/
- protected static boolean ask(String msg) {
+ protected static boolean ask(Object msg) {
boolean result = true;
int value = JOptionPane.showConfirmDialog(null, msg);
if (value == JOptionPane.CANCEL_OPTION) {
Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-16 10:26:57 UTC (rev 1968)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-16 11:06:21 UTC (rev 1969)
@@ -952,7 +952,7 @@
isisfish.vcs.updateconfirm.label2=
isisfish.vcs.updateconfirm.ok=ok
isisfish.vcs.updateconfirm.tooltip.checkAll=
-isisfish.vcs.updaterepository.confirm=Your repository is not up to date.\nDo you want to update your repository ?\n\nRemote modified file is \:\n%s
+isisfish.vcs.updaterepository.confirm=Your repository is not up to date.\nDo you want to update following files ?
isisfish.vcs.vcssvn.add.error=Can't add file
isisfish.vcs.vcssvn.add.errorreadonly=You can't add file, this repository is readonly
isisfish.vcs.vcssvn.checkProtocol.error=Can't get address on serveur of local repository
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-03-16 10:26:57 UTC (rev 1968)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-16 11:06:21 UTC (rev 1969)
@@ -952,7 +952,7 @@
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.\nVoulez-vous mettre \u00E0 jour votre d\u00E9p\u00F4t ?\n\nLes fichiers modifi\u00E9s sont \:\n%s
+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
1
0
r1968 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by jcouteau@users.labs.libre-entreprise.org 16 Mar '09
by jcouteau@users.labs.libre-entreprise.org 16 Mar '09
16 Mar '09
Author: jcouteau
Date: 2009-03-16 10:26:57 +0000 (Mon, 16 Mar 2009)
New Revision: 1968
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java
Log:
Remove needs for Scenarios in sensitivity analysis
Adding needs for export directory File
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-16 08:41:59 UTC (rev 1967)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-16 10:26:57 UTC (rev 1968)
@@ -623,7 +623,7 @@
}
try {
// FIXME sensitivityScenarios are not available here :(
- sensitivityCalculator.analyzeResult(null, simulationStorageForAnalyze);
+ sensitivityCalculator.analyzeResult(simulationStorageForAnalyze,null);
}
catch(SensitivityException e) {
if (log.isErrorEnabled()) {
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-16 08:41:59 UTC (rev 1967)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-16 10:26:57 UTC (rev 1968)
@@ -401,7 +401,7 @@
try {
SensitivityScenarios sensitivityScenarios = sensitivitycalculator
- .compute(designPlan);
+ .compute(designPlan,null);
// ajout des parametres de simulation
param.setSensitivityCalculator(sensitivitycalculator);
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2009-03-16 08:41:59 UTC (rev 1967)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2009-03-16 10:26:57 UTC (rev 1968)
@@ -18,23 +18,21 @@
package fr.ifremer.isisfish.simulator.sensitivity;
+import java.io.File;
import java.util.List;
import fr.ifremer.isisfish.datastore.SimulationStorage;
/**
- * Interface commune à toutes implémentation
- * de calcul de sensibilité.
- *
- * Les implémentations peuvent contenir des paramètres
- * nommé "param_xx" (pour le paramètre xx) qui
- * seront injecté par Isis.
+ * Interface commune à toutes implémentation de calcul de sensibilité.
*
+ * Les implémentations peuvent contenir des paramètres nommé "param_xx" (pour le
+ * paramètre xx) qui seront injecté par Isis.
+ *
* @author chatellier
* @version $Revision: 1.0 $
*
- * Last update : $Date: 19 févr. 2009 $
- * By : $Author: chatellier $
+ * Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $
*/
public interface SensitivityCalculator {
@@ -46,36 +44,39 @@
String getDescription();
/**
- * Envoi un plan a faire analyser par l'outils
- * d'analyse de sensibilité.
+ * Envoi un plan a faire analyser par l'outils d'analyse de sensibilité.
*
- * Retourne un {@link SensitivityScenarios} qui
- * représente l'ensemble des scenarios à prendre
- * en compte pour les simulations.
+ * Retourne un {@link SensitivityScenarios} qui représente l'ensemble des
+ * scenarios à prendre en compte pour les simulations.
*
- * @param plan plan a analyser
+ * @param plan
+ * plan a analyser
*
* @return un {@link SensitivityScenarios}
- * @throws SensitivityException if calculator impl fail to execute
+ * @throws SensitivityException
+ * if calculator impl fail to execute
*
* @see DesignPlan
* @see Scenario
* @see SensitivityScenarios
*/
- SensitivityScenarios compute(DesignPlan plan) throws SensitivityException;
+ SensitivityScenarios compute(DesignPlan plan, File outputdirectory)
+ throws SensitivityException;
/**
- * Permet de renvoyer les resultats de simulations
- * à l'outils de d'analyse de sensibilité.
+ * Permet de renvoyer les resultats de simulations à l'outils de d'analyse
+ * de sensibilité.
*
- * @param sensitivityScenarios résultats de scenarios
- * @param simulationStorages ensemble des {@link SimulationStorage}
- * qui ont résultés des simulations
- * @throws SensitivityException if calculator impl fail to execute
+ * @param sensitivityScenarios
+ * résultats de scenarios
+ * @param simulationStorages
+ * ensemble des {@link SimulationStorage} qui ont résultés des
+ * simulations
+ * @throws SensitivityException
+ * if calculator impl fail to execute
*
* @see SensitivityScenarios
*/
- void analyzeResult(SensitivityScenarios sensitivityScenarios,
- List<SimulationStorage> simulationStorages)
- throws SensitivityException;
+ void analyzeResult(List<SimulationStorage> simulationStorages,
+ File outputdirectory) throws SensitivityException;
}
1
0
r1967 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity resources
by sletellier@users.labs.libre-entreprise.org 16 Mar '09
by sletellier@users.labs.libre-entreprise.org 16 Mar '09
16 Mar '09
Author: sletellier
Date: 2009-03-16 08:41:59 +0000 (Mon, 16 Mar 2009)
New Revision: 1967
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.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/PopulationRecruitmentUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
isis-fish/trunk/src/main/resources/sensitivity.properties
Log:
All factors are enabled
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -133,7 +133,7 @@
</cell>
<cell fill='horizontal' weightx='1.0'>
<JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed'
- _bean='{CellImpl.class}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/>
+ onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -141,7 +141,7 @@
<JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Latitude"'/>
+ <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -149,7 +149,7 @@
<JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Longitude"'/>
+ <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -157,7 +157,7 @@
<JLabel text="isisfish.cell.land" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Land"'/>
+ <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -168,22 +168,22 @@
<row>
<cell columns='2' fill='both' weighty='1.0' weightx='1.0'>
<JScrollPane>
- <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save' text='isisfish.common.save'/>
+ <JButton id='save' text='isisfish.common.save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel' text='isisfish.common.cancel'/>
+ <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/>
</cell>
</row>
</Table>
<JPanel id='map' layout='{new BorderLayout()}'>
- <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/>
- <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER'/>
+ <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/>
+ <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER' decorator='boxed'/>
</JPanel>
</JSplitPane>
</JPanel>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -230,13 +230,13 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
+ <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -134,7 +134,6 @@
<row>
<cell columns='3' fill='horizontal' weightx='1.0'>
<JTextField id="fieldRegion" decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"Name"'
text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}'
onKeyReleased='getBean().setName(fieldRegion.getText())'/>
</cell>
@@ -150,7 +149,7 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"MinLatitude"' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/>
+ onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/>
</cell>
</row>
<row>
@@ -159,7 +158,7 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"MaxLatitude"' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/>
+ onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/>
</cell>
</row>
<row>
@@ -168,7 +167,7 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"MinLongitude"' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/>
+ onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/>
</cell>
</row>
<row>
@@ -177,7 +176,7 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"MaxLongitude"' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/>
+ onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/>
</cell>
</row>
<row>
@@ -191,7 +190,7 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"CellLengthLatitude"' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/>
+ onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/>
</cell>
</row>
<row>
@@ -200,13 +199,13 @@
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"CellLengthLongitude"' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/>
+ onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/>
</cell>
</row>
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.6'>
<JScrollPane>
- <JList id="fieldMapfiles" onMouseClicked='mapFieldChanged()'/>
+ <JList id="fieldMapfiles" onMouseClicked='mapFieldChanged()' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -215,10 +214,10 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap" onActionPerformed='addMap()'/>
+ <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap" onActionPerformed='addMap()' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap" onActionPerformed='delMap()'/>
+ <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap" onActionPerformed='delMap()' decorator='boxed'/>
</cell>
</row>
</Table>
@@ -233,7 +232,7 @@
<cell columns='3' fill='both' weightx='1.0' weighty='0.4'>
<JScrollPane>
<JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' decorator='boxed'
- _bean='{FisheryRegionImpl.class}' _method='"Comment"' onKeyReleased='getBean().setComment(fieldComment.getText())'/>
+ onKeyReleased='getBean().setComment(fieldComment.getText())'/>
</JScrollPane>
</cell>
</row>
@@ -252,10 +251,10 @@
<Table>
<row>
<cell columns='4' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellFile" onKeyReleased='cellFillChanged()'/>
+ <JTextField id="fieldCellFile" onKeyReleased='cellFillChanged()' decorator='boxed'/>
</cell>
<cell>
- <JButton id="buttonCellFile" text="isisfish.common.ellipsis" onActionPerformed='cellFile()'/>
+ <JButton id="buttonCellFile" text="isisfish.common.ellipsis" onActionPerformed='cellFile()' decorator='boxed'/>
</cell>
</row>
</Table>
@@ -263,19 +262,19 @@
</row>
<row>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='save' enabled='false' onActionPerformed='save()'/>
+ <JButton id='save' enabled='false' onActionPerformed='save()' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.3'>
- <JButton id='check' text="isisfish.common.check" onActionPerformed='check()'/>
+ <JButton id='check' text="isisfish.common.check" onActionPerformed='check()' decorator='boxed'/>
</cell>
</row>
</Table>
<JPanel id='map' layout='{new BorderLayout()}'>
- <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/>
- <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER'/>
+ <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/>
+ <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/>
</JPanel>
</JSplitPane>
</JPanel>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -83,7 +83,7 @@
<JLabel text="isisfish.gear.name" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -115,7 +115,7 @@
<JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='{this}'/>
+ <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this'/>
</cell>
</row>
<row>
@@ -124,7 +124,7 @@
</cell>
<cell columns="2" fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -136,18 +136,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
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-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -39,6 +39,7 @@
<script><![CDATA[
import fr.ifremer.isisfish.entities.Metier;
+import fr.ifremer.isisfish.entities.GearImpl;
import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
getVerifier().addCurrentPanel(this);
@@ -56,7 +57,7 @@
<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.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab>
+ <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/></tab>
</JTabbedPane>
</JPanel>
</fr.ifremer.isisfish.ui.input.InputContentUI>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -78,16 +78,18 @@
}
}
-protected void accept(ActionEvent e) {
- JComponent source = (JComponent) e.getSource();
- FactorWizard wizard = new FactorWizard(this);
- Class classBean = (Class)source.getClientProperty("bean");
+ protected void accept(ActionEvent e) {
+ JComponent source = (JComponent) e.getSource();
+ Class classBean = (Class)source.getClientProperty("bean");
+ TopiaEntity bean = getVerifier().getEntity(classBean);
+ if (bean != null){
+ FactorWizard wizard = new FactorWizard(this);
- TopiaEntity bean = getVerifier().getEntity(classBean);
- wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean));
- wizard.pack();
- wizard.setVisible(true);
-}
+ wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean));
+ wizard.pack();
+ wizard.setVisible(true);
+ }
+ }
]]>
</script>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -206,7 +206,7 @@
<JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isMetierSeasonInfoNotNull()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}'/>
+ <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Interval"'/>
</cell>
</row>
<row>
@@ -215,7 +215,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.7'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
- <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}'/>
+ <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Zone"'/>
</JScrollPane>
</cell>
</row>
@@ -225,7 +225,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
- <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierSeasonInfo.class}' _method='"SeasonZoneComment"'/>
+ <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -237,18 +237,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -100,7 +100,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
- <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -112,18 +112,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -39,6 +39,7 @@
<script><![CDATA[
import fr.ifremer.isisfish.entities.TripType;
import fr.ifremer.isisfish.entities.MetierImpl;
+import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
import fr.ifremer.isisfish.entities.Metier;
import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
@@ -58,7 +59,7 @@
<JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' >
<tab title='{_("isisfish.metier.title")}'><MetierTabUI id="metierTabUI" constructorParams='this'/></tab>
<tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab>
- <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab>
+ <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this' decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/></tab>
</JTabbedPane>
</JPanel>
</fr.ifremer.isisfish.ui.input.InputContentUI>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -149,7 +149,7 @@
<JLabel text="isisfish.populationBasics.name" enabled='{isActif()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -157,7 +157,7 @@
<JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"GeographicId"'/>
+ <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -165,10 +165,10 @@
<JLabel text="isisfish.populationBasics.numberGroup" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}'/>
+ <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}'/>
+ <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -176,7 +176,7 @@
<JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}'/>
+ <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MaturityGroup"'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
<JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/>
@@ -184,7 +184,7 @@
</row>
<row>
<cell columns='3' fill='both' weightx='1.0'>
- <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}'/>
+ <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -211,7 +211,7 @@
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.2'>
<JScrollPane>
- <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -229,18 +229,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed' />
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed' />
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create' onActionPerformed='create()'/>
+ <JButton id='create' onActionPerformed='create()' decorator='boxed' />
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed' />
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -103,16 +103,16 @@
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"CapturabilityComment"'/>
+ <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -117,7 +117,7 @@
<JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/>
+ <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/>
</cell>
</row>
<row>
@@ -169,7 +169,7 @@
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
<JScrollPane>
- <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -178,10 +178,10 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -100,13 +100,15 @@
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
setBean((PopulationImpl) population);
-
+ refreshPanel();
+ }
+ public void refreshPanel(){
setFieldPopulationMigrationMigrationGroupChooserModel();
setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
remove.setEnabled(false);
setAddButton();
-
+
populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() {
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
@@ -200,7 +202,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -111,6 +111,10 @@
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
setBean((PopulationImpl) population);
+
+ refreshPanel();
+}
+public void refreshPanel(){
setFieldPopulationMigrationMigrationGroupChooserModel();
setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
@@ -194,7 +198,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -111,7 +111,9 @@
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
setBean((PopulationImpl) population);
-
+ refreshPanel();
+}
+public void refreshPanel(){
setFieldPopulationMigrationMigrationGroupChooserModel();
setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
@@ -211,7 +213,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
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-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -129,7 +129,7 @@
</row>
<row>
<cell columns='2' anchor='west'>
- <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"UseEquationMigration"'/>
+ <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -137,9 +137,9 @@
<JPanel id="hidablePanel" layout='{new CardLayout()}'>
<PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this'/>
<JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"'>
- <tab title='{_("isisfish.populationMigrationMigration.title")}'><PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this'/></tab>
- <tab title='{_("isisfish.populationMigrationImmigration.title")}'><PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this'/></tab>
- <tab title='{_("isisfish.populationMigrationEmigration.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this'/></tab>
+ <tab title='{_("isisfish.populationMigrationMigration.title")}'><PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/></tab>
+ <tab title='{_("isisfish.populationMigrationImmigration.title")}'><PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/></tab>
+ <tab title='{_("isisfish.populationMigrationEmigration.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/></tab>
</JTabbedPane>
</JPanel>
</cell>
@@ -150,7 +150,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MigrationComment"'/>
+ <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -159,10 +159,10 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -121,7 +121,7 @@
<JPanel/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='getAction().createRecruitmentDistribution(getBean())' enabled='{isActif()}'/>
+ <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='getAction().createRecruitmentDistribution(getBean())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -130,7 +130,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.5'>
<JScrollPane>
- <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentComment"'/>
+ <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -142,10 +142,10 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -226,6 +226,7 @@
</cell>
<cell fill='horizontal' weightx='1.0'>
<JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}'
+ decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"GroupChange"'
onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}'/>
</cell>
</row>
@@ -234,7 +235,9 @@
<JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/>
</cell>
<cell fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution'
+ matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'
+ decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/>
</cell>
</row>
<row>
@@ -243,7 +246,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"SeasonsComment"'/>
+ <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -255,18 +258,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -72,7 +72,7 @@
<PopulationEquationUI id='populationEquationUI' constructorParams='this'/>
</tab>
<tab title='{_("isisfish.populationZones.title")}'>
- <PopulationZonesUI id='populationZoneUI' constructorParams='this'/>
+ <PopulationZonesUI id='populationZoneUI' constructorParams='this' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/>
</tab>
<tab title='{_("isisfish.populationSeasons.title")}'>
<PopulationSeasonsUI id='populationSeasonsUI' constructorParams='this'/>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -199,7 +199,7 @@
</row>
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -144,7 +144,7 @@
</row>
<row>
<cell columns='2' fill='horizontal' weightx='1.0' >
- <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -168,30 +168,30 @@
<row>
<cell columns='2' fill='both' weighty='0.3' weightx='1.0' >
<JScrollPane>
- <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
<JPanel id='map' layout='{new BorderLayout()}'>
- <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/>
- <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/>
+ <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/>
+ <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed'/>
</JPanel>
</JSplitPane>
</cell>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -96,7 +96,7 @@
<JLabel text="isisfish.setOfVessels.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -104,7 +104,7 @@
<JLabel text="isisfish.common.port" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}'/>
+ <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Port"'/>
</cell>
</row>
<row>
@@ -112,7 +112,7 @@
<JLabel text="isisfish.setOfVessels.vesselType" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}'/>
+ <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"VesselType"'/>
</cell>
</row>
<row>
@@ -148,7 +148,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -160,18 +160,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='1.0'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='1.0'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -84,7 +84,7 @@
<JLabel text="isisfish.species.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -128,7 +128,7 @@
</cell>
<cell fill='both' columns='2' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -140,18 +140,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='delete'/>
+ <JButton id='delete' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -108,10 +108,10 @@
<Table constraints='BorderLayout.SOUTH'>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -128,7 +128,7 @@
</row>
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}'/>
+ <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -96,7 +96,7 @@
<JLabel text="isisfish.strategy.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -104,7 +104,7 @@
<JLabel text="isisfish.common.setOfVessels" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}'/>
+ <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"SetOfVessels"'/>
</cell>
</row>
<row>
@@ -140,7 +140,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -152,18 +152,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -81,7 +81,7 @@
<JLabel text="isisfish.tripType.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -106,7 +106,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -118,18 +118,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='delete'/>
+ <JButton id='delete' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -102,7 +102,7 @@
<JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Name"'/>
+ <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/>
</cell>
</row>
<row>
@@ -169,7 +169,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Comment"'/>
+ <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
@@ -181,18 +181,18 @@
<Table>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='delete'/>
+ <JButton id='delete' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967)
@@ -136,7 +136,7 @@
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldZoneName"
text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}'
- enabled='{isActif()}'
+ enabled='{isActif()}' decorator='boxed'
onKeyReleased='getBean().setName(fieldZoneName.getText())'/>
</cell>
</row>
@@ -148,7 +148,9 @@
<row>
<cell columns='2' fill='both' weighty='0.7' weightx='1.0'>
<JScrollPane>
- <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/>
+ <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}'
+ onMouseClicked='if ( isActif() ) { zoneCellsChange(); }'
+ decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/>
</JScrollPane>
</cell>
</row>
@@ -170,18 +172,18 @@
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='save'/>
+ <JButton id='save' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='cancel'/>
+ <JButton id='cancel' decorator='boxed'/>
</cell>
</row>
<row>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='create'/>
+ <JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-16 08:41:59 UTC (rev 1967)
@@ -22,6 +22,9 @@
import fr.ifremer.isisfish.types.Month;
import fr.ifremer.isisfish.ui.input.InputAction;
import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
+import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI;
+import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
+import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI;
import fr.ifremer.isisfish.ui.widget.IntervalPanel;
import java.lang.reflect.Method;
import java.util.logging.Level;
@@ -39,6 +42,7 @@
import org.codelutin.math.matrix.MatrixND;
import org.codelutin.math.matrix.gui.MatrixPanelEditor;
import org.codelutin.topia.persistence.TopiaEntity;
+import fr.ifremer.isisfish.ui.input.RangeOfValuesUI;
/**
*
@@ -101,6 +105,37 @@
ipResult.setLabelRenderer(Month.MONTH);
ipResult.setModel(ip.getModel().clone());
result = ipResult;
+ } else if (result instanceof RangeOfValuesUI){
+ RangeOfValuesUI origine = (RangeOfValuesUI)c;
+ RangeOfValuesUI ui = new RangeOfValuesUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(e);
+ ui.setActif(true);
+ ui.refresh();
+ result = ui;
+ } else if (result instanceof PopulationMigrationMigrationUI){
+ PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c;
+ PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
+ } else if (result instanceof PopulationMigrationEmigrationUI){
+ PopulationMigrationEmigrationUI origine = (PopulationMigrationEmigrationUI)c;
+ PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
+ } else if (result instanceof PopulationMigrationImmigrationUI){
+ PopulationMigrationImmigrationUI origine = (PopulationMigrationImmigrationUI)c;
+ PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
}
} catch (Exception ex) {
Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
@@ -157,6 +192,33 @@
ipResult.setLabelRenderer(Month.MONTH);
ipResult.setModel(ip.getModel().clone());
result = ipResult;
+ }else if (result instanceof PopulationMigrationMigrationUI){
+ PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c;
+ PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.getPopInfo().setMigrationMatrix((MatrixND)value);
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
+ } else if (result instanceof PopulationMigrationEmigrationUI){
+ PopulationMigrationEmigrationUI origine = (PopulationMigrationEmigrationUI)c;
+ PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.getPopInfo().setEmigrationMatrix((MatrixND)value);
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
+ } else if (result instanceof PopulationMigrationImmigrationUI){
+ PopulationMigrationImmigrationUI origine = (PopulationMigrationImmigrationUI)c;
+ PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction()));
+ ui.setBean(origine.getBean());
+ ui.setPopInfo(origine.getPopInfo());
+ ui.getPopInfo().setImmigrationMatrix((MatrixND)value);
+ ui.setActif(true);
+ ui.refreshPanel();
+ result = ui;
}
} catch (Exception ex) {
Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
@@ -174,10 +236,10 @@
result = ((MatrixPanelEditor)c).getMatrix();
} else if (c instanceof JComboBox){
-// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName));
+ result = ((JComboBox) result).getSelectedItem();
} else if (c instanceof JList){
-// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName));
+ result = ((JList) result).getSelectedValues();
} else if (c instanceof JCheckBox){
result = ((JCheckBox)c).isSelected();
@@ -186,11 +248,19 @@
result = ((JRadioButton)c).isSelected();
} else if (c instanceof InputOneEquationUI){
-// ((InputOneEquationUI) result).init(setText(BeanUtils.getProperty(e, fieldName)));
+ result = ((InputOneEquationUI) result).getFormule();
} else if (c instanceof IntervalPanel){
// ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName)));
+ } else if (result instanceof PopulationMigrationMigrationUI){
+ result = ((PopulationMigrationMigrationUI)c).getPopInfo().getMigrationMatrix();
+
+ } else if (result instanceof PopulationMigrationEmigrationUI){
+ result = ((PopulationMigrationEmigrationUI)c).getPopInfo().getEmigrationMatrix();
+
+ } else if (result instanceof PopulationMigrationImmigrationUI){
+ result = ((PopulationMigrationImmigrationUI)c).getPopInfo().getImmigrationMatrix();
}
return result;
}
@@ -198,13 +268,7 @@
String fieldName = (String) c.getClientProperty("method");
if (c instanceof JTextComponent) {
Object o = callMethod(e, fieldName);
- if (Integer.class.isInstance(o)){
- return true;
- } else if (Double.class.isInstance(o)){
- return true;
- } else if (Long.class.isInstance(o)){
- return true;
- }
+ return canBeContinue(c, o);
}
return false;
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-16 08:41:59 UTC (rev 1967)
@@ -42,16 +42,20 @@
if (cacheSelectedIndex != -1){
pane.setSelectedIndex(cacheSelectedIndex);
}
- InputContentUI ui = (InputContentUI) pane.getSelectedComponent();
- if (closeUI(ui)) {
- pane.setSelectedIndex(selectedIndex);
+ if (InputContentUI.class.isInstance(pane.getSelectedComponent())){
+ InputContentUI ui = (InputContentUI) pane.getSelectedComponent();
+ if (closeUI(ui)) {
+ pane.setSelectedIndex(selectedIndex);
+ }
+ if (InputContentUI.class.isInstance(pane.getSelectedComponent())){
+ ui = (InputContentUI) pane.getSelectedComponent();
+ ui.setSens(true);
+ ui.setLayer(true);
+ ui.refresh();
+ cacheSelectedIndex = pane.getSelectedIndex();
+ pane.addChangeListener(this);
+ }
}
- ui = (InputContentUI) pane.getSelectedComponent();
- ui.setSens(true);
- ui.setLayer(true);
- ui.refresh();
- cacheSelectedIndex = pane.getSelectedIndex();
- pane.addChangeListener(this);
} catch (Exception ex) {
Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex);
}
Modified: isis-fish/trunk/src/main/resources/sensitivity.properties
===================================================================
--- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-13 17:59:10 UTC (rev 1966)
+++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-16 08:41:59 UTC (rev 1967)
@@ -1,7 +1,6 @@
Cell.Latitude
Cell.Longitude
Cell.Land
-Cell.Comment
EffortDescription.FishingOperation
EffortDescription.FishingOperationDuration
EffortDescription.GearsNumberPerOperation
@@ -13,68 +12,65 @@
EffortDescription.RepairAndMaintenanceGearCost
EffortDescription.LandingCosts
EffortDescription.OtherRunningCost
-Gear.Name
Gear.EffortUnit
Gear.StandardisationFactor
Gear.ParameterName
Gear.PossibleValue
-Gear.Comment
-Metier.Name
+Gear.PopulationSelectivity
Metier.GearParameterValue
-Metier.Comment
-Population.Name
+Metier.Interval
+Metier.Zone
+MetierSeasonInfo.SpeciesTargetSpecies
Population.GeographicId
Population.PlusGroup
-Population.Comment
Population.Capturability
-Population.CapturabilityComment
Population.MappingZoneReproZoneRecru
Population.Growth
Population.GrowthReverse
+Population.MaturityGroup
+Population.MeanWeight
+Population.Price
+Population.ReproductionEquation
PopulationGroup.MeanWeight
PopulationGroup.Price
Population.NaturalDeathRateMatrix
+Population.NaturalDeathRate
PopulationGroup.ReproductionRate
PopulationGroup.Age
PopulationGroup.MinLength
PopulationGroup.MaxLength
-PopulationGroup.Comment
+PopulationGroup.MeanWeight
PopulationSeasonInfo.EmigrationMatrix
PopulationSeasonInfo.ImmigrationMatrix
PopulationSeasonInfo.MigrationMatrix
PopulationSeasonInfo.UseEquationMigration
PopulationSeasonInfo.Interval
-Population.MigrationComment
+PopulationSeasonInfo.LengthChangeMatrix
+PopulationSeasonInfo.GroupChange
Population.MonthGapBetweenReproRecrutement
Population.RecruitmentDistribution
-Population.RecruitmentComment
StrategyMonthInfo.LengthChangeMatrix
-Population.SeasonsComment
-Port.Name
Port.Cell
-Port.Comment
-SetOfVessels.Name
SetOfVessels.NumberOfVessels
SetOfVessels.FixedCosts
-SetOfVessels.Comment
-Species.Name
Species.ScientificName
Species.CodeRubbin
Species.CodeCEE
Species.AgeGroupType
Species.AgeGroupType
-Species.Comment
+SetOfVessels.Port
+SetOfVessels.VesselType
+SetOfVessels.NumberOfVessels
+SetOfVessels.FixedCosts
+SetOfVessels.TechnicalEfficiencyEquation
StrategyMonthInfo.MinInactivityDays
StrategyMonthInfo.ProportionMetier
-Strategy.Name
Strategy.ProportionSetOfVessels
Strategy.InactivityEquationUsed
-Strategy.Comment
-TripType.Name
+Strategy.SetOfVessels
+Strategy.Inactivity
TripType.TripDuration
TripType.MinTimeBetweenTrip
-TripType.Comment
-VesselType.Name
VesselType.Length
VesselType.Speed
VesselType.MaxTripDuration
@@ -82,5 +78,4 @@
VesselType.MinCrewSize
VesselType.UnitFuelCostOfTravel
VesselType.TripType
-VesselType.Comment
Zone.Cell
\ No newline at end of file
1
0
r1966 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 17:59:10 +0000 (Fri, 13 Mar 2009)
New Revision: 1966
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
Log:
Fix compilation pb
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-13 17:32:06 UTC (rev 1965)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-13 17:59:10 UTC (rev 1966)
@@ -27,7 +27,6 @@
import fr.ifremer.isisfish.mexico.xml.DesignPlanXMLVisitor;
import fr.ifremer.isisfish.mexico.xml.DomXMLParser;
-import fr.ifremer.isisfish.mexico.xml.MexicoContentHandler;
import fr.ifremer.isisfish.mexico.xml.SensitivityScenariosXMLVisitor;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
1
0
r1965 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 17:32:06 +0000 (Fri, 13 Mar 2009)
New Revision: 1965
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
Log:
Fix javadocs link
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 17:06:33 UTC (rev 1964)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 17:32:06 UTC (rev 1965)
@@ -661,7 +661,7 @@
DEFAULT_MAP_FILENAME("default.map.filename", _("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin"),
DEFAULT_TAG_VALUE("default.tagvalue", _("isisfish.config.main.defaultTagValue.description"), ""),
ENCODING("encoding", _("isisfish.config.main.encoding.description"), "UTF-8"),
- JAVADOC_URL("javadoc.url", _("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/apidocs/"),
+ JAVADOC_URL("javadoc.url", _("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"),
SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"),
/** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */
1
0
r1964 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 17:06:33 +0000 (Fri, 13 Mar 2009)
New Revision: 1964
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
Log:
Update dates
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 16:05:51 UTC (rev 1963)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 17:06:33 UTC (rev 1964)
@@ -118,7 +118,7 @@
return apiVersion;
}
- static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2008";
+ static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2009";
static final public String CONFIG_FILENAME = "isis-config-" + version.getNumber(0);
/** separateur de liste */
1
0
r1963 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/mexico 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 test/java/fr/ifremer/isisfish/mexico test/resources test/resources/mexico
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 16:05:51 +0000 (Fri, 13 Mar 2009)
New Revision: 1963
Added:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.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/ScenarioXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java
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/SensitivityScenariosVisitor.java
isis-fish/trunk/src/test/resources/mexico/
isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml
isis-fish/trunk/src/test/resources/mexico/mexicohelper_scenarios.xml
Removed:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.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/DomainXMLVisitor.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.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/SensitivityScenarios.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
Log:
Begining of read/write designplan/scenarios as xml
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -18,19 +18,30 @@
package fr.ifremer.isisfish.mexico;
+import java.io.IOException;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+
import fr.ifremer.isisfish.mexico.xml.DesignPlanXMLVisitor;
+import fr.ifremer.isisfish.mexico.xml.DomXMLParser;
+import fr.ifremer.isisfish.mexico.xml.MexicoContentHandler;
+import fr.ifremer.isisfish.mexico.xml.SensitivityScenariosXMLVisitor;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
/**
* Mexico helper class.
*
* @author chatellier
- * @version $Revision: 1.0 $
+ * @version $Revision$
*
* @since 3.2.0.4
*
- * Last update : $Date: 5 mars 2009 $
- * By : $Author: chatellier $
+ * Last update : $Date$
+ * By : $Author$
*/
public class MexicoHelper {
@@ -41,11 +52,69 @@
* @return xml design plan representation
*/
public static String getDesignPlanAsXML(DesignPlan designPlan) {
-
+
DesignPlanXMLVisitor visitor = new DesignPlanXMLVisitor();
designPlan.accept(visitor);
String designPlanXml = visitor.getXML();
return designPlanXml;
-
+
}
+
+ /**
+ * Get xml representation of a scenario.
+ *
+ * @param scenarios sensitivity scenarios
+ * @return xml sensitivity scenarios representation
+ */
+ public static String getSensitivityScenarionsAsXML(
+ SensitivityScenarios scenarios) {
+
+ SensitivityScenariosXMLVisitor visitor = new SensitivityScenariosXMLVisitor();
+ scenarios.accept(visitor);
+ String sensitivityScenariosXml = visitor.getXML();
+ return sensitivityScenariosXml;
+
+ }
+
+ /**
+ * Parse xmlFile with sax, and return a {@link DesignPlan}.
+ *
+ * @param xmlFile file path to parse
+ * @return DesignPlan
+ * @throws IOException
+ */
+ public static DesignPlan getDesignPlanFromXML(String xmlFile)
+ throws IOException {
+ DesignPlan designPlan = null;
+ try {
+ SAXReader reader = new SAXReader();
+ Document doc = reader.read(xmlFile);
+ Element root = doc.getRootElement();
+ designPlan = DomXMLParser.parseDesignPlan(root);
+ } catch (DocumentException e) {
+ throw new IOException(e);
+ }
+ return designPlan;
+ }
+
+ /**
+ * Parse xmlFile with sax, and return a {@link SensitivityScenarios}.
+ *
+ * @param xmlFile file path to parse
+ * @return SensitivityScenarios
+ * @throws IOException
+ */
+ public static SensitivityScenarios getSensitivityScenariosFromXML(
+ String xmlFile) throws IOException {
+ SensitivityScenarios scenarios = null;
+ try {
+ SAXReader reader = new SAXReader();
+ Document doc = reader.read(xmlFile);
+ Element root = doc.getRootElement();
+ scenarios = DomXMLParser.parseSensitivityScenarios(root);
+ } catch (DocumentException e) {
+ throw new IOException(e);
+ }
+ return scenarios;
+ }
}
Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
___________________________________________________________________
Name: svn:keywords
+ Revision Author Date
Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java 2009-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -1,90 +0,0 @@
-/* *##%
- * Copyright (C) 2009 Code Lutin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-package fr.ifremer.isisfish.mexico.xml;
-
-import java.io.Serializable;
-
-import fr.ifremer.isisfish.simulator.sensitivity.Domain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
-
-/**
- * XML domain visitor.
- *
- * @author chatellier
- * @version $Revision: 1.0 $
- *
- * Last update : $Date: 5 mars 2009 $
- * By : $Author: chatellier $
- */
-public class ContinousDomainXMLVisitor extends DomainXMLVisitor {
-
- /** XML text buffer. */
- protected StringBuffer xmlBuffer;
-
- /**
- * Constructor.
- *
- * Init xml buffer.
- */
- public ContinousDomainXMLVisitor() {
- xmlBuffer = new StringBuffer();
- }
-
- /**
- * Get xml buffer content.
- *
- * @return content as string
- */
- public String getXML() {
- String xml = xmlBuffer.toString();
- return xml;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void start(Domain<? extends Serializable> domain) {
- xmlBuffer.append("<domain>");
- xmlBuffer.append("<fixed");
-
- ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain;
- xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">");
-
- xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public <E extends Serializable> void visit(Domain<E> domain,
- Serializable label, Serializable value) {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void end(Domain<? extends Serializable> domain) {
- xmlBuffer.append("<fixed>");
- xmlBuffer.append("</domain>");
- }
-}
Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java (from rev 1950, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinousDomainXMLVisitor.java)
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,68 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.mexico.xml;
+
+import java.io.Serializable;
+
+import fr.ifremer.isisfish.simulator.sensitivity.Domain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+
+/**
+ * XML domain visitor.
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 5 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public class ContinuousDomainXMLVisitor extends DomainXMLVisitor {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void start(Domain<? extends Serializable> domain) {
+ xmlBuffer.append("<domain>");
+ xmlBuffer.append("<fixed");
+
+ ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain;
+ xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">");
+
+ xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public <E extends Serializable> void visit(Domain<E> domain,
+ Serializable label, Serializable value) {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void end(Domain<? extends Serializable> domain) {
+ xmlBuffer.append("</fixed>");
+ xmlBuffer.append("</domain>");
+ }
+}
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-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -34,29 +34,7 @@
*/
public class DiscreteDomainXMLVisitor extends DomainXMLVisitor {
- /** XML text buffer. */
- protected StringBuffer xmlBuffer;
-
/**
- * Constructor.
- *
- * Init xml buffer.
- */
- public DiscreteDomainXMLVisitor() {
- xmlBuffer = new StringBuffer();
- }
-
- /**
- * Get xml buffer content.
- *
- * @return content as string
- */
- public String getXML() {
- String xml = xmlBuffer.toString();
- return xml;
- }
-
- /**
* {@inheritDoc}
*/
@Override
@@ -86,7 +64,7 @@
@Override
public void end(Domain<? extends Serializable> domain) {
xmlBuffer.append("</enumeration>");
- xmlBuffer.append("<fixed>");
+ xmlBuffer.append("</fixed>");
xmlBuffer.append("</domain>");
}
}
Added: 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 (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,224 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.mexico.xml;
+
+import java.util.List;
+
+import org.dom4j.Element;
+
+import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
+import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
+
+/**
+ * Parse xml using dom.
+ *
+ * @see DOM4J
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 13 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public class DomXMLParser {
+
+ /**
+ * Parse element root node as Design plan.
+ *
+ * @return a {@link DesignPlan}
+ */
+ public static DesignPlan parseDesignPlan(Element rootElement) {
+
+ DesignPlan plan = new DesignPlan();
+
+ List<Element> factorElements = rootElement
+ .selectNodes("child::factors/factor");
+
+ for (Element factorElement : factorElements) {
+ String type = factorElement.attributeValue("type");
+ String name = factorElement.attributeValue("name");
+ String property = factorElement.attributeValue("property");
+ String path = factorElement.element("target").getText().trim();
+
+ // double
+ if ("real".equals(type)) {
+ Factor<Double> factor = new Factor<Double>(name);
+ factor.setPath(path);
+ Element fixedElement = factorElement.element("domain").element(
+ "fixed");
+ if ("continuous".equals(property)) {
+ ContinuousDomain<Double> domain = new ContinuousDomain<Double>();
+ domain.setCardinality(Integer.valueOf(fixedElement
+ .attributeValue("cardinality")));
+ Element rangeElement = fixedElement.element("range");
+ domain.setMinBound(Double.valueOf(rangeElement
+ .attributeValue("min")));
+ domain.setMaxBound(Double.valueOf(rangeElement
+ .attributeValue("max")));
+ factor.setDomain(domain);
+ } else if ("discrete".equals(property)) {
+ DiscreteDomain<Double> domain = new DiscreteDomain<Double>();
+ List<Element> valueElements = fixedElement.element(
+ "enumeration").elements("value");
+ int label = 0;
+ for (Element valueElement : valueElements) {
+ domain.getValues().put(Integer.valueOf(label),
+ Double.valueOf(valueElement.getText().trim()));
+ ++label;
+ }
+ factor.setDomain(domain);
+ }
+ plan.getFactors().add(factor);
+ } else if ("integer".equals(type)) {
+ Factor<Integer> factor = new Factor<Integer>(name);
+ factor.setPath(path);
+ Element fixedElement = factorElement.element("domain").element(
+ "fixed");
+ if ("continuous".equals(property)) {
+ ContinuousDomain<Integer> domain = new ContinuousDomain<Integer>();
+ domain.setCardinality(Integer.valueOf(fixedElement
+ .attributeValue("cardinality")));
+ Element rangeElement = fixedElement.element("range");
+ domain.setMinBound(Integer.valueOf(rangeElement
+ .attributeValue("min")));
+ domain.setMaxBound(Integer.valueOf(rangeElement
+ .attributeValue("max")));
+ factor.setDomain(domain);
+ } else if ("discrete".equals(property)) {
+ DiscreteDomain<Integer> domain = new DiscreteDomain<Integer>();
+ List<Element> valueElements = fixedElement.element(
+ "enumeration").elements("value");
+ int label = 0;
+ for (Element valueElement : valueElements) {
+ domain.getValues().put(Integer.valueOf(label),
+ Integer.valueOf(valueElement.getText().trim()));
+ ++label;
+ }
+ factor.setDomain(domain);
+ }
+ plan.getFactors().add(factor);
+ }
+ }
+
+ return plan;
+ }
+
+ /**
+ * Parse element root node as Sensitivity Scenarios.
+ *
+ * @return a {@link DesignPlan}
+ */
+ public static SensitivityScenarios parseSensitivityScenarios(
+ Element rootElement) {
+
+ SensitivityScenarios scenarios = new SensitivityScenarios();
+
+ List<Element> scenarioElements = rootElement
+ .selectNodes("child::scenarios/scenario");
+
+ for (Element scenarioElement : scenarioElements) {
+
+ Scenario scenario = new Scenario();
+ List<Element> factorElements = scenarioElement.elements("factor");
+
+ for (Element factorElement : factorElements) {
+ String type = factorElement.attributeValue("type");
+ String name = factorElement.attributeValue("name");
+ String property = factorElement.attributeValue("property");
+ String path = factorElement.element("target").getText().trim();
+
+ // double
+ if ("real".equals(type)) {
+ Factor<Double> factor = new Factor<Double>(name);
+ factor.setPath(path);
+ factor.setValue(Double.valueOf(factorElement.element(
+ "value").getText().trim()));
+
+ Element fixedElement = factorElement.element("domain")
+ .element("fixed");
+ if ("continuous".equals(property)) {
+ ContinuousDomain<Double> domain = new ContinuousDomain<Double>();
+ domain.setCardinality(Integer.valueOf(fixedElement
+ .attributeValue("cardinality")));
+ Element rangeElement = fixedElement.element("range");
+ domain.setMinBound(Double.valueOf(rangeElement
+ .attributeValue("min")));
+ domain.setMaxBound(Double.valueOf(rangeElement
+ .attributeValue("max")));
+ factor.setDomain(domain);
+ } else if ("discrete".equals(property)) {
+ DiscreteDomain<Double> domain = new DiscreteDomain<Double>();
+ List<Element> valueElements = fixedElement.element(
+ "enumeration").elements("value");
+ int label = 0;
+ for (Element valueElement : valueElements) {
+ domain.getValues().put(
+ Integer.valueOf(label),
+ Double.valueOf(valueElement.getText()
+ .trim()));
+ ++label;
+ }
+ factor.setDomain(domain);
+ }
+ scenario.getFactors().add(factor);
+ } else if ("integer".equals(type)) {
+ Factor<Integer> factor = new Factor<Integer>(name);
+ factor.setPath(path);
+ factor.setValue(Integer.valueOf(factorElement.element(
+ "value").getText().trim()));
+
+ Element fixedElement = factorElement.element("domain")
+ .element("fixed");
+ if ("continuous".equals(property)) {
+ ContinuousDomain<Integer> domain = new ContinuousDomain<Integer>();
+ domain.setCardinality(Integer.valueOf(fixedElement
+ .attributeValue("cardinality")));
+ Element rangeElement = fixedElement.element("range");
+ domain.setMinBound(Integer.valueOf(rangeElement
+ .attributeValue("min")));
+ domain.setMaxBound(Integer.valueOf(rangeElement
+ .attributeValue("max")));
+ factor.setDomain(domain);
+ } else if ("discrete".equals(property)) {
+ DiscreteDomain<Integer> domain = new DiscreteDomain<Integer>();
+ List<Element> valueElements = fixedElement.element(
+ "enumeration").elements("value");
+ int label = 0;
+ for (Element valueElement : valueElements) {
+ domain.getValues().put(
+ Integer.valueOf(label),
+ Integer.valueOf(valueElement.getText()
+ .trim()));
+ ++label;
+ }
+ factor.setDomain(domain);
+ }
+ scenario.getFactors().add(factor);
+ }
+ }
+ scenarios.getScenarios().add(scenario);
+ }
+
+ return scenarios;
+ }
+}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -18,11 +18,6 @@
package fr.ifremer.isisfish.mexico.xml;
-import java.io.Serializable;
-
-import fr.ifremer.isisfish.simulator.sensitivity.Domain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor;
/**
@@ -34,7 +29,7 @@
* Last update : $Date: 5 mars 2009 $
* By : $Author: chatellier $
*/
-public class DomainXMLVisitor implements DomainVisitor {
+public abstract class DomainXMLVisitor implements DomainVisitor {
/** XML text buffer. */
protected StringBuffer xmlBuffer;
@@ -57,41 +52,4 @@
String xml = xmlBuffer.toString();
return xml;
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void start(Domain<? extends Serializable> domain) {
- xmlBuffer.append("<domain>");
- xmlBuffer.append("<fixed");
-
- if (domain instanceof ContinuousDomain) {
- ContinuousDomain<?> cDomain = (ContinuousDomain<?>)domain;
- xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\"");
- }
- else if (domain instanceof DiscreteDomain) {
- DiscreteDomain<?> dDomain = (DiscreteDomain<?>)domain;
- xmlBuffer.append(" cardinality=\"" + dDomain.getValues().size() + "\"");
- }
- xmlBuffer.append(">");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public <E extends Serializable> void visit(Domain<E> domain,
- Serializable label, Serializable value) {
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void end(Domain<? extends Serializable> domain) {
- xmlBuffer.append("</fixed>");
- xmlBuffer.append("</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-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -66,14 +66,30 @@
public void start(Factor<? extends Serializable> factor) {
xmlBuffer.append("<factor");
xmlBuffer.append(" name=\"" + factor.getName() + "\"");
+ Serializable referenceValueForType = null;
+ // property attribute
if (factor.getDomain() instanceof ContinuousDomain) {
xmlBuffer.append(" property=\"continuous\"");
+ referenceValueForType = ((ContinuousDomain)factor.getDomain()).getMinBound();
}
else if (factor.getDomain() instanceof DiscreteDomain) {
xmlBuffer.append(" property=\"discrete\"");
+ referenceValueForType = (Serializable)((DiscreteDomain)factor.getDomain()).getValues().get(((DiscreteDomain)factor.getDomain()).getValues().firstKey());
}
+ // type attribute
+ if (referenceValueForType instanceof Double || referenceValueForType instanceof Float) {
+ xmlBuffer.append(" type=\"real\"");
+ }
+ else if (referenceValueForType instanceof Integer) {
+ xmlBuffer.append(" type=\"integer\"");
+ }
xmlBuffer.append(">");
+ // target element
xmlBuffer.append("<target>" + factor.getPath() + "</target>");
+ // value element
+ if (factor.getValue() != null) {
+ xmlBuffer.append("<value>" + factor.getValue() + "</value>");
+ }
}
/*
@@ -83,7 +99,7 @@
public void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain) {
DomainXMLVisitor visitor = null;
if (factor.getDomain() instanceof ContinuousDomain) {
- visitor = new ContinousDomainXMLVisitor();
+ visitor = new ContinuousDomainXMLVisitor();
}
else if (factor.getDomain() instanceof DiscreteDomain) {
visitor = new DiscreteDomainXMLVisitor();
@@ -98,7 +114,5 @@
@Override
public void end(Factor<? extends Serializable> factor) {
xmlBuffer.append("</factor>");
-
}
-
}
Added: 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 (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,88 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.mexico.xml;
+
+import java.io.Serializable;
+
+import fr.ifremer.isisfish.simulator.sensitivity.Domain;
+import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
+import fr.ifremer.isisfish.simulator.sensitivity.visitor.ScenarioVisitor;
+
+/**
+ * XML domain visitor.
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 5 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public class ScenarioXMLVisitor implements ScenarioVisitor {
+
+ /** XML text buffer. */
+ protected StringBuffer xmlBuffer;
+
+ /**
+ * Constructor.
+ *
+ * Init xml buffer.
+ */
+ public ScenarioXMLVisitor() {
+ xmlBuffer = new StringBuffer();
+ }
+
+ /**
+ * Get xml buffer content.
+ *
+ * @return content as string
+ */
+ public String getXML() {
+ String xml = xmlBuffer.toString();
+ return xml;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void start(Scenario scenario) {
+ xmlBuffer.append("<scenario>");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void visit(Scenario scenario, Factor<? extends Serializable> factor) {
+ FactorXMLVisitor visitor = new FactorXMLVisitor();
+ factor.accept(visitor);
+ xmlBuffer.append(visitor.getXML());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void end(Scenario scenario) {
+ xmlBuffer.append("</scenario>");
+ }
+}
Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,89 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.mexico.xml;
+
+import java.io.Serializable;
+
+import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
+import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
+import fr.ifremer.isisfish.simulator.sensitivity.visitor.SensitivityScenariosVisitor;
+
+/**
+ * XML sensitivity scenarios visitor.
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 5 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public class SensitivityScenariosXMLVisitor implements SensitivityScenariosVisitor {
+
+ /** XML text buffer. */
+ protected StringBuffer xmlBuffer;
+
+ /**
+ * Constructor.
+ *
+ * Init xml buffer.
+ */
+ public SensitivityScenariosXMLVisitor() {
+ xmlBuffer = new StringBuffer();
+ }
+
+ /**
+ * Get xml buffer content.
+ *
+ * @return content as string
+ */
+ public String getXML() {
+ String xml = xmlBuffer.toString();
+ return xml;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void start(SensitivityScenarios scenarios) {
+ xmlBuffer.append("<experimentalScenarios>");
+ xmlBuffer.append("<scenarios>");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void visit(SensitivityScenarios scenarios, Scenario scenario) {
+ ScenarioXMLVisitor visitor = new ScenarioXMLVisitor();
+ scenario.accept(visitor);
+ xmlBuffer.append(visitor.getXML());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void end(SensitivityScenarios scenarios) {
+ xmlBuffer.append("</scenarios>");
+ xmlBuffer.append("</experimentalScenarios>");
+ }
+}
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-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -21,7 +21,10 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import fr.ifremer.isisfish.simulator.sensitivity.visitor.ScenarioVisitor;
+
/**
* Scenario d'execution de simulation.
*
@@ -84,4 +87,17 @@
public void setFactors(List<Factor<? extends Serializable>> factors) {
this.factors = factors;
}
+
+ /**
+ * Accept a new visitor.
+ *
+ * @param visitor
+ */
+ public void accept(ScenarioVisitor visitor) {
+ visitor.start(this);
+ for(Factor<? extends Serializable> factor : factors) {
+ visitor.visit(this, factor);
+ }
+ visitor.end(this);
+ }
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2009-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -18,9 +18,12 @@
package fr.ifremer.isisfish.simulator.sensitivity;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import fr.ifremer.isisfish.simulator.sensitivity.visitor.SensitivityScenariosVisitor;
+
/**
* Ensemble de {@link Scenario}.
*
@@ -30,7 +33,7 @@
* Last update : $Date: 24 févr. 2009 $
* By : $Author: chatellier $
*/
-public class SensitivityScenarios {
+public class SensitivityScenarios implements Serializable {
/** serialVersionUID. */
private static final long serialVersionUID = 4953721873692486687L;
@@ -64,4 +67,17 @@
public void setScenarios(List<Scenario> scenarios) {
this.scenarios = scenarios;
}
+
+ /**
+ * Accept a new visitor.
+ *
+ * @param visitor
+ */
+ public void accept(SensitivityScenariosVisitor visitor) {
+ visitor.start(this);
+ for(Scenario scenario : scenarios) {
+ visitor.visit(this, scenario);
+ }
+ visitor.end(this);
+ }
}
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-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -20,8 +20,6 @@
import java.io.Serializable;
-import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor;
-
/**
* Domaine continu portant sur variable pouvant prendre diférente
* valeur par rapport à une valeur initiale.
Added: 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 (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,58 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.simulator.sensitivity.visitor;
+
+import java.io.Serializable;
+
+import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
+
+/**
+ * Domain visitor.
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 5 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public interface ScenarioVisitor {
+
+ /**
+ * Start.
+ *
+ * @param scenario scenario
+ */
+ void start(Scenario scenario);
+
+ /**
+ * Visit domain value or property.
+ *
+ * @param scenario scenario
+ * @param factor factor
+ */
+ void visit(Scenario scenario, Factor<? extends Serializable> factor);
+
+ /**
+ * End.
+ *
+ * @param scenario scenario
+ */
+ void end(Scenario scenario);
+}
Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,56 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *##%*/
+
+package fr.ifremer.isisfish.simulator.sensitivity.visitor;
+
+import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
+
+/**
+ * Domain visitor.
+ *
+ * @author chatellier
+ * @version $Revision: 1.0 $
+ *
+ * Last update : $Date: 5 mars 2009 $
+ * By : $Author: chatellier $
+ */
+public interface SensitivityScenariosVisitor {
+
+ /**
+ * Start.
+ *
+ * @param scenarios scenarios
+ */
+ void start(SensitivityScenarios scenarios);
+
+ /**
+ * Visit domain value or property.
+ *
+ * @param scenarios scenarios
+ * @param scenario scenario
+ */
+ void visit(SensitivityScenarios scenarios, Scenario scenario);
+
+ /**
+ * End.
+ *
+ * @param scenarios scenarios
+ */
+ void end(SensitivityScenarios scenarios);
+}
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-03-13 11:55:40 UTC (rev 1962)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-13 16:05:51 UTC (rev 1963)
@@ -28,12 +28,15 @@
import org.codelutin.math.matrix.MatrixFactory;
import org.codelutin.math.matrix.MatrixND;
import org.codelutin.util.FileUtil;
-import org.junit.Ignore;
import org.junit.Test;
import fr.ifremer.TestUtils;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculatorRandomMock;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException;
+import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
@@ -53,13 +56,9 @@
/** Commons logging log. */
private static Log log = LogFactory.getLog(MexicoHelperTest.class);
- /**
- * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan)}.
- * @throws IOException
- */
- @Test
- public void testGetDesignPlanAsXML() throws IOException {
-
+ protected DesignPlan getTestDesignPlan() {
+ DesignPlan designPlan = new DesignPlan();
+
// matrix 1
MatrixND matrix1 = MatrixFactory.getInstance().create("test1",
new int[] { 3, 2 }, new String[] { "col1", "col2" });
@@ -69,8 +68,6 @@
matrix1.setValue(new int[] { 1, 1 }, 2);
matrix1.setValue(new int[] { 2, 0 }, 12);
matrix1.setValue(new int[] { 2, 1 }, -1);
-
- DesignPlan designPlan = new DesignPlan();
// factor 1
Factor<Double> factorContinuous = new Factor<Double>("factor 1 (double)");
@@ -124,9 +121,22 @@
designPlan.getFactors().add(factorContinuous2);
designPlan.getFactors().add(factorMatrixContinuous);
designPlan.getFactors().add(factorEquationContinuous);
+
+ return designPlan;
+ }
+
+ /**
+ * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan)}.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testGetDesignPlanAsXML() throws IOException {
+ DesignPlan testDesignPlan = getTestDesignPlan();
+
// test xml export
- String xml = MexicoHelper.getDesignPlanAsXML(designPlan);
+ String xml = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
Assert.assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1);
//Assert.assertTrue(xml.indexOf("<range min=\"12.0\" max=\"99.0\" />") != -1);
@@ -134,8 +144,72 @@
if (log.isDebugEnabled()) {
xml = xml.replaceAll(">", ">\n");
- FileUtil.writeString(new File(TestUtils.getTargetdir(),"mexicohelper_factors.xml"), xml);
+ FileUtil.writeString(new File(TestUtils.getTargetdir(),"mexicohelper_designplan.xml"), xml);
log.info("Designplan xml = " + xml);
}
}
+
+ /**
+ * Test method {@link MexicoHelper#getSensitivityScenarionsAsXML(SensitivityScenarios)}.
+ *
+ * @throws IOException
+ * @throws SensitivityException
+ */
+ @Test
+ public void testGetSensitivityScenariosAsXML() throws IOException, SensitivityException {
+
+ DesignPlan testDesignPlan = getTestDesignPlan();
+ SensitivityCalculator testCalculator = new SensitivityCalculatorRandomMock();
+ SensitivityScenarios testScenario = testCalculator.compute(testDesignPlan);
+
+ // test xml export
+ String xml = MexicoHelper.getSensitivityScenarionsAsXML(testScenario);
+
+ //Assert.assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1);
+ //Assert.assertTrue(xml.indexOf("<range min=\"12.0\" max=\"99.0\" />") != -1);
+ //Assert.assertTrue(xml.indexOf("<value>70.9</value>") != -1);
+
+ if (log.isDebugEnabled()) {
+ xml = xml.replaceAll(">", ">\n");
+ FileUtil.writeString(new File(TestUtils.getTargetdir(),"mexicohelper_scenarios.xml"), xml);
+ log.info("SensitivityScenarios xml = " + xml);
+ }
+ }
+
+ /**
+ * Test method {@link MexicoHelper#getDesignPlanFromXML(String)}.
+ * @throws IOException
+ */
+ @Test
+ public void getDesignPlanFromXML() throws IOException {
+
+ DesignPlan plan = MexicoHelper.getDesignPlanFromXML("src/test/resources/mexico/mexicohelper_designplan.xml");
+
+ Assert.assertEquals(4, plan.getFactors().size());
+ // FIXME should be : Assert.assertEquals(5, plan.getFactors().size());
+
+ String xml = MexicoHelper.getDesignPlanAsXML(plan);
+ xml = xml.replaceAll(">", ">\n");
+ log.info("getDesignPlanFromXML xml = " + xml);
+ }
+
+ /**
+ * Test method {@link MexicoHelper#getSensitivityScenariosFromXML(String)}.
+ * @throws IOException
+ */
+ @Test
+ public void getSensitivityScenariosFromXML() throws IOException {
+
+ SensitivityScenarios scenario = MexicoHelper.getSensitivityScenariosFromXML("src/test/resources/mexico/mexicohelper_scenarios.xml");
+
+ Assert.assertEquals(10, scenario.getScenarios().size());
+ Assert.assertEquals(5, scenario.getScenarios().get(0).getFactors().size());
+ Assert.assertEquals(2, scenario.getScenarios().get(1).getFactors().size());
+ Assert.assertEquals(2, scenario.getScenarios().get(2).getFactors().size());
+ Assert.assertEquals(2, scenario.getScenarios().get(3).getFactors().size());
+
+ String xml = MexicoHelper.getSensitivityScenarionsAsXML(scenario);
+ xml = xml.replaceAll(">", ">\n");
+ log.info("getSensitivityScenariosFromXML xml = " + xml);
+ }
}
Added: isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml
===================================================================
--- isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml (rev 0)
+++ isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,57 @@
+<experimentalDesign>
+ <factors>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>
+ fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>
+ 3.0</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 3 (discrete matrix)" property="discrete">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <domain>
+ <fixed cardinality="1">
+ <enumeration>
+ <value>test1 matrix2D [
+ 13.0,21.0,12.0,
+ -14.0,2.0,-1.0,]</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 5 (EquationContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength</target>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </factors>
+</experimentalDesign>
Added: isis-fish/trunk/src/test/resources/mexico/mexicohelper_scenarios.xml
===================================================================
--- isis-fish/trunk/src/test/resources/mexico/mexicohelper_scenarios.xml (rev 0)
+++ isis-fish/trunk/src/test/resources/mexico/mexicohelper_scenarios.xml 2009-03-13 16:05:51 UTC (rev 1963)
@@ -0,0 +1,319 @@
+<experimentalScenarios>
+ <scenarios>
+ <scenario>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>12.3</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>70.9</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>21.0</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>-12.1</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>-8.45</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>1.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>2.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>1.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous"
+ type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>2.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 1 (double)" property="continuous"
+ type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>0.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>50.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>0.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>50.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 3 (discrete matrix)" property="discrete">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>test1 matrix2D [
+ 13.0,21.0,12.0,
+ -14.0,2.0,-1.0,]</value>
+ <domain>
+ <fixed cardinality="1">
+ <enumeration>
+ <value>test1 matrix2D [
+ 13.0,21.0,12.0,
+ -14.0,2.0,-1.0,]</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>0.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>50.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>12.3</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>
+ 70.9</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>21.0</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>
+ fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>-12.1</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 2 (double)" property="discrete" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength</target>
+ <value>-8.45</value>
+ <domain>
+ <fixed cardinality="5">
+ <enumeration>
+ <value>12.3</value>
+ <value>70.9</value>
+ <value>21.0</value>
+ <value>-12.1</value>
+ <value>-8.45</value>
+ </enumeration>
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>1.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 4 (MatrixContinuous)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength</target>
+ <value>2.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="1.0" max="2.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ <scenario>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>0.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ <factor name="factor 1 (double)" property="continuous" type="real">
+ <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength</target>
+ <value>50.0</value>
+ <domain>
+ <fixed cardinality="0">
+ <range min="0.0" max="50.0" />
+ </fixed>
+ </domain>
+ </factor>
+ </scenario>
+ </scenarios>
+</experimentalScenarios>
1
0
r1962 - isis-fish/trunk/src/main/resources/templates/prescript
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 11:55:40 +0000 (Fri, 13 Mar 2009)
New Revision: 1962
Modified:
isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl
Log:
Update prescript
Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl
===================================================================
--- isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-03-13 11:20:11 UTC (rev 1961)
+++ isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-03-13 11:55:40 UTC (rev 1962)
@@ -29,11 +29,9 @@
context.setValue("K1", 2, "-");
-->
-
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtilsBean;
import fr.ifremer.isisfish.util.ConverterUtil;
-
ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
<#list scenario.factors as factor>
1
0
r1961 - isis-fish/trunk/src/test/resources/test-database/exports
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
by chatellier@users.labs.libre-entreprise.org 13 Mar '09
13 Mar '09
Author: chatellier
Date: 2009-03-13 11:20:11 +0000 (Fri, 13 Mar 2009)
New Revision: 1961
Modified:
isis-fish/trunk/src/test/resources/test-database/exports/RejetsNombre.java
Log:
Fix test compilation
Modified: isis-fish/trunk/src/test/resources/test-database/exports/RejetsNombre.java
===================================================================
--- isis-fish/trunk/src/test/resources/test-database/exports/RejetsNombre.java 2009-03-13 11:17:39 UTC (rev 1960)
+++ isis-fish/trunk/src/test/resources/test-database/exports/RejetsNombre.java 2009-03-13 11:20:11 UTC (rev 1961)
@@ -37,7 +37,7 @@
static private Log log = LogFactory.getLog(RejetsNombre.class);
protected String [] necessaryResult = {
- ResultName.MATRIX_DISCARDS_PER_STR_MET
+ ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP
};
public String[] getNecessaryResult() {
@@ -61,7 +61,7 @@
for (Population pop : simulation.getParameter().getPopulations()) {
for (Date date = new Date(0); !date.after(lastDate); date = date.next() ) {
- MatrixND mat = simulation.getResultStorage().getMatrix(date, pop, ResultName.MATRIX_DISCARDS_PER_STR_MET);
+ MatrixND mat = simulation.getResultStorage().getMatrix(date, pop, ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP);
if (mat != null) { // can be null if simulation is stopped before last year simulation
mat = mat.sumOverDim(0); //sum on strategy
for (MatrixIterator i=mat.iterator(); i.hasNext();) {
1
0
13 Mar '09
Author: chatellier
Date: 2009-03-13 11:17:39 +0000 (Fri, 13 Mar 2009)
New Revision: 1960
Modified:
isis-fish/trunk/src/main/resources/log4j.properties
Log:
Add sensitivity log level
Modified: isis-fish/trunk/src/main/resources/log4j.properties
===================================================================
--- isis-fish/trunk/src/main/resources/log4j.properties 2009-03-13 11:16:31 UTC (rev 1959)
+++ isis-fish/trunk/src/main/resources/log4j.properties 2009-03-13 11:17:39 UTC (rev 1960)
@@ -13,4 +13,5 @@
log4j.logger.formules=INFO
log4j.logger.rules=INFO
log4j.logger.scripts=INFO
-log4j.logger.simulators=INFO
\ No newline at end of file
+log4j.logger.sensitivity=INFO
+log4j.logger.simulators=INFO
1
0