Author: kmorin Date: 2013-02-07 12:16:52 +0100 (Thu, 07 Feb 2013) New Revision: 356 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/356 Log: modify program 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-02-07 08:26:42 UTC (rev 355) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-07 11:16:52 UTC (rev 356) @@ -107,12 +107,12 @@ decoratorProvider = new DecoratorProvider() { @Override protected void loadDecorators() { - - registerTuttiDecorator(Program.class, "${name}$s", SEPARATOR, " - "); + + registerTuttiDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Program.class, "${name}$s#${zone/label}$s", SEPARATOR, " - "); registerTuttiDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td/%4$tm/%4$tY", SEPARATOR, " - "); - registerTuttiDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerTuttiDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - ");