Author: chatellier Date: 2009-09-15 16:05:47 +0000 (Tue, 15 Sep 2009) New Revision: 2622 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.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 null equation check. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/changelog.txt 2009-09-15 16:05:47 UTC (rev 2622) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Imporve check region code (null object, invalid names...) * Refactor storage modifications notification (done for regions) * Fix a little trace util object for both Cache and Trace aspect * Add aspect to get rule time (init/pre/post) in simulation summary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2009-09-15 16:05:47 UTC (rev 2622) @@ -1,5 +1,5 @@ /* *##% -* Copyright (C) 2002 - 2009 Code Lutin +* Copyright (C) 2002 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Static public License @@ -85,14 +85,17 @@ */ - static public void check(Equation eq, CheckResult result) { + static public void check(Object parent, String name, Equation eq, CheckResult result) { + if (eq == null) { + result.addError(parent, _("isisfish.error.invalid.nullequation", name)); + } if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { result.addError(eq, _("isisfish.error.invalid.equation")); } } static public void check(TargetSpecies capturabilite, CheckResult result){ - check(capturabilite.getTargetFactorEquation(), result); + check(capturabilite, "TargetFactorEquation", capturabilite.getTargetFactorEquation(), result); } static public void check(PopulationGroup classPop, CheckResult result){ @@ -188,9 +191,9 @@ static public void check(PopulationSeasonInfo infoSaisonPop, CheckResult result){ if (infoSaisonPop.getUseEquationMigration()) { - check(infoSaisonPop.getMigrationEquation(), result); - check(infoSaisonPop.getEmigrationEquation(), result); - check(infoSaisonPop.getImmigrationEquation(), result); + check(infoSaisonPop, "MigrationEquation", infoSaisonPop.getMigrationEquation(), result); + check(infoSaisonPop, "Emigration", infoSaisonPop.getEmigrationEquation(), result); + check(infoSaisonPop, "ImmigrationEquation", infoSaisonPop.getImmigrationEquation(), result); } else { if (isEmptyMatrix(infoSaisonPop.getMigrationMatrix())) { result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); @@ -268,7 +271,13 @@ check(metier.getGear(), result); } - if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + try { + if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + result.addWarning(metier, _("isisfish.error.invalid.values.params")); + } + } catch(Exception e) { + // can't happen StringIndexOutOfBoundsException + // if gear.PossibleValue if not valid result.addWarning(metier, _("isisfish.error.invalid.values.params")); } @@ -284,8 +293,8 @@ if(pop.getMaturityGroup() == null){ result.addInfo(pop, _("isisfish.error.not.null.class.grown")); } - check(pop.getGrowth(), result); - check(pop.getGrowthReverse(), result); + check(pop, "Growth", pop.getGrowth(), result); + check(pop, "GrowthReverse", pop.getGrowthReverse(), result); List<PopulationGroup> classes = pop.getPopulationGroup(); if(classes.size() == 0){ result.addWarning(pop, _("isisfish.error.undefined.classes")); @@ -328,10 +337,10 @@ check(info, result); } } - check(pop.getPrice(), result); - check(pop.getMeanWeight(), result); - check(pop.getReproductionEquation(), result); - check(pop.getNaturalDeathRate(), result); + check(pop, "Price", pop.getPrice(), result); + check(pop, "MeanWeight", pop.getMeanWeight(), result); + check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); + check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); @@ -451,7 +460,4 @@ } - - - } // CheckSaisie - +} // CheckSaisie 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-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-15 16:05:47 UTC (rev 2622) @@ -12,6 +12,7 @@ Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= Can't\ get\ changlog= +isisfish.error.invalid.nullequation=Equation %s doesn't exist ! Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= 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-09-15 14:25:11 UTC (rev 2621) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-15 16:05:47 UTC (rev 2622) @@ -11,6 +11,7 @@ Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= +isisfish.error.invalid.nullequation=L'equation %s n'existe pas ! Can't\ get\ changlog=Impossible d'obtenir de changelog Can't\ get\ result\:\ %1$s=Can't get result\: %1$s Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s