Author: kmorin Date: 2013-01-11 18:42:37 +0100 (Fri, 11 Jan 2013) New Revision: 177 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/177 Log: add decorator Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.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-01-11 16:17:12 UTC (rev 176) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-11 17:42:37 UTC (rev 177) @@ -39,13 +39,11 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import java.io.Serializable; +import static org.nuiton.i18n.I18n.n_; import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; -import java.io.Serializable; - -import static org.nuiton.i18n.I18n.n_; - /** * Tutti decorator service. * @@ -67,6 +65,8 @@ public static final String SPECIES_BY_CODE = "byCode"; public static final String SPECIES_BY_GENUS = "byGenus"; + + public static final String CARACTERISTIC_WITH_UNIT = "withUnit"; public static final String BY_NAME = "byName"; @@ -110,6 +110,7 @@ registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s", SEPARATOR, " "); registerMultiJXPathDecorator(FishingOperationLocation.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Caracteristic.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${name}$s (${unit}$s)", SEPARATOR, " - "); registerMultiJXPathDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, "${codeMemo}$s#${genusSpecies}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, SPECIES_BY_CODE, "${codeMemo}$s", SEPARATOR, " - ");