This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 9b885ba813850b9fc816e604210b8ee1ccbf2e5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 8 13:04:12 2015 +0100 use more precise function name --- .../ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../persistence/entities/referential/Speciess.java | 17 +++++++---------- .../referential/SpeciesPersistenceServiceReadTest.java | 2 +- .../fr/ifremer/tutti/service/PersistenceService.java | 4 ++-- .../service/csv/AbstractTuttiImportExportModel.java | 2 +- .../tutti/ui/swing/action/ImportProtocolAction.java | 2 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- ...electSpeciesForIndividualObservationBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../swing/content/protocol/EditProtocolUIHandler.java | 3 +-- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index 0a96870..f45dd85 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -817,7 +817,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { // see http://forge.codelutin.com/issues/4154 List<Species> allReferentSpecies = getAllReferentSpecies(); - Map<String, Species> map = Speciess.splitByTaxonId(allReferentSpecies); + Map<String, Species> map = Speciess.splitByReferenceTaxonId(allReferentSpecies); if (!protocol.isSpeciesEmpty()) { Iterator<SpeciesProtocol> iterator = protocol.getSpecies().iterator(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index fc547d8..fddb39f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -78,7 +78,7 @@ public class Speciess extends AbstractSpeciess { }; - public static final Function<Species, String> GET_TAXON_ID = new Function<Species, String>() { + public static final Function<Species, String> GET_REFERECE_TAXON_ID = new Function<Species, String>() { @Override public String apply(Species input) { return String.valueOf(input.getReferenceTaxonId()); @@ -106,12 +106,8 @@ public class Speciess extends AbstractSpeciess { } }; - public static Map<String, Species> splitByTaxonId(Iterable<Species> list) { - return Maps.uniqueIndex(list, GET_TAXON_ID); - } - - public static Multimap<String, Species> splitByReferenceTaxonId(Iterable<Species> list) { - return Multimaps.index(list, GET_TAXON_ID); + public static Map<String, Species> splitByReferenceTaxonId(Iterable<Species> list) { + return Maps.uniqueIndex(list, GET_REFERECE_TAXON_ID); } public static Multimap<String, Species> splitByRefTaxCode(Iterable<Species> list) { @@ -122,10 +118,11 @@ public class Speciess extends AbstractSpeciess { return Multimaps.index(list, GET_SURVEY_CODE); } - public static Set<String> toTaxonIds(List<Species> list) { + public static Set<String> toReferenceTaxonIds(List<Species> list) { Set<String> result = list == null ? Collections.<String>emptySet() : - Sets.newHashSet(Lists.transform(list, GET_TAXON_ID)); + Sets.newHashSet(Lists.transform(list, GET_REFERECE_TAXON_ID)); return result; } -} //Speciess + +} diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java index bf2f0e8..1be7bf9 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java @@ -57,7 +57,7 @@ public class SpeciesPersistenceServiceReadTest extends ReferentialPersistenceSer TuttiEntities.splitById(result); assertResultList(result, fixtures.refNbReferentSpecies()); - Speciess.splitByTaxonId(result); + Speciess.splitByReferenceTaxonId(result); } @Test diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 59e208d..5c72706 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -540,7 +540,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer if (!protocol.isSpeciesEmpty()) { // split by taxonId - Map<String, Species> map = Speciess.splitByTaxonId(referentSpecies); + Map<String, Species> map = Speciess.splitByReferenceTaxonId(referentSpecies); for (SpeciesProtocol protocolSpecy : protocol.getSpecies()) { String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); @@ -574,7 +574,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer if (!protocol.isBenthosEmpty()) { // split by taxonId - Map<String, Species> map = Speciess.splitByTaxonId(referentSpecies); + Map<String, Species> map = Speciess.splitByReferenceTaxonId(referentSpecies); for (SpeciesProtocol protocolSpecy : protocol.getBenthos()) { String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java index f915145..09148ef 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java @@ -55,7 +55,7 @@ public abstract class AbstractTuttiImportExportModel<M> extends AbstractImportEx if (species == null) { species = Lists.newArrayList(); } - Map<String, Species> universe = Speciess.splitByTaxonId(species); + Map<String, Species> universe = Speciess.splitByReferenceTaxonId(species); newForeignKeyColumn(propertyName, Species.class, foreignKeyName, universe); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java index 189adc5..d4c8c26 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java @@ -117,7 +117,7 @@ public class ImportProtocolAction extends AbstractChangeScreenAction { if (doAction) { - Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByTaxonId( + Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByReferenceTaxonId( getDataContext().getReferentSpecies()); // clean species diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java index 8d8cab8..48b8e24 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java @@ -82,7 +82,7 @@ public class SelectSpeciesForBenthosBatchAction extends AbstractTuttiAction<Crea if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java index e5795d6..0ca62ca 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java @@ -84,7 +84,7 @@ public class SelectSpeciesForIndividualObservationBatchAction extends AbstractTu if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java index 174b73a..0d341e3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java @@ -82,7 +82,7 @@ public class SelectSpeciesForSpeciesBatchAction extends AbstractTuttiAction<Crea if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 573498a..44e9159 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; @@ -186,7 +185,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Speciess.splitByReferenceTaxonId(allSpecies); model.setAllSpeciesByTaxonId(allSpeciesByTaxonId); - Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByTaxonId( + Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByReferenceTaxonId( getDataContext().getReferentSpecies()); model.setAllReferentSpeciesByTaxonId(allReferentSpeciesByTaxonId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.