Author: kmorin Date: 2013-03-14 13:47:04 +0100 (Thu, 14 Mar 2013) New Revision: 616 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/616 Log: fixes #2103 [PROTOCOLE] - Gestion du code campagne des esp?\195?\168ces Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-03-14 12:47:04 UTC (rev 616) @@ -174,6 +174,16 @@ List<Species> getAllSpecies(TuttiProtocol protocol); /** + * Get all {@code referent} species with no {@link Species#surveyCode} + * filled by optional protocol. + * + * @param protocol optional protocol to fill some species cruisecode. + * @return all species with no {@code surveyCode} filled at all. + * @since 1.1 + */ + List<Species> getAllReferentSpecies(TuttiProtocol protocol); + + /** * @return all caracteristics of the system. * @since 1.0 */ Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-14 12:47:04 UTC (rev 616) @@ -218,6 +218,18 @@ @Override public List<Species> getAllSpecies(TuttiProtocol protocol) { List<Species> result = referentialService.getAllSpecies(); + setSpeciesSurveyCode(result, protocol); + return result; + } + + @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + List<Species> result = referentialService.getAllReferentSpecies(); + setSpeciesSurveyCode(result, protocol); + return result; + } + + protected void setSpeciesSurveyCode(List<Species> speciesList, TuttiProtocol protocol) { if (protocol != null && !protocol.isSpeciesEmpty()) { Map<Integer, String> surveyCodeByTaxonId = Maps.newTreeMap(); @@ -230,13 +242,12 @@ surveyCodeByTaxonId.put(taxonId, surveyCode); } } - for (Species species : result) { + for (Species species : speciesList) { Integer taxonId = species.getReferenceTaxonId(); String surveyCode = surveyCodeByTaxonId.get(taxonId); species.setSurveyCode(surveyCode); } } - return result; } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-14 10:03:48 UTC (rev 615) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-03-14 12:47:04 UTC (rev 616) @@ -120,6 +120,11 @@ } @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + throw new RuntimeException("method not implemented"); + } + + @Override public List<Caracteristic> getAllCaracteristic() { throw new RuntimeException("method not implemented"); }