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

r2390 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 10:45:44 +0000 (Tue, 16 Jun 2009) New Revision: 2390 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Forgot fr translation. 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-06-16 10:39:31 UTC (rev 2389) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-16 10:45:44 UTC (rev 2390) @@ -1087,7 +1087,7 @@ isisfish.wizardGroupCreation.selectGroupLengthType=Choisir la longueur du groupe isisfish.wizardGroupCreation.timeStep=Pas de temps (en mois) isisfish.wizardGroupCreation.title=Cr\u00E9ation du groupe -isisfish.wizardGroupCreation.undefinedGrowthEquation=The equation used is the population's growth curve, it needs to be defined first. +isisfish.wizardGroupCreation.undefinedGrowthEquation=L'\u00E9quation utilis\u00E9e est la courbe de croissance de la population. Elle doit \u00EAtre pr\u00E9alablement d\u00E9finie. isisfish.zone.cells=cellules de la Zone isisfish.zone.comments=Commentaires isisfish.zone.name=Nom

1 0

r2388 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 09:21:16 +0000 (Tue, 16 Jun 2009) New Revision: 2388 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Remove binding on potentially uninitialized things 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-06-16 09:04:25 UTC (rev 2387) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-16 09:21:16 UTC (rev 2388) @@ -154,8 +154,9 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' - matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"' /> +  </cell> </row> <row>

2 1

r2387 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 09:04:25 +0000 (Tue, 16 Jun 2009) New Revision: 2387 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Log: Initialise la matric de changement de groupe si erreur Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-16 09:03:59 UTC (rev 2386) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-16 09:04:25 UTC (rev 2387) @@ -49,6 +49,25 @@ } }; +addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + matrixPanelPopulationSeasonLengthChange.setMatrix(null); + } + if (evt.getNewValue() != null) { + try { + matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); + } + catch(Exception e) { + // an exception can happen if lengthChange matrix has never + // been initialized + computeMatrixChangeOfGroup(); + matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); + } + } + } +}); + @Override public void refresh() { // TODO add only once @@ -148,11 +167,11 @@ <Panel/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='matrixPanelPopulationSeasonLengthChange' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='matrixPanelPopulationSeasonLengthChange' enabled='{isPopSeasonInfoNotNull()}' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' visible='{isAgeGroupType()}' decorator='boxed' /> +  </cell> </row> </Table>

1 0

r2386 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 09:03:59 +0000 (Tue, 16 Jun 2009) New Revision: 2386 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Comment can be null. 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-06-16 09:03:12 UTC (rev 2385) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-16 09:03:59 UTC (rev 2386) @@ -207,7 +207,7 @@ } } -protected void seasonChanged(ActionEvent event) { +protected void seasonChanged() { init = true; PopulationSeasonInfo seasonInfoSelected = (PopulationSeasonInfo)fieldPopulationSeasonInfoChooser.getSelectedItem(); if (log.isDebugEnabled()) { @@ -245,7 +245,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldPopulationSeasonInfoChooser" - onActionPerformed='seasonChanged(event)' + onActionPerformed='seasonChanged()' enabled='{isActif()}'/> </cell> </row> @@ -290,7 +290,7 @@ visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.2'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}' enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}'

1 0

r2385 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 09:03:12 +0000 (Tue, 16 Jun 2009) New Revision: 2385 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx Log: Comment can be null. 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-06-16 07:52:25 UTC (rev 2384) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-16 09:03:12 UTC (rev 2385) @@ -161,7 +161,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='{getBean().getMigrationComment()}' +  + <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane>

1 0

r2384 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 07:52:25 +0000 (Tue, 16 Jun 2009) New Revision: 2384 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx Log: Comment can be null 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-06-16 07:46:23 UTC (rev 2383) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-16 07:52:25 UTC (rev 2384) @@ -138,7 +138,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='{getBean().getRecruitmentComment()}' +  + <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane>

1 0

r2383 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 07:46:23 +0000 (Tue, 16 Jun 2009) New Revision: 2383 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: NaturalDeathRate matrix can be no defined yet. 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-06-16 07:45:55 UTC (rev 2382) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-16 07:46:23 UTC (rev 2383) @@ -80,12 +80,21 @@ } protected void setNaturalDeathRateMatrix() { - Population population = getBean(); - AbstractMatrixND naturalDeathRateMatrix = (AbstractMatrixND)population.getNaturalDeathRateMatrix(); + + try { + Population population = getBean(); + AbstractMatrixND naturalDeathRateMatrix = (AbstractMatrixND)population.getNaturalDeathRateMatrix(); - // TODO what is this code for ??? - MatrixND naturalDeathRateMatrix2 = naturalDeathRateMatrix.getSubMatrixOnSemantic(0, getPopulationGroup()); - fieldPopulationGroupNaturalDeathRate.setMatrix(naturalDeathRateMatrix2.copy()); + // extract only line for this population group + MatrixND naturalDeathRateMatrix2 = naturalDeathRateMatrix.getSubMatrixOnSemantic(0, getPopulationGroup()); + fieldPopulationGroupNaturalDeathRate.setMatrix(naturalDeathRateMatrix2.copy()); + } catch (Exception e) { + // can happen if population has no zone yet + // TODO maybe display a message + if (log.isWarnEnabled()) { + log.warn("No zone defined for this population group", e); + } + } } /**

1 0

r2382 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 07:45:55 +0000 (Tue, 16 Jun 2009) New Revision: 2382 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Comment can be null 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-06-16 07:27:39 UTC (rev 2381) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-16 07:45:55 UTC (rev 2382) @@ -303,7 +303,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.1'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{getBean().getSeasonsComment()}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> +  + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row>

1 0

r2381 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 16 Jun '09

16 Jun '09

Author: chatellier Date: 2009-06-16 07:27:39 +0000 (Tue, 16 Jun 2009) New Revision: 2381 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: Corrections des traductions "populationgroup" 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-06-15 16:38:43 UTC (rev 2380) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-16 07:27:39 UTC (rev 2381) @@ -701,7 +701,7 @@ isisfish.populationBasics.maturityGroup=Maturity group isisfish.populationBasics.name=Name isisfish.populationBasics.numberGroup=Number of group -isisfish.populationBasics.plusGroup=plusGroup +isisfish.populationBasics.plusGroup=Plus group isisfish.populationBasics.recreateClasses=Recreate classes isisfish.populationBasics.title=Population input isisfish.populationCapturability.comments=Comments 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-06-15 16:38:43 UTC (rev 2380) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-16 07:27:39 UTC (rev 2381) @@ -701,8 +701,8 @@ isisfish.populationBasics.maturityGroup=Groupe de maturit\u00E9 isisfish.populationBasics.name=Nom isisfish.populationBasics.numberGroup=Nombre de groupes -isisfish.populationBasics.plusGroup=plusGroup -isisfish.populationBasics.recreateClasses=Recruter les classes +isisfish.populationBasics.plusGroup=Groupe plus +isisfish.populationBasics.recreateClasses=Reconstruire les groupes isisfish.populationBasics.title=Saisie des populations isisfish.populationCapturability.comments=Commentaires isisfish.populationCapturability.selectCoefficient=S\u00E9lectionnez un coefficient par saison et par classe

1 0

r2380 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Jun '09

15 Jun '09

Author: chatellier Date: 2009-06-15 16:38:43 +0000 (Mon, 15 Jun 2009) New Revision: 2380 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties Log: Oubli de traduction 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-06-15 16:37:09 UTC (rev 2379) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-15 16:38:43 UTC (rev 2380) @@ -242,7 +242,7 @@ isisfish.error.change.classloader=Can't change classloader because can't create URL from file %1$s isisfish.error.change.equation=Can't change equation isisfish.error.check.region= -isisfish.error.compile.fileerror=Le fichier %s contient des erreurs \! +isisfish.error.compile.fileerror=File %s can't be compiled \! isisfish.error.compile.script=Can't compile script\: %1$s isisfish.error.compiled.parameter=Can't get rule parameter from compiled class isisfish.error.conversion.data=Erreur lors de la conversion du fichier de donn\u00E9es

1 0