r124 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service resources/i18n
Author: tchemit Date: 2012-12-29 15:50:59 +0100 (Sat, 29 Dec 2012) New Revision: 124 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/124 Log: add LabelAware decorator contract + missing i18n key Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 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 2012-12-29 11:32:20 UTC (rev 123) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2012-12-29 14:50:59 UTC (rev 124) @@ -42,6 +42,8 @@ import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; +import java.io.Serializable; + import static org.nuiton.i18n.I18n.n_; /** @@ -52,6 +54,16 @@ */ public class DecoratorService extends AbstractTuttiService { + /** + * A contract to decorate some objects + * (not known at this level but with a label property to display them). + * + * @since 0.3 + */ + public interface LabelAware extends Serializable { + String getLabel(); + } + public static final String SPECIES_BY_CODE = "byCode"; public static final String SPECIES_BY_GENUS = "byGenus"; @@ -104,6 +116,7 @@ registerMultiJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${genusSpecies}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(SpeciesProtocol.class, "${speciesId}", SEPARATOR, " - "); registerMultiJXPathDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(LabelAware.class, "${label}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Float>(Float.class) { private static final long serialVersionUID = 1L; @@ -133,6 +146,7 @@ n_("tutti.property.user"); n_("tutti.property.strata"); n_("tutti.property.codeMemo"); + n_("tutti.property.species"); n_("tutti.property.genusSpecies"); n_("tutti.property.sortedUnsortedCategory"); n_("tutti.property.macroWasteCategory"); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-29 11:32:20 UTC (rev 123) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-29 14:50:59 UTC (rev 124) @@ -20,6 +20,7 @@ tutti.property.protocol=Protocol de saisie tutti.property.seaState=État de la mer tutti.property.sortedUnsortedCategory=Vrac / Hors Vrac +tutti.property.species=Espèce tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association tutti.property.user=Utilisateur
participants (1)
-
tchemit@users.forge.codelutin.com