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

r1849 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: chatellier Date: 2009-02-20 15:17:05 +0000 (Fri, 20 Feb 2009) New Revision: 1849 Modified: isis-fish/trunk/pom.xml Log: [maven-release-plugin] prepare release isis-fish-3.2.0.3 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-20 15:13:24 UTC (rev 1848) +++ isis-fish/trunk/pom.xml 2009-02-20 15:17:05 UTC (rev 1849) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,7 +14,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.3-SNAPSHOT</version> + <version>3.2.0.3</version>  <dependencies> @@ -515,9 +513,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.3</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.3</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url> </scm>  @@ -577,34 +575,28 @@ <phase>verify</phase> <configuration> <tasks> - <mkdir dir="${jnlp.build.directory}"/> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> + <mkdir dir="${jnlp.build.directory}" /> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> <filterset> - <filter token="lib-javahelp" value="javahelp-2.0.02.jar"/> - <filter token="lib-activation" value="activation-1.1.jar"/> - <filter token="lib-mail" value="mail-1.4.jar"/> - <filter token="url" value="${jnlpCodebase}"/> + <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> + <filter token="lib-activation" value="activation-1.1.jar" /> + <filter token="lib-mail" value="mail-1.4.jar" /> + <filter token="url" value="${jnlpCodebase}" /> </filterset> </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> + <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${jnlpCodebase}"/> + <filter token="lib" value="jxlayer-3.0.1.jar" /> + <filter token="url" value="${jnlpCodebase}" /> </filterset> </copy> - <copy verbose="${maven.verbose}" - todir="${jnlp.build.directory}/lib" - failonerror="false"> + <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> <fileset dir="${project.build.directory}/lib"> - <include name="javahelp-2.0.02.jar"/> - <include name="activation-1.1.jar"/> - <include name="mail-1.4.jar"/> - <include name="jxlayer-3.0.1.jar"/> + <include name="javahelp-2.0.02.jar" /> + <include name="activation-1.1.jar" /> + <include name="mail-1.4.jar" /> + <include name="jxlayer-3.0.1.jar" /> </fileset> </copy> </tasks> @@ -619,15 +611,14 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" - failonerror="false" overwrite="false"> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> <fileset dir="${jnlp.build.directory}"> - <include name="**"/> + <include name="**" /> </fileset>  <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip"/> + <include name="${project.build.finalName}-bin.zip" /> </fileset> </copy> @@ -675,17 +666,17 @@ <sign> <keystore>${keystorepath}</keystore> - <keypass/> + <keypass /> <storepass>${keystorepass}</storepass> - <storetype/> + <storetype /> <alias>${keystorealias}</alias> - <validity/> - <dnameCn/> - <dnameOu/> - <dnameO/> - <dnameL/> - <dnameSt/> - <dnameC/> + <validity /> + <dnameCn /> + <dnameOu /> + <dnameO /> + <dnameL /> + <dnameSt /> + <dnameC /> <verify>true</verify> <keystoreConfig> <delete>false</delete>

1 0

r1848 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by tchemit＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: tchemit Date: 2009-02-20 15:13:24 +0000 (Fri, 20 Feb 2009) New Revision: 1848 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: load simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-20 15:04:28 UTC (rev 1847) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-20 15:13:24 UTC (rev 1848) @@ -124,14 +124,19 @@ getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); } protected void loadOldSimulation(){ - String selected = fieldSimulParamsSelect.getSelectedItem().toString(); + final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut - if (selected != null && !selected.equals(" ")){ - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.old.simulation")); - getContextValue(SimulAction.class).loadOldSimulation(selected); - refresh(); - root.setInfoText(_("isisfish.message.old.simulation.loaded")); + if (selected != null && !selected.equals(" ")){ + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.loading.old.simulation")); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + getContextValue(SimulAction.class).loadOldSimulation(selected); + refresh(); + getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.old.simulation.loaded")); + } + }); + } } protected void addRules(){

1 0

r1847 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: chatellier Date: 2009-02-20 15:04:28 +0000 (Fri, 20 Feb 2009) New Revision: 1847 Modified: 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: Change dates 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-02-20 14:51:32 UTC (rev 1846) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-02-20 15:04:28 UTC (rev 1847) @@ -67,7 +67,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2008.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=advanced Parameters 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-02-20 14:51:32 UTC (rev 1846) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-02-20 15:04:28 UTC (rev 1847) @@ -67,7 +67,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2008.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright IFREMER-MAERHA 2000-2009.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s

1 0

r1846 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: tchemit Date: 2009-02-20 14:51:32 +0000 (Fri, 20 Feb 2009) New Revision: 1846 Modified: isis-fish/trunk/pom.xml Log: passage versions stables + zeroConf sur nos plugins Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-20 14:07:08 UTC (rev 1845) +++ isis-fish/trunk/pom.xml 2009-02-20 14:51:32 UTC (rev 1846) @@ -342,9 +342,9 @@ <labs.project>isis-fish</labs.project>  - <jaxx.version>1.1-SNAPSHOT</jaxx.version> - <topia.version>2.1.3-SNAPSHOT</topia.version> - <topia.service.version>1.0.2-SNAPSHOT</topia.service.version> + <jaxx.version>1.1</jaxx.version> + <topia.version>2.1.3</topia.version> + <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.2</lutinmatrix.version> <lutinutil.version>1.0.3</lutinutil.version> <i18n.version>0.9</i18n.version> @@ -469,12 +469,8 @@ <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> <version>${jrst.version}</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> + <configuration> <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -493,9 +489,6 @@ <id>copy-dependencies</id> </execution> </executions> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> </plugin> </plugins>

1 0

r1845 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: sletellier Date: 2009-02-20 14:07:08 +0000 (Fri, 20 Feb 2009) New Revision: 1845 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/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 Log: Migrations bugs fixed 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-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -39,6 +39,10 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; @@ -67,6 +71,53 @@ } } }); +populationMigrationEmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); + +populationMigrationEmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,10 +127,14 @@ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); + remove.setEnabled(false); + setAddButton(); + + populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override public void matrixChanged(MatrixPanelEvent arg0) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); if (popInfo != null){ popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix()); } @@ -102,7 +157,6 @@ (PopulationGroup) fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationEmigrationCoefficient.getText())); - refresh(); } protected void remove(){ @@ -114,14 +168,27 @@ MatrixND mat = popInfo.getEmigrationMatrix().copy(); mat.setValue(group, departure, 0); - popInfo.setEmigrationMatrix(mat); - + popInfo.setEmigrationMatrix(mat); + remove.setEnabled(false); }catch(Exception eee){ log.error("Can't remove migration", eee); -// return new OutputView("Error.xml", "error", eee.getMessage()); } - refresh(); } + protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem() != null); + setAddButton(); + } + protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationEmigrationCoefficient.getText().equals("")); + setAddButton(); + } + protected void zoneChanged(){ + setZoneDepartSelected(fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem() != null); + setAddButton(); + } + protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide()); + } ]]> </script> <Table id='body'> @@ -130,13 +197,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationEmigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationEmigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationEmigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationEmigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationEmigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -144,7 +211,7 @@ <JLabel text="isisfish.populationMigrationEmigration.departureZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationEmigrationDepartureZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationEmigrationDepartureZoneChooser" enabled='{isActif()}' onActionPerformed='zoneChanged()'/> </cell> <cell columns='2' fill='horizontal' weightx='0.5'> <JPanel/> @@ -157,7 +224,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' matrix='{getPopInfo().getEmigrationMatrix()}' enabled='{isActif()}'/> + <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-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -40,6 +40,10 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; @@ -67,7 +71,40 @@ } } }); - + +populationMigrationImmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationImmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); +populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopInfo() != null){ + getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + } + } +}); + public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,32 +113,25 @@ setBean((PopulationImpl) population); setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopInfo() != null){ - getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); - } - } - }); + remove.setEnabled(false); + setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationGroupChooser, getBean().getPopulationGroup(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true); } } protected void add(){ getContextValue(InputAction.class).addImmigration(getPopInfo(), - (PopulationGroup) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), + (PopulationGroup) fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); - refresh(); } protected void remove(){ int row = populationMigrationImmigrationTable.getTable().getSelectedRow(); @@ -112,8 +142,23 @@ MatrixND mat = getPopInfo().getImmigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); getPopInfo().setImmigrationMatrix(mat); - refresh(); + remove.setEnabled(false); } + protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null); + setAddButton(); + } + protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationImmigrationCoefficient.getText().equals("")); + setAddButton(); + } + protected void zoneChanged(){ + setZoneDepartSelected(fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem() != null); + setAddButton(); + } + protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide()); + } ]]> </script> <Table id='body'> @@ -122,13 +167,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationImmigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationImmigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationImmigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationImmigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationImmigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -136,7 +181,7 @@ <JLabel text="isisfish.populationMigrationImmigration.arrivalZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationImmigrationArrivalZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationImmigrationArrivalZoneChooser" enabled='{isActif()}' onActionPerformed='zoneChanged()'/> </cell> <cell columns='2' fill='horizontal' weightx='0.5'> <JPanel/> @@ -144,17 +189,17 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationImmigrationAdd" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' matrix='{getPopInfo().getImmigrationMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationImmigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> </cell> </row> </Table> 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-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -38,6 +38,11 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='zoneArrivalSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; @@ -66,6 +71,41 @@ } } }); + +populationMigrationMigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationMigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); + +populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopInfo() != null){ + getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + } + } +}); + public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,15 +116,9 @@ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopInfo() != null){ - getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); - } - } - }); + remove.setEnabled(false); + setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ @@ -93,12 +127,12 @@ } protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true); } } protected void add(){ @@ -107,7 +141,6 @@ (Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText())); - refresh(); } protected void remove(){ int row = populationMigrationMigrationTable.getTable().getSelectedRow(); @@ -118,8 +151,27 @@ MatrixND mat = getPopInfo().getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); getPopInfo().setMigrationMatrix(mat); - refresh(); + remove.setEnabled(false); } +protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationMigrationGroupChooser.getSelectedItem() != null); + setAddButton(); +} +protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationMigrationCoefficient.getText().equals("")); + setAddButton(); +} +protected void zoneDepartueChanged(){ + setZoneDepartSelected(fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem() != null); + setAddButton(); +} +protected void zoneArrivalChanged(){ + setZoneArrivalSelected(fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem() != null); + setAddButton(); +} +protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getZoneArrivalSelected() && getCoefNonVide()); +} ]]> </script> <Table id='body'> @@ -128,13 +180,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationMigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationMigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationMigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -142,28 +194,28 @@ <JLabel text="isisfish.populationMigrationMigration.departureZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationDepartureZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationDepartureZoneChooser" enabled='{isActif()}' onActionPerformed='zoneDepartueChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationMigration.arrivalZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationArrivalZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationArrivalZoneChooser" enabled='{isActif()}' onActionPerformed='zoneArrivalChanged()'/> </cell> </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationMigrationAdd" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' matrix='{getPopInfo().getMigrationMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> </cell> </row> </Table> 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-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -54,6 +54,7 @@ // remove previous binding on getBean() //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationMigrationComment.setText(""); + fieldUseEquationMigration.setSelected(false); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -71,6 +72,7 @@ if (getBean() != null){ setFieldPopulationMigrationSeasonChooserModel(); } + useEquationChanged(); } protected void seasonChanged(){ setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo()); @@ -81,6 +83,7 @@ populationMigrationImmigrationUI.init(getPopInfo()); populationMigrationEmigrationUI.init(getPopInfo()); } + useEquationChanged(); } protected void setFieldPopulationMigrationSeasonChooserModel(){ DefaultComboBoxModel model = new DefaultComboBoxModel();

1 0

r1844 - isis-fish/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: chatellier Date: 2009-02-20 11:38:14 +0000 (Fri, 20 Feb 2009) New Revision: 1844 Modified: isis-fish/trunk/src/site/site_en.xml isis-fish/trunk/src/site/site_fr.xml Log: Update lutin skin version Modified: isis-fish/trunk/src/site/site_en.xml =================================================================== --- isis-fish/trunk/src/site/site_en.xml 2009-02-20 11:10:55 UTC (rev 1843) +++ isis-fish/trunk/src/site/site_en.xml 2009-02-20 11:38:14 UTC (rev 1844) @@ -2,10 +2,10 @@ <project name="Isis-fish"> <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> <bannerLeft> <name>Isis-fish Simulator</name> Modified: isis-fish/trunk/src/site/site_fr.xml =================================================================== --- isis-fish/trunk/src/site/site_fr.xml 2009-02-20 11:10:55 UTC (rev 1843) +++ isis-fish/trunk/src/site/site_fr.xml 2009-02-20 11:38:14 UTC (rev 1844) @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="Isis-fish"> - + + <publishDate format="dd/MM/yyyy"/> + <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> <bannerLeft> <name>Isis-fish Simulateur de pêcherie complexe</name>

1 0

r1843 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: sletellier Date: 2009-02-20 11:10:55 +0000 (Fri, 20 Feb 2009) New Revision: 1843 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx Log: Create population bug fixed 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-02-20 09:10:15 UTC (rev 1842) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-02-20 11:10:55 UTC (rev 1843) @@ -135,11 +135,13 @@ } protected void create(){ Species species = getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getNavigationPath()); + if (species == null){ + species = getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getParent().getNavigationPath()); + } + TopiaEntity topia = getContextValue(InputAction.class).createPopulation(getVerifier().getIsisContext(), species); - getParentContainer(InputUI.class).setTreeModel(); getParentContainer(InputUI.class).setTreeSelection("$root/$species/"+ species.getTopiaId() +"/$populations/"+topia.getTopiaId()); - setInfoText(_("isisfish.message.creation.finished")); } ]]>

1 0

r1842 - isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org Feb. 20, 2009

Feb. 20, 2009

Author: chatellier Date: 2009-02-20 09:10:15 +0000 (Fri, 20 Feb 2009) New Revision: 1842 Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml Log: Update generated mapping Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-02-19 11:43:22 UTC (rev 1841) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-02-20 09:10:15 UTC (rev 1842) @@ -68,6 +68,6 @@ <key column="population"/> <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="recruitmentZone" node="topiaId"/> </bag> - <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" unique="true" node="maturityGroup/@topiaId" embed-xml="false" /> + <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" node="maturityGroup/@topiaId" embed-xml="false" /> </class> </hibernate-mapping>

1 0

r1841 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 19, 2009

Feb. 19, 2009

Author: sletellier Date: 2009-02-19 11:43:22 +0000 (Thu, 19 Feb 2009) New Revision: 1841 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/InputOneEquationUI.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/PopulationBasicsUI.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/PopulationMigrationEquationUI.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/SetOfVesselsTabsUI.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 Log: Add first JComboBox Item null 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -70,6 +70,14 @@ getVerifier().setDeleteButton(remove); Gear gear = getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); + java.util.List<Object> values = new ArrayList<Object>(); + for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()) + values.add(value); + if (getBean() != null){ + if (values != null){ + jaxx.runtime.swing.Utils.fillComboBox(fieldGearParamType, values, getBean().getParameterName(), true); + } + } } ]]> </script> @@ -114,7 +122,7 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldGearParamType" model='{new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())}' onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> + <JComboBox id="fieldGearParamType" onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -158,6 +158,7 @@ java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name); if (formules != null){ java.util.List<Item> items = new ArrayList<Item>(); + items.add(new Item("null", " ", null, false)); for (Formule f : formules) { boolean selected = f.equals(selectedEquation); items.add(new Item(f.getName(), f.getName(), f, selected)); @@ -183,6 +184,13 @@ if (getFormule() != null){ editor.setText(getFormule().getContent()); } + else { + try { + editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + } catch (IOException ex) { + Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); + } + } } ]]> </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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -167,6 +167,7 @@ protected void setCombo(){ java.util.List<Item> items = new ArrayList<Item>(); java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo(); + items.add(new Item("null", " ", null, false)); if (metierSeasonInfoList != null){ for (MetierSeasonInfo m : metierSeasonInfoList){ items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, false)); 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -54,7 +54,7 @@ try { if (getBean() != null){ init = true; - jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear()); + jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(),true); init = false; } } catch (Exception ex) { 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -83,7 +83,7 @@ growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class); if (getBean() != null){ if (getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup()); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); } setTableAgeLengthModel(); } 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -81,7 +81,7 @@ setBean((PopulationImpl) population); if (getBean() != null){ if (getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true); } } } 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -88,12 +88,12 @@ } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null, true); } } protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true); } } protected void add(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -70,7 +70,7 @@ migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class); emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class); immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(), "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class); - getVerifier().addCurrentPanel(migrationEquation, emigrationEquation, immigrationEquation); + getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation); } ]]> </script> 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -38,12 +38,15 @@  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Zone; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,8 +54,6 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -protected PopulationSeasonInfo popInfo = null; - addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -68,7 +69,7 @@ }); public void init(PopulationSeasonInfo pi){ - this.popInfo = pi; + setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ Population population = getVerifier().getEntity(Population.class); @@ -79,27 +80,24 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { - if (popInfo != null){ - popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + if (getPopInfo() != null){ + getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); } } }); - if (popInfo != null){ - populationMigrationImmigrationTable.setMatrix(popInfo.getMigrationMatrix()); - } } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true); } } protected void add(){ - getContextValue(InputAction.class).addImmigration(popInfo, + getContextValue(InputAction.class).addImmigration(getPopInfo(), (PopulationGroup) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); @@ -111,9 +109,9 @@ Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1); Object arrival = populationMigrationImmigrationTable.getTable().getValueAt(row, 2); - MatrixND mat = popInfo.getImmigrationMatrix().copy(); + MatrixND mat = getPopInfo().getImmigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); - popInfo.setImmigrationMatrix(mat); + getPopInfo().setImmigrationMatrix(mat); refresh(); } ]]> @@ -151,7 +149,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' matrix='{getPopInfo().getImmigrationMatrix()}' 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -36,9 +36,12 @@  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.entities.PopulationGroup; @@ -50,9 +53,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -protected PopulationSeasonInfo popInfo = null; -protected PopulationSeasonInfo pi; - addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -67,10 +67,9 @@ } }); public void init(PopulationSeasonInfo pi){ - this.pi = pi; + setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ - popInfo = pi; Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -81,32 +80,29 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { - if (popInfo != null){ - popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + if (getPopInfo() != null){ + getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); } } }); - if (popInfo != null){ - populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatrix()); - } } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null, true); } } protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); } } protected void add(){ - getAction().addMigration(popInfo, + getAction().addMigration(getPopInfo(), (PopulationGroup) fieldPopulationMigrationMigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(), @@ -119,9 +115,9 @@ Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1); Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2); - MatrixND mat = popInfo.getMigrationMatrix().copy(); + MatrixND mat = getPopInfo().getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); - popInfo.setMigrationMatrix(mat); + getPopInfo().setMigrationMatrix(mat); refresh(); } ]]> @@ -162,7 +158,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' matrix='{getPopInfo().getMigrationMatrix()}' 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -36,9 +36,12 @@  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; @@ -68,19 +71,21 @@ if (getBean() != null){ setFieldPopulationMigrationSeasonChooserModel(); } - PopulationSeasonInfo selected = getPopulationSeasonInfo(); - if (selected != null){ - fieldUseEquationMigration.setSelected(selected.getUseEquationMigration()); - useEquationChanged(); - populationMigrationEquationUI.init(selected); - populationMigrationMigrationUI.init(selected); - populationMigrationImmigrationUI.init(selected); - populationMigrationEmigrationUI.init(selected); +} +protected void seasonChanged(){ + setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo()); + if (getPopInfo() != null){ + getVerifier().addCurrentEntity(getPopInfo()); + populationMigrationEquationUI.init(getPopInfo()); + populationMigrationMigrationUI.init(getPopInfo()); + populationMigrationImmigrationUI.init(getPopInfo()); + populationMigrationEmigrationUI.init(getPopInfo()); } } protected void setFieldPopulationMigrationSeasonChooserModel(){ DefaultComboBoxModel model = new DefaultComboBoxModel(); if (getBean().getPopulationSeasonInfo() != null){ + model.addElement(new GenericCell(" ", null, PopulationSeasonInfo.class)); for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){ model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class)); } @@ -99,6 +104,8 @@ return result; } protected void useEquationChanged(){ + if (getPopInfo() != null) + getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected()); if (fieldUseEquationMigration.isSelected()){ ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation"); } @@ -114,12 +121,12 @@ <JLabel text="isisfish.populationMigration.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationMigrationSeasonChooser" onActionPerformed='refresh()' enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationSeasonChooser" onActionPerformed='seasonChanged()' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" selected='true' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/> + <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/> </cell> </row> <row> 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -66,7 +66,7 @@ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); + reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationReproductionEquation.class); getVerifier().addCurrentPanel(reproductionEquation); } ]]> 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -153,7 +153,7 @@ } protected void setCombo(){ if (getBean() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null, true); } } protected void seasonGroupChanged(){ 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -72,8 +72,8 @@ setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ init = true; - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort()); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType()); + jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true); + jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true); init=false; technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); getVerifier().addCurrentPanel(technicalEfficiency); 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -93,7 +93,7 @@ for (ActionListener listener : listeners){ fieldStrategyMonthInfoTripType.removeActionListener(listener); } - jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); + jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true); for (ActionListener listener : listeners){ fieldStrategyMonthInfoTripType.addActionListener(listener); } 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-02-19 11:01:06 UTC (rev 1840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-02-19 11:43:22 UTC (rev 1841) @@ -83,7 +83,7 @@ for (ActionListener listener : listeners){ fieldStrategySetOfVessels.removeActionListener(listener); } - jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels()); + jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels(), true); for (ActionListener listener : listeners){ fieldStrategySetOfVessels.addActionListener(listener); }

1 0

r1840 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: . factors
by chatellier＠users.labs.libre-entreprise.org Feb. 19, 2009

Feb. 19, 2009

Author: chatellier Date: 2009-02-19 11:01:06 +0000 (Thu, 19 Feb 2009) New Revision: 1840 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DesignPlan.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Scenario.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/StatisticsCalculator.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/package-info.java Log: AJout des classes et interfaces permettant de g?\195?\169rer les facteurs de simulation. Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DesignPlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DesignPlan.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DesignPlan.java 2009-02-19 11:01:06 UTC (rev 1840) @@ -0,0 +1,70 @@ +/* *##% + * 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.factors; + +import java.io.Serializable; +import java.util.List; + +/** + * Design plan contenant toutes les + * valeur de facteur possible. + * + * @param <E> type des valeurs gérées par le plan + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 19 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class DesignPlan<E extends Serializable> implements Serializable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 977975461743758075L; + + /** Liste des facteurs a utiliser */ + protected List<Factor<E>> factors; + + /** + * Constructor. + */ + public DesignPlan() { + + } + + /** + * Get factors list. + * + * @return factors list + */ + public List<Factor<E>> getFactors() { + return factors; + } + + /** + * Set factors list. + * + * @param factors the factors list to set + */ + public void setFactors(List<Factor<E>> factors) { + this.factors = factors; + } + + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Factor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Factor.java 2009-02-19 11:01:06 UTC (rev 1840) @@ -0,0 +1,104 @@ +/* *##% + * 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.factors; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * Facteur de variation des parametres de simulation. + * + * @param <E> type des valeurs gérées par le facteur + * + * La classe doit être {@link Serializable} avec ses valeurs + * pour permettre l'export XML. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 19 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class Factor<E extends Serializable> implements Serializable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1643804268013964453L; + + /** + * Nom du facteur. + */ + protected String name; + + /** + * Domain du facteur. + * + * Ensemble des valeurs possibles a prendre en compte. + * La clé est un label qui permet d'identifier la valeur. + * + * Le domain peut etre : + * - discret : i.e un ensemble de valeurs + * - continu : i.e, une borne min, max + * + * FIXME min et max pour un domain continu ? + * FIXME domain.size() = 2 ? + */ + protected Map<String, E> domain; + + /** + * Label de la valeur par defaut. + * + * Utilisation différente suivant le cas : + * - avant envoie vers R : valeur par défaut + * - apres, valeur a prendre en compte + */ + protected String valueLabel; + + /** + * Path permettant d'identifier l'objet et + * la propriete de l'objet a mettre a jour. + * + * Par exemple: + * topiaID#gear + * aura pour effet de recuperer l'objet correspondant + * au topiaID fournit et d'appeler le propriete + * <tt>setGear(value)</tt> dessus. + */ + protected String path; + + /** + * Constructor. + * + * Protected, name is mandatory. + */ + protected Factor() { + // impl must be Serializable + domain = new HashMap<String, E>(); + } + + /** + * Constructor with name. + * + * @param name factor name + */ + public Factor(String name) { + this(); + this.name = name; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Scenario.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Scenario.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/Scenario.java 2009-02-19 11:01:06 UTC (rev 1840) @@ -0,0 +1,76 @@ +/* *##% + * 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.factors; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * Scenario d'execution de simulation. + * + * @param <E> type des valeurs gérées par le scenario + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 19 févr. 2009 $ + * By : $Author: chatellier $ + */ +public class Scenario<E extends Serializable> implements Serializable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4953721873692486687L; + + /** + * Ensemble des simulations a executer. + * + * Chaque simulation a un nom, et une liste de facteur. + * + * Chaque facteur a la {@link fr.ifremer.isisfish.simulator.factors.Factor#valueLabel} + * a prendre en compte pour la simulation. + */ + protected Map<String, List<Factor<E>>> simulationsFactors; + + /** + * Constructeur. + */ + public Scenario() { + + } + + /** + * Get simulation Factors. + * + * @return the simulations + */ + public Map<String, List<Factor<E>>> getSimulationsFactors() { + return simulationsFactors; + } + + /** + * Set simulation factors. + * + * @param simulationsFactors the simulations factors to set + */ + public void setSimulationsFactors(Map<String, List<Factor<E>>> simulationsFactors) { + this.simulationsFactors = simulationsFactors; + } + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/StatisticsCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/StatisticsCalculator.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/StatisticsCalculator.java 2009-02-19 11:01:06 UTC (rev 1840) @@ -0,0 +1,54 @@ +/* *##% + * 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.factors; + +import java.io.Serializable; + +/** + * Interface vers le calculateur statistique. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 19 févr. 2009 $ + * By : $Author: chatellier $ + */ +public interface StatisticsCalculator { + + /** + * Envoi un plan a faire analyser par l'outils + * statistique. + + * @param plan plan a analyser + * @param <E> type des données du scenario et du plan + * + * @return un Scenario + * @see DesignPlan + * @see Scenario + */ + <E extends Serializable> Scenario<E> getScenario(DesignPlan<E> plan); + + /** + * Ajoute un paramètre pour l'outils statistique. + * + * @param key nom du parametre + * @param value valeur du parametre + */ + void setParameter(String key, String value); +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/package-info.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/package-info.java 2009-02-19 11:01:06 UTC (rev 1840) @@ -0,0 +1,12 @@ +/** + * Factors. + * + * Ce package contient les données {@link java.io.Serializable} + * permettant de representer des Facteur de variation à appliquer + * sur les simulations. + * + * Il contient l'interface permettant d'appeler un outils statistique + * comme R (http://www.r-project.org/) ou autre. + */ +package fr.ifremer.isisfish.simulator.factors; +

1 0