This is an automated email from the git hooks/post-receive script. New commit to branch feature/7089 in repository tutti. See http://git.codelutin.com/tutti.git commit cf72737b1b9b14d311be72ce1dd228a446f1ffe8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 6 17:28:15 2016 +0100 affichage des synonymes ou non dans la popup de sélection d'une espèce pour les lots benthos (refs #7089) --- .../benthos/actions/RenameBenthosBatchAction.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java index 2d82743..6ed18ff 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java @@ -26,6 +26,8 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Speciess; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; @@ -37,8 +39,10 @@ import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -67,6 +71,7 @@ public class RenameBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo BenthosBatchRowModel row = tableModel.getEntry(selectedRowIndex); BenthosBatchUIModel model = handler.getModel(); + List<Species> allSpecies = new ArrayList<>(getDataContext().getSpecies()); List<Species> speciesList = Lists.newArrayList( getDataContext().getReferentBenthosWithSurveyCode()); SampleCategory<?> firstSampleCategory = row.getFirstSampleCategory(); @@ -75,7 +80,17 @@ public class RenameBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo model.getSpeciesUsed().get( (CaracteristicQualitativeValue) categoryValue)); - selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), speciesList); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), allSpecies, speciesList); + + if (!selectedSpecies.isReferenceTaxon()) { + String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); + List<Species> referents = getDataContext().getReferentSpecies(); + Map<String, Species> referentsById = Speciess.splitReferenceSpeciesByReferenceTaxonId(referents); + String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); + selectedSpecies = referentsById.get(taxonId); + String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); + sendMessage(t("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); + } result &= selectedSpecies != null; return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.