Author: kmorin Date: 2013-03-14 13:47:17 +0100 (Thu, 14 Mar 2013) New Revision: 617 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/617 Log: fixes #2103 [PROTOCOLE] - Gestion du code campagne des esp?\195?\168ces Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-14 12:47:04 UTC (rev 616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-14 12:47:17 UTC (rev 617) @@ -67,6 +67,8 @@ public static final String CARACTERISTIC_WITH_UNIT = "withUnit"; + public static final String FROM_PROTOCOL = "fromProtocol"; + public static final String BY_NAME = "byName"; public static final String SEPARATOR = "#"; @@ -124,6 +126,7 @@ registerDecorator(new ProgramDecorator()); registerDecorator(new SpeciesDecorator()); + registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator()); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); } @@ -178,6 +181,24 @@ private static final long serialVersionUID = 1L; public SpeciesDecorator() throws IllegalArgumentException, NullPointerException { + super(Species.class, "${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + } + + @Override + protected Object onNullValue(Species bean, String token) { + Object result = null; + if ("refTaxCode".equals(token)) { + result = _("tutti.propety.no.species.speciesCode"); + } + return result; + } + } + + public static class SpeciesFromProtocolDecorator extends TuttiDecorator<Species> implements Cloneable { + + private static final long serialVersionUID = 1L; + + public SpeciesFromProtocolDecorator() throws IllegalArgumentException, NullPointerException { super(Species.class, "${surveyCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-14 12:47:04 UTC (rev 616) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-14 12:47:17 UTC (rev 617) @@ -316,6 +316,11 @@ } @Override + public List<Species> getAllReferentSpecies(TuttiProtocol protocol) { + return driver.getAllReferentSpecies(protocol); + } + + @Override public List<Caracteristic> getAllCaracteristic() { return driver.getAllCaracteristic(); }