Author: tchemit Date: 2013-01-30 09:40:52 +0100 (Wed, 30 Jan 2013) New Revision: 258 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/258 Log: add trawlNetNumber in fishing operation decoration 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 2013-01-29 18:13:04 UTC (rev 257) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-30 08:40:52 UTC (rev 258) @@ -104,7 +104,7 @@ registerMultiJXPathDecorator(Program.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${gearShootingStartDate}$td/%3$tm/%3$tY", SEPARATOR, " - "); + registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${trawlNetNumber}$s#${gearShootingStartDate}$td/%3$tm/%3$tY", SEPARATOR, " - "); registerMultiJXPathDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); @@ -161,6 +161,7 @@ n_("tutti.property.sortedUnsortedCategory"); n_("tutti.property.macroWasteCategory"); n_("tutti.property.attachment"); + n_("tutti.property.trawlNetNumber"); } } 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 2013-01-29 18:13:04 UTC (rev 257) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-30 08:40:52 UTC (rev 258) @@ -16,6 +16,7 @@ tutti.property.genusSpecies=Nom scientifique tutti.property.internalRegistrationCode=Immatriculation internationale tutti.property.label=Code +tutti.property.trawlNetNumber=Numéro de poche tutti.property.lastName=Nom de Famille tutti.property.macroWasteCategory=Type de macro déchet tutti.property.matrixName=Support