Author: echatellier Date: 2012-08-14 14:37:26 +0200 (Tue, 14 Aug 2012) New Revision: 1044 Url: http://forge.codelutin.com/repositories/revision/coser/1044 Log: refs #1331: Gestion du display esp?\195?\168ce dans l'etape 'rejouer une selection" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-14 12:26:07 UTC (rev 1043) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-14 12:37:26 UTC (rev 1044) @@ -602,6 +602,7 @@ for (String speciesCode : selection.getSelectedSpecies()) { speciesBuilder.append(separator); speciesBuilder.append(project.getDisplaySpeciesText(speciesCode)); + separator = ","; } // partie resumé de selection Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-14 12:26:07 UTC (rev 1043) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-14 12:37:26 UTC (rev 1044) @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.SortedMap; @@ -42,6 +43,7 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserException; +import fr.ifremer.coser.CoserUtils; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.command.Command; @@ -49,6 +51,7 @@ import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.CoserFrame; import fr.ifremer.coser.ui.common.CommonHandler; +import fr.ifremer.coser.ui.common.SpeciesListRenderer; import fr.ifremer.coser.ui.util.CoserListSelectionModel; /** @@ -248,16 +251,26 @@ } // init next step + LinkedHashMap<String, String> reftaxSpecies = project.getRefTaxSpeciesMap(); List<String> currentSpecies = projectService.getProjectSpecies(selection, project, null); + currentSpecies = CoserUtils.sortCollectionWithMapKeys(reftaxSpecies, currentSpecies); + view.getSelectedSpeciesListModel().setSpecies(currentSpecies); + view.getSelectedSpeciesList().setCellRenderer(new SpeciesListRenderer(reftaxSpecies)); ((CoserListSelectionModel)view.getSelectedSpeciesList().getSelectionModel()).setSelectedObjects(replayedSelection.getSelectedSpecies()); // affichage d'un message si la selection de liste n'est pas // cohérente Collection<String> remaindSpecies = CollectionUtils.subtract(replayedSelection.getSelectedSpecies(), currentSpecies); if (!remaindSpecies.isEmpty()) { - String speciesAsString = StringUtils.join(remaindSpecies, ", "); - String message = _("coser.ui.selection.replay.missingspecies", speciesAsString); + String separator = ""; + StringBuilder speciesBuilder = new StringBuilder(256); + for (String species : remaindSpecies) { + speciesBuilder.append(separator); + speciesBuilder.append(project.getDisplaySpeciesText(species)); + separator = ","; + } + String message = _("coser.ui.selection.replay.missingspecies", speciesBuilder.toString()); view.getMessageArea5().setText(message); }