This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_2 in repository observe. See http://git.codelutin.com/observe.git commit 3902db34f39377be64f32a5834079c1fa89a853c Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:11:41 2015 +0200 correction des décorateurs (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +-- .../loadors/ActivityLonglinesNodeChildLoador.java | 15 ++++----- .../observe-application-swing_fr_FR.properties | 2 +- .../ActivityLonglineServiceController.java | 4 +-- .../service/longline/ActivityLonglineService.java | 3 +- .../longline/ActivityLonglineServiceTopia.java | 36 ++++++++-------------- .../service/seine/ActivitySeineServiceTopia.java | 2 +- 8 files changed, 28 insertions(+), 40 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index 8bb4dd0..1810058 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -437,7 +437,7 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); - registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s"); + registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType}$s"); //FIXME Remove this registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index cc1e8ac..32b3ffc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -24,13 +24,11 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; - import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -119,7 +117,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin protected List<ReferenceDto> getChilds(TripLonglineDto bean) { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - ReferenceSetDto<ActivityLonglineStubDto> activityLonglineStubByRoute = service.getActivityLonglineStubByRoute(bean.getId()); + ReferenceSetDto<ActivityLonglineDto> activityLonglineStubByRoute = service.getActivityLonglineByRoute(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + activityLonglineStubByRoute.sizeReference() + " activities."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index 16cdd2a..1fe0829 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -22,14 +22,17 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.tree.ActivityLonglineNode; -import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; /** @@ -51,12 +54,10 @@ public class ActivityLonglinesNodeChildLoador extends AbstractReferenceDtoChildL String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<ActivityLonglineDto> data = getDataService().getActivityLonglineStubByTrip(dataSource, parentId); -// return data; + ActivityLonglineService activityLonglineService = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ReferenceSetDto<ActivityLonglineDto> activityLonglineStubByRoute = activityLonglineService.getActivityLonglineByRoute(parentId); - return null; + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(activityLonglineStubByRoute.getReference())); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 40aa3da..bf0b146 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -880,7 +880,7 @@ observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée observe.common.nonTargetLength= observe.common.nonTargetObservation=Faune associée observe.common.nonTargetSample=Echantillon faune accessoire -observe.common.none= +observe.common.none=Aucun observe.common.objectFate=Devenir de l'objet observe.common.objectObservedSpecies=Faune observée observe.common.objectOperation=Opération sur l'objet diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 744959e..d38b382 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -41,8 +41,8 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { - return service.getActivityLonglineStubByRoute(tripLonglineId); + public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId) { + return service.getActivityLonglineByRoute(tripLonglineId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index eed60c8..8671561 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; @@ -41,7 +40,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivityLonglineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); + ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId); @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index d1738c9..d3c2ab2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -30,7 +29,6 @@ import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -38,7 +36,6 @@ import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -54,39 +51,32 @@ import java.util.LinkedHashSet; public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLonglineService { @Override - public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId) { ReferenceLocale referenceLocale = getReferenceLocale(); TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - LinkedHashSet<ReferenceDto<ActivityLonglineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<ActivityLonglineDto>> stubs = Sets.newLinkedHashSet(); for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { - ReferenceDto<ActivityLonglineStubDto> stub = - ReferenceDtos.newReferenceDto(ActivityLonglineStubDto.class, - Lists.newArrayList(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, - ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, - ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE)); - + ReferenceDto<ActivityLonglineDto> stub = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, + Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + //FIXME + "hasSetLongline")); stub.setId(activityLongline.getTopiaId()); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, - referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE, - activityLongline.getSetLongline() != null); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); + stub.setPropertyValue("hasSetLongline", activityLongline.getSetLongline() != null); stubs.add(stub); - } - Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); - ReferenceSetDto<ActivityLonglineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(ActivityLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; - + ReferenceSetDto<ActivityLonglineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivityLonglineDto.class, stubs, null); + return result; } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 5464125..67cabef 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -72,7 +72,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac "hasSetSeine")); stub.setId(activitySeine.getTopiaId()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); - stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); stubs.add(stub); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.