Author: bleny Date: 2010-11-26 14:35:58 +0000 (Fri, 26 Nov 2010) New Revision: 806 Log: bug fix Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:14:35 UTC (rev 805) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-26 14:35:58 UTC (rev 806) @@ -147,20 +147,24 @@ public void onSelectedFromAddSampleRowCode() { + if (sampleRowId != null) { - List<SampleRow> rows = getFilter().getSampleRows(); - if (rows == null) { - rows = new ArrayList<SampleRow>(); - getFilter().setSampleRows(rows); + List<SampleRow> rows = getFilter().getSampleRows(); + if (rows == null) { + rows = new ArrayList<SampleRow>(); + getFilter().setSampleRows(rows); + } + rows.add(getSampleRowSelectModel().findObject(sampleRowId)); + + edited = true; } - rows.add(getSampleRowSelectModel().findObject(sampleRowId)); - - edited = true; } public void onSelectedFromRemoveSampleRowCode() { - getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); - edited = true; + if (sampleRowId != null) { + getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); + edited = true; + } } /**