Author: chatellier Date: 2010-12-13 16:22:24 +0000 (Mon, 13 Dec 2010) New Revision: 399 Log: Mauvaise condition d'application du filtre (rechargement) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 16:03:22 UTC (rev 398) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 16:22:24 UTC (rev 399) @@ -146,10 +146,13 @@ selectionListsView.getSelectionMaturityListModel().setMaturitySpecies(speciesWithMaturity); // rechargement de la selection sauvegardée - if (!selectionSpecyList.isEmpty()) { + // si aucune des autres listes n'est vide + if (!selection.getSelectedSpeciesOccDens().isEmpty() || + !selection.getSelectedSpeciesSizeAllYear().isEmpty() || + !selection.getSelectedSpeciesMaturity().isEmpty()) { selectionListsView.getSelectionFilterOccurrenceField().setText(String.valueOf(selection.getOccurrenceFilter())); selectionListsView.getSelectionFilterDensityField().setText(String.valueOf(selection.getDensityFilter())); - + // restauration de la selection sauvegardée ((CoserListSelectionModel)selectionListsView.getSelectionOccurrenceDensityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesOccDens()); ((CoserListSelectionModel)selectionListsView.getSelectionSizeAllYearList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesSizeAllYear());