Author: chatellier Date: 2011-04-05 12:04:21 +0000 (Tue, 05 Apr 2011) New Revision: 3229 Log: Fix null pointer exception with lengthchange matrix Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-01 13:32:46 UTC (rev 3228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:04:21 UTC (rev 3229) @@ -66,7 +66,11 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(PopulationSeasonInfoImpl.class); - + + public PopulationSeasonInfoImpl() { + setSimpleLengthChangeMatrix(true); + } + /* * @see fr.ifremer.isisfish.entities.PopulationSeasonInfoAbstract#getReproductionDistribution() */ @@ -242,6 +246,17 @@ return result; } + @Override + public MatrixND getLengthChangeMatrix() { + MatrixND matrix = super.getLengthChangeMatrix(); + + if (matrix == null) { + matrix = createNoSpacializedChangeGroupMatrix(); + } + + return matrix; + } + /** * Convert spacialized matrix to non spacialized matrix. * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-01 13:32:46 UTC (rev 3228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-05 12:04:21 UTC (rev 3229) @@ -905,10 +905,10 @@ // d'un populationseasoninfo // il a du se perdre au changement d'interface // swiat>jaxx - seasonInfo.setSimpleLengthChangeMatrix(true); - MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo) - .createNoSpacializedChangeGroupMatrix(); - seasonInfo.setLengthChangeMatrix(matrix); + // moved to entity + //MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo) + // .createNoSpacializedChangeGroupMatrix(); + //seasonInfo.setLengthChangeMatrix(matrix); seasonInfo.update(); pop.update();