Author: echatellier Date: 2014-06-16 12:04:32 +0200 (Mon, 16 Jun 2014) New Revision: 39 Url: http://forge.codelutin.com/projects/isis-fish-community/repository/revisions... Log: Remove use of i18n Modified: trunk/exports/BiomasseFeconde.java trunk/exports/MortalitePecheGroupe.java trunk/exports/MortalitePecheTotale.java trunk/rules/GraviteVPUE1_Ponderation.java trunk/rules/HCR_transition_MSY.java trunk/rules/Ogive_de_Tri_Merlu.java trunk/rules/TACpoids20012011.java trunk/rules/TACpoids20012011OgiveTriMerlu.java trunk/rules/TACpoids20012011TailleMin.java trunk/rules/TACpoidsPop.java trunk/rules/TACpoidsPop20082011.java trunk/rules/TACpoidsPop_PourHCR.java trunk/rules/TACpoidsTailleMin.java trunk/sensitivityexports/SensitivityBiomassJanvierY3.java trunk/sensitivityexports/SensitivityBiomassRelativeJanvierY6.java trunk/sensitivityexports/SensitivitySpawningBiomassJanvierY2.java trunk/sensitivityexports/SensitivitySpawningBiomassRelativeJanvierY5.java trunk/sensitivityexports/SensitivityTotalFishingMortalityY1.java trunk/sensitivityexports/SensitivityTotalFishingMortalityY2.java Modified: trunk/exports/BiomasseFeconde.java =================================================================== --- trunk/exports/BiomasseFeconde.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/exports/BiomasseFeconde.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package exports; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,7 +72,7 @@ @Override public String getDescription() { - return _("Exporte les biomasses fecondes, tableau avec des lignes pop;id;zone;date;nombre"); + return "Exporte les biomasses fecondes, tableau avec des lignes pop;id;zone;date;nombre"; } @Override Modified: trunk/exports/MortalitePecheGroupe.java =================================================================== --- trunk/exports/MortalitePecheGroupe.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/exports/MortalitePecheGroupe.java 2014-06-16 10:04:32 UTC (rev 39) @@ -26,7 +26,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -73,7 +72,7 @@ @Override public String getDescription() { - return _("Exporte la mortalite par peche par groupe et par population de la simulation (Fgroup par an calcule en decembre)"); + return "Exporte la mortalite par peche par groupe et par population de la simulation (Fgroup par an calcule en decembre)"; } @Override Modified: trunk/exports/MortalitePecheTotale.java =================================================================== --- trunk/exports/MortalitePecheTotale.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/exports/MortalitePecheTotale.java 2014-06-16 10:04:32 UTC (rev 39) @@ -26,7 +26,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -73,7 +72,7 @@ @Override public String getDescription() { - return _("Exporte la mortalite par peche totale de la simulation par population (Fpop par an calcule en decembre)"); + return "Exporte la mortalite par peche totale de la simulation par population (Fpop par an calcule en decembre)"; } @Override Modified: trunk/rules/GraviteVPUE1_Ponderation.java =================================================================== --- trunk/rules/GraviteVPUE1_Ponderation.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/GraviteVPUE1_Ponderation.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -95,7 +93,7 @@ */ @Override public String getDescription() throws Exception { - return _("Calcule les proportion par metier chaque mois en fonction de la VPUE du metier l'annee precedante"); + return "Calcule les proportion par metier chaque mois en fonction de la VPUE du metier l'annee precedante"; /*"HYPOTHESES GRAVITE" " attention cette règle doit toujours être mise avant les mesures de gestion"+ " si pour un metier Effort(metier annee-1,mois) = 0 et propinitiale (metier, mois) !=0 (ie metier potentiellement pratique), alors "+ Modified: trunk/rules/HCR_transition_MSY.java =================================================================== --- trunk/rules/HCR_transition_MSY.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/HCR_transition_MSY.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,11 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - -import java.util.HashSet; -import java.util.Set; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; @@ -35,18 +30,10 @@ import scripts.RuleUtil; import scripts.SiMatrix; import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.entities.Zone; // ??????? import fr.ifremer.isisfish.rule.AbstractRule; -import fr.ifremer.isisfish.simulator.MetierMonitor; -import fr.ifremer.isisfish.simulator.PopulationMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.types.Month; @@ -124,7 +111,7 @@ */ @Override public String getDescription() { - return _("Harvest Control Rule simulatinf the transition between a precautionary approach management and a MSY management, for a given populaion"); + return "Harvest Control Rule simulatinf the transition between a precautionary approach management and a MSY management, for a given populaion"; } /** Modified: trunk/rules/Ogive_de_Tri_Merlu.java =================================================================== --- trunk/rules/Ogive_de_Tri_Merlu.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/Ogive_de_Tri_Merlu.java 2014-06-16 10:04:32 UTC (rev 39) @@ -1,7 +1,5 @@ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.List; import java.util.ArrayList; import java.util.Iterator; @@ -89,7 +87,7 @@ */ @Override public String getDescription() throws Exception { - return _("rejet des captures de merlu selon une sigmoide avec prop de survie selon Metier - pecherie Merlu-Langoustine GdG"); + return "rejet des captures de merlu selon une sigmoide avec prop de survie selon Metier - pecherie Merlu-Langoustine GdG"; } /** Modified: trunk/rules/TACpoids20012011.java =================================================================== --- trunk/rules/TACpoids20012011.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoids20012011.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; @@ -129,7 +127,7 @@ */ @Override public String getDescription() { - return _("TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."); + return "TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."; } /** Modified: trunk/rules/TACpoids20012011OgiveTriMerlu.java =================================================================== --- trunk/rules/TACpoids20012011OgiveTriMerlu.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoids20012011OgiveTriMerlu.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; import java.util.List; @@ -142,7 +140,7 @@ */ @Override public String getDescription() { - return _("Combinaison de la regle tac poids sur 2001-2011 avec ogive de tri + prop de survie des rejets."); + return "Combinaison de la regle tac poids sur 2001-2011 avec ogive de tri + prop de survie des rejets."; } /** Modified: trunk/rules/TACpoids20012011TailleMin.java =================================================================== --- trunk/rules/TACpoids20012011TailleMin.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoids20012011TailleMin.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; import java.util.List; @@ -141,7 +139,7 @@ */ @Override public String getDescription() { - return _("Combinaison de la regle tac poids sur 2001-2011 avec tailleMin + prop de survie des rejets."); + return "Combinaison de la regle tac poids sur 2001-2011 avec tailleMin + prop de survie des rejets."; } /** Modified: trunk/rules/TACpoidsPop.java =================================================================== --- trunk/rules/TACpoidsPop.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoidsPop.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; @@ -113,7 +111,7 @@ */ @Override public String getDescription() { - return _("TAC weight in tons per population.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."); + return "TAC weight in tons per population.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."; } /** Modified: trunk/rules/TACpoidsPop20082011.java =================================================================== --- trunk/rules/TACpoidsPop20082011.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoidsPop20082011.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; @@ -112,7 +110,7 @@ */ @Override public String getDescription() { - return _("TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."); + return "TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."; } /** Modified: trunk/rules/TACpoidsPop_PourHCR.java =================================================================== --- trunk/rules/TACpoidsPop_PourHCR.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoidsPop_PourHCR.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; @@ -107,7 +105,7 @@ */ @Override public String getDescription() { - return _("TAC weight in tons per population.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."); + return "TAC weight in tons per population.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."; } /** Modified: trunk/rules/TACpoidsTailleMin.java =================================================================== --- trunk/rules/TACpoidsTailleMin.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/rules/TACpoidsTailleMin.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package rules; -import static org.nuiton.i18n.I18n._; - import java.util.HashSet; import java.util.Set; import java.util.List; @@ -122,7 +120,7 @@ */ @Override public String getDescription() { - return _("TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."); + return "TAC weight in tons.\nIf you want survival discard use propSurvie other than 0.\nIf you wish TAC computed as a proportion of the biomass use propTac other than 0."; } /** @@ -140,7 +138,7 @@ * * @param context la simulation pour lequel on utilise cette regle * @param step le pas de temps courant - * @param metier le metier concerné + * @param metier le metier concerne * @return vrai si on souhaite que les actions soit faites */ @Override @@ -154,7 +152,7 @@ TargetSpecies ts = metier.getMetierSeasonInfo(step.getMonth()) .getSpeciesTargetSpecies(param_species); boolean result = false; - if (ts != null) { // on n'applique la regle que si espece capturée par ce metier + if (ts != null) { // on n'applique la regle que si espece capturee par ce metier // on fait le calcul du tac si necessaire if (param_propTac > 0 && step.getMonth().equals(Month.JANUARY)) { PopulationMonitor popMon = context.getPopulationMonitor(); @@ -317,7 +315,7 @@ // la matrice de captures a une dimension metier - donc a cette etape, toutes // les captures de tous les metiers sont connues // Ne doit pas s'appliquer pour chaque metier de la boucle mais une seule fois! - // affectation est mis à true à la fin de la boucle sur les pop + // affectation est mis a true a la fin de la boucle sur les pop // la preaction ne tourne que si le TAC est atteint if (tacAtteint) { //postAction de la regle TAC dans ce cas TailleMin ne s'applique pas Modified: trunk/sensitivityexports/SensitivityBiomassJanvierY3.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassJanvierY3.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivityBiomassJanvierY3.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package sensitivityexports; -import static org.nuiton.i18n.I18n._; - import java.io.Writer; import org.apache.commons.logging.Log; @@ -68,7 +66,7 @@ @Override public String getDescription() { - return _("Biomass for January of the last year. Biomass is the sum on the groups and zones"); + return "Biomass for January of the last year. Biomass is the sum on the groups and zones"; } @Override Modified: trunk/sensitivityexports/SensitivityBiomassRelativeJanvierY6.java =================================================================== --- trunk/sensitivityexports/SensitivityBiomassRelativeJanvierY6.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivityBiomassRelativeJanvierY6.java 2014-06-16 10:04:32 UTC (rev 39) @@ -21,8 +21,6 @@ */ package sensitivityexports; -import static org.nuiton.i18n.I18n._; - import java.io.Writer; import org.apache.commons.logging.Log; @@ -78,7 +76,7 @@ @Override public String getDescription() { - return _("Biomass January last year / Biomass January first year. Biomass is the sum on the groups and zones"); + return "Biomass January last year / Biomass January first year. Biomass is the sum on the groups and zones"; } @Override Modified: trunk/sensitivityexports/SensitivitySpawningBiomassJanvierY2.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassJanvierY2.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivitySpawningBiomassJanvierY2.java 2014-06-16 10:04:32 UTC (rev 39) @@ -37,8 +37,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; - public class SensitivitySpawningBiomassJanvierY2 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ @@ -80,7 +78,7 @@ @Override public String getDescription() { - return _("Biomass of genitors for January of the last year. Biomass is the sum on the groups and zones"); + return "Biomass of genitors for January of the last year. Biomass is the sum on the groups and zones"; } @Override Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeJanvierY5.java =================================================================== --- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeJanvierY5.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeJanvierY5.java 2014-06-16 10:04:32 UTC (rev 39) @@ -37,8 +37,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; - public class SensitivitySpawningBiomassRelativeJanvierY5 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ @@ -95,7 +93,7 @@ @Override public String getDescription() { - return _("Biomass of genitors January last year / Biomass of genitors January first year . Biomass is the sum on the groups and zones"); + return "Biomass of genitors January last year / Biomass of genitors January first year . Biomass is the sum on the groups and zones"; } @Override Modified: trunk/sensitivityexports/SensitivityTotalFishingMortalityY1.java =================================================================== --- trunk/sensitivityexports/SensitivityTotalFishingMortalityY1.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivityTotalFishingMortalityY1.java 2014-06-16 10:04:32 UTC (rev 39) @@ -26,8 +26,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; - import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -77,7 +75,7 @@ @Override public String getDescription() { - return _("Total fishing mortality for the last year for the population. Total fishing mortality is the mean on zones, representative groups, and the sum of metiers and strategies"); + return "Total fishing mortality for the last year for the population. Total fishing mortality is the mean on zones, representative groups, and the sum of metiers and strategies"; } @Override Modified: trunk/sensitivityexports/SensitivityTotalFishingMortalityY2.java =================================================================== --- trunk/sensitivityexports/SensitivityTotalFishingMortalityY2.java 2013-05-02 16:57:26 UTC (rev 38) +++ trunk/sensitivityexports/SensitivityTotalFishingMortalityY2.java 2014-06-16 10:04:32 UTC (rev 39) @@ -26,8 +26,6 @@ import java.io.Writer; -import static org.nuiton.i18n.I18n._; - import org.nuiton.math.matrix.*; import scripts.ResultName; @@ -84,7 +82,7 @@ @Override public String getDescription() { - return _("Total fishing mortality for the last year for the population. Total fishing mortality is the mean on zones, representative groups, and the sum of metiers and strategies"); + return "Total fishing mortality for the last year for the population. Total fishing mortality is the mean on zones, representative groups, and the sum of metiers and strategies"; } @Override