This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 1e65cb0af8b8a2af793759e6f257b5455e16540e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 9 08:33:25 2015 +0200 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip --- .../main/java/fr/ird/observe/DecoratorService.java | 6 +++--- ...ripDecorator.java => TripLonglineDecorator.java} | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index 92c16e7..3d67720 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -27,7 +27,7 @@ import fr.ird.observe.decorator.NonTargetLengthDecorator; import fr.ird.observe.decorator.ObjectObservedSpeciesDecorator; import fr.ird.observe.decorator.ReferenceDecorator; import fr.ird.observe.decorator.SpeciesDecorator; -import fr.ird.observe.decorator.TripDecorator; +import fr.ird.observe.decorator.TripLonglineDecorator; import fr.ird.observe.decorator.TripSeineDecorator; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; @@ -512,8 +512,8 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); - // Trip decorator (register it after the Seine one otherwise the TripSeine one won't be accepted) - registerDecorator(new TripDecorator(libelle)); + // TripLongline decorator + registerDecorator(new TripLonglineDecorator(libelle)); String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator diff --git a/observe-business/src/main/java/fr/ird/observe/decorator/TripDecorator.java b/observe-business/src/main/java/fr/ird/observe/decorator/TripLonglineDecorator.java similarity index 67% rename from observe-business/src/main/java/fr/ird/observe/decorator/TripDecorator.java rename to observe-business/src/main/java/fr/ird/observe/decorator/TripLonglineDecorator.java index e202db7..9a5e7ea 100644 --- a/observe-business/src/main/java/fr/ird/observe/decorator/TripDecorator.java +++ b/observe-business/src/main/java/fr/ird/observe/decorator/TripLonglineDecorator.java @@ -1,14 +1,12 @@ -package fr.ird.observe.decorator; - /* * #%L * ObServe :: Business * %% - * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit + * Copyright (C) 2008 - 2011 IRD, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,26 +14,27 @@ package fr.ird.observe.decorator; * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ +package fr.ird.observe.decorator; -import fr.ird.observe.entities.Trip; +import fr.ird.observe.entities.longline.TripLongline; /** - * Created on 8/28/14. + * Decorator of {@link TripLongline}. * * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 + * @since 4.0 */ -public class TripDecorator extends ObserveDecorator<Trip> { +public class TripLonglineDecorator extends ObserveDecorator<TripLongline> { private static final long serialVersionUID = 1L; - public TripDecorator(String libelle) throws IllegalArgumentException, NullPointerException { - super(Trip.class, + public TripLonglineDecorator(String libelle) throws IllegalArgumentException, NullPointerException { + super(TripLongline.class, "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + libelle + "}$s##${observerLabel}$s" ); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.