Author: chatellier Date: 2011-04-08 15:10:39 +0000 (Fri, 08 Apr 2011) New Revision: 3240 Log: Fix NPE when RecruitmentDistribution is not defined Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-08 15:10:39 UTC (rev 3240) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -352,8 +352,10 @@ check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); - // FIXME chatellier 20110221 NPE pop.getRecruitmentDistribution() - if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { + if (pop.getRecruitmentDistribution() == null) { + result.addWarning(pop, _("isisfish.error.missing.distribution.recruitment")); + } + else if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); } } Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 15:10:39 UTC (rev 3240) @@ -312,6 +312,7 @@ isisfish.error.log.foundAppender=\=could not found log appender %1$s for category %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative +isisfish.error.missing.distribution.recruitment=Missing recruitment distribution equation isisfish.error.no.matrix=No matrix for \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=No sector defined Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 15:10:39 UTC (rev 3240) @@ -312,6 +312,7 @@ isisfish.error.log.foundAppender=n'a pas trouve l'appender %1$s pour la categorie %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative +isisfish.error.missing.distribution.recruitment=Equation de distribution de recrutement manquante isisfish.error.no.matrix=Pas de matrice pour \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=il n'y a pas de secteur de d\u00E9finit