Author: sletellier Date: 2009-03-31 12:21:43 +0000 (Tue, 31 Mar 2009) New Revision: 2052 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.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: Adding message box Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-31 12:21:43 UTC (rev 2052) @@ -18,13 +18,18 @@ package fr.ifremer.isisfish.ui.sensitivity; +import static org.codelutin.i18n.I18n._; + import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.ui.simulator.SimulAction; +import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixND; @@ -63,7 +68,15 @@ List<EquationContinuousDomain> domains = equationPanel.getDomains(); for (EquationContinuousDomain domain : domains) { - action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); + if (domain.getCoefficient() != null && domain.getCoefficient() == 1){ + JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.coefValueIsOne")); + } + else if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() > 1 && domain.getOperator() != null && domain.getVariableName() != null ){ + action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); + } + else { + JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.invalid")); + } } } catch (Exception ex) { if (log.isErrorEnabled()) { 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-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-31 12:21:43 UTC (rev 2052) @@ -243,6 +243,8 @@ isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script +isisfish.error.factor.coefValueIsOne=Coefficient can't be equal to 1 +isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population @@ -318,6 +320,7 @@ isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=Can't delete file %1$s for reason %2$s +isisfish.error.script.evaluate= isisfish.error.script.import=Can't import file for reason %1$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s 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-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-31 12:21:43 UTC (rev 2052) @@ -243,6 +243,8 @@ isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script +isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1 +isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population @@ -318,6 +320,7 @@ isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s +isisfish.error.script.evaluate= isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s