Author: chatellier Date: 2009-06-02 08:50:14 +0000 (Tue, 02 Jun 2009) New Revision: 2297 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.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: Fix doc, variables names and javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -72,7 +72,6 @@ import fr.ifremer.isisfish.vcs.VCSActionEvent; import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; -import fr.ifremer.isisfish.vcs.VCSNone; import fr.ifremer.isisfish.vcs.VetoableActionListener; /** @@ -286,7 +285,6 @@ * à l'utilisateur. * * @param msg msg to show - * @return true if user confirm question */ protected static void warn(String msg) { JOptionPane.showMessageDialog(null, msg, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -3,8 +3,8 @@ * * Contains two aspects : * <ul> - * <li>{@link Cache} : cache aspect</li> - * <li>{@link Trace} : trace expect</li> + * <li>{@link fr.ifremer.isisfish.aspect.Cache} : cache aspect</li> + * <li>{@link fr.ifremer.isisfish.aspect.Trace} : trace expect</li> * </ul> */ package fr.ifremer.isisfish.aspect; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2005 Code Lutin, Cédric Pineau, + * Copyright (C) 2002-2009 Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -33,34 +33,26 @@ import static org.codelutin.i18n.I18n._; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Properties; import java.util.Set; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixIterator; import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.util.ArrayUtil; import org.codelutin.util.HashList; -import org.codelutin.util.VersionNumberUtil; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.ActiveRule; import fr.ifremer.isisfish.entities.ActiveRuleDAO; import fr.ifremer.isisfish.entities.Population; @@ -100,7 +92,7 @@ /** * Les ResultStorage ne doivent pas etre instancier directement, mais * recuperer a partir d'un - * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultManager} + * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} */ public ResultStorage(SimulationStorage simulation) { this.simulation = simulation; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -18,21 +18,12 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; - -import org.codelutin.math.matrix.MapFunction; - -import fr.ifremer.isisfish.entities.Equation; - /** * Domaine continu portant sur variable pouvant prendre diférente valeur par * rapport à une valeur initiale. * * Composé d'un borne min et max et d'un opération. * - * @param <E> - * type des valeurs gérées par le domaine - * * @author chatellier * @version $Revision: 1.0 $ * @@ -124,8 +115,7 @@ /** * Set coefficient. * - * @param the - * coefficient to set + * @param coefficient the coefficient to set */ public void setCoefficient(Double coefficient) { this.coefficient = coefficient; @@ -143,8 +133,7 @@ /** * Set reference value. * - * @param the - * reference value.to set + * @param referenceValue the reference value.to set */ public void setReferenceValue(Double referenceValue) { this.referenceValue = referenceValue; @@ -176,6 +165,7 @@ * In equation continuous domain, value appear in continuous domain values * only. Here : return identifier. */ + @Override public Double getValueForIdentifier(Double identifier) { this.value = identifier; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -28,9 +28,6 @@ * * Composé d'un borne min et max et d'une matrice. * - * @param <E> - * type des valeurs gérées par le domaine - * * @author chatellier * @version $Revision: 1.0 $ * @@ -135,14 +132,13 @@ } /** - * {@inheritDoc}. - * - * In continuous domain, just return identifier + * In continuous domain, just return identifier. */ public MatrixND getValueForIdentifier(final Serializable identifier) { return getValueForIdentifier((Double)identifier); } - /** + + /** * {@inheritDoc}. * * In continuous domain, just return identifier @@ -197,7 +193,7 @@ this.value = value; } - public MatrixContinuousDomain clone(){ + public MatrixContinuousDomain clone() { MatrixContinuousDomain cloned = new MatrixContinuousDomain(); cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -57,7 +57,7 @@ for (SaveVerifier s : verifiers) { int reponse = s.checkEdit(); - + // return false, if at least one verifier // return cancel option if (reponse == JOptionPane.CANCEL_OPTION) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -132,23 +132,29 @@ @Override public int checkEdit() { - int responce = JOptionPane.NO_OPTION; + int response = JOptionPane.NO_OPTION; if (editable) { if (changed) { // ask user to close edition // still in edit mode, must warn user - responce = askUser(_("isisfish.message.page.modified")); - if (responce == JOptionPane.NO_OPTION) { + response = askUser(_("isisfish.message.page.modified")); + if (response == JOptionPane.NO_OPTION) { topiaCancel(); - } else if (responce == JOptionPane.YES_OPTION) { + } else if (response == JOptionPane.YES_OPTION) { topiaSave(); } } } - return responce; + return response; } - public int askUser(String message) { + /** + * Ask user option to save non saved datas. + * + * @param message message to display + * @return user option + */ + protected int askUser(String message) { int response = JOptionPane.showConfirmDialog(rootUI, message, _("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -173,9 +179,15 @@ setEnabled(currentDeleteButton, editable); } - protected void setEnabled(JButton b, boolean enabled) { - if (b != null) { - b.setEnabled(enabled); + /** + * Set component enabled state. + * + * @param c component + * @param enabled enabled state + */ + protected void setEnabled(Component c, boolean enabled) { + if (c != null) { + c.setEnabled(enabled); } } 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-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-02 08:50:14 UTC (rev 2297) @@ -234,7 +234,7 @@ isisfish.equation.editor.title=Equation Editor isisfish.error.acceptable.population=New value isn't acceptable value for this population isisfish.error.add.card=Error while adding of result to the map. -isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation +isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.result.data=Error while adding result ot data. isisfish.error.add.result.graph=Error while adding result to graph isisfish.error.add.tray=Can't add system tray icon @@ -266,6 +266,7 @@ isisfish.error.empty.unit=measure unit is empty isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist @@ -619,8 +620,7 @@ isisfish.message.setting.trace.aspects=Setting Trace aspects isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution -isisfish.message.simulation.prepare=Preparing simulation -isisfish.message.spacialized.visualisation= +isisfish.message.simulation.prepare= isisfish.message.tray.disabled=SystemTray disabled isisfish.message.update.finished=update finished isisfish.metier.comments=Comments @@ -753,6 +753,7 @@ isisfish.populationSeasons.selectSeason=Select a season isisfish.populationSeasons.showSpacialized=Show the spacialized isisfish.populationSeasons.spacialized=Spacialized +isisfish.populationSeasons.spacialized.visualisation=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas 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-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-02 08:50:14 UTC (rev 2297) @@ -232,9 +232,9 @@ isisfish.effortDescription.toString=EffortDescription for %1$s with %2$s isisfish.effortDescription.unitCostOfFishing=Co\u00FBt unitaire de la p\u00EAche isisfish.equation.editor.title=Editeur d'\u00E9quation -isisfish.error.acceptable.population=La\t nouvelle valeur n'est pas une valeur valide pour cette population +isisfish.error.acceptable.population=La nouvelle valeur n'est pas une valeur valide pour cette population isisfish.error.add.card=Erreur lors de l'ajout du r\u00E9sultat \u00E0 la carte. -isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation +isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data. isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph. isisfish.error.add.tray=Impossible d'ajouter une icone de notification @@ -266,6 +266,7 @@ isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist @@ -603,7 +604,7 @@ isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ? isisfish.message.presimulation.script.execution=Ex\u00E9cution des scripts de Presimulation -isisfish.message.recruitment.number.month=Input the number of month of recruitment +isisfish.message.recruitment.number.month=Entrez le nombre de mois de recrutement isisfish.message.region.commited=R\u00E9gion commit\u00E9e isisfish.message.region.loaded=R\u00E9gion charg\u00E9e isisfish.message.region.remove.canceled=Suppression de r\u00E9gion annul\u00E9 @@ -620,7 +621,6 @@ isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation -isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e isisfish.metier.comments=Commentaires @@ -753,6 +753,7 @@ isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison isisfish.populationSeasons.showSpacialized=Voir les coefficients spatialis\u00E9s isisfish.populationSeasons.spacialized=spatialis\u00E9 +isisfish.populationSeasons.spacialized.visualisation=Coefficients spatialis\u00E9s isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones de reproduction et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations