branch feature/7553-3 updated (9b27d50 -> 6e51a15)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553-3 in repository observe. See http://git.codelutin.com/observe.git discards 9b27d50 récupération des stubs du dao plutot que les entités entieres (refs #755") discards de6364f chargement des sous noeuds des program longline (refs #7553) adds f0a0274 migration de l'ecran (refs #7597) new 49351d8 chargement des sous noeuds des program longline (refs #7553) new 6e51a15 récupération des stubs du dao plutot que les entités entieres (refs #755") This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9b27d50) \ N -- N -- N refs/heads/feature/7553-3 (6e51a15) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6e51a154a73e91b3c311d622bcd368763a83ceef Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:37:21 2015 +0200 récupération des stubs du dao plutot que les entités entieres (refs #755") commit 49351d8a9eb1b27662c8b897af6b07065d4b2365 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:00:58 2015 +0200 chargement des sous noeuds des program longline (refs #7553) Summary of changes: .../observe/ui/content/ContentUIInitializer.java | 7 +++-- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 7 ++--- .../ActivitySeineObservedSystemUIHandler.java | 34 ++++------------------ .../seine/ActivitySeineObservedSystemUIModel.java | 2 -- ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...tivitySeineObservedSystemServiceController.java | 3 +- .../seine/ActivitySeineObservedSystemService.java | 3 +- .../main/xmi/observe-services-dto-seine.properties | 1 - .../services/builder/DtoToEntityBuilder.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 12 +++++--- .../services/entity/ObserveEntitiesFilters.java | 6 ++++ .../ActivitySeineObservedSystemServiceTopia.java | 6 ++-- 13 files changed, 35 insertions(+), 48 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553-3 in repository observe. See http://git.codelutin.com/observe.git commit 49351d8a9eb1b27662c8b897af6b07065d4b2365 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:00:58 2015 +0200 chargement des sous noeuds des program longline (refs #7553) --- .../ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index a50907d..58ffcee 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; @@ -66,9 +67,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa ObserveNode parentNode, NavDataProvider dataProvider) throws Exception { - //FIXME -// DataSelectionModel selectionModel = getSelectionModel(dataProvider); -// addChilds = selectionModel == null; + DataSelectionModel selectionModel = getSelectionModel(dataProvider); + addChilds = selectionModel == null; try { super.loadChilds(model, parentNode, dataProvider); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553-3 in repository observe. See http://git.codelutin.com/observe.git commit 6e51a154a73e91b3c311d622bcd368763a83ceef Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 16:37:21 2015 +0200 récupération des stubs du dao plutot que les entités entieres (refs #755") --- .../entities/longline/ActivityLonglineTopiaDao.java | 2 +- .../services/dto/longline/ActivityLonglineDto.java | 9 +++++++++ .../observe/services/dto/seine/ActivitySeineDto.java | 1 + .../longline/ActivityLonglineServiceTopia.java | 15 ++++++++------- .../service/seine/ActivitySeineServiceTopia.java | 15 ++++++++------- .../service/seine/FloatingObjectServiceTopia.java | 20 ++++++-------------- .../services/service/seine/RouteServiceTopia.java | 9 +++++---- 7 files changed, 38 insertions(+), 33 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 9cee6fb..2ba6ff2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -63,7 +63,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A String sql = "SELECT" + " a.topiaId," + " a.timestamp," + - " a.open," + +// " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java new file mode 100644 index 0000000..42c7ea0 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java @@ -0,0 +1,9 @@ +package fr.ird.observe.services.dto.longline; + +public class ActivityLonglineDto extends AbstractActivityLonglineDto { + + private static final long serialVersionUID = 3991657324991701860L; + + public static final String PROPERTY_HAS_SET_LONGLINE = "hasSetLongline"; + +} //ActivityLonglineDto diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index ec9976d..466bac7 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -10,6 +10,7 @@ public class ActivitySeineDto extends AbstractActivitySeineDto { public static final String ACTIVITY_FIN_DE_PECHE = "6"; + public static final String PROPERTY_HAS_SET_SEINE = "hasSetSeine"; private static final long serialVersionUID = 3846974823980413495L; 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 d3c2ab2..1cf4ecd 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 @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; @@ -44,6 +45,7 @@ import fr.ird.type.CoordinateHelper; import java.util.Calendar; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -55,22 +57,21 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ReferenceLocale referenceLocale = getReferenceLocale(); - TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + ActivityLonglineTopiaDao dao = getTopiaPersistenceContext().getActivityLonglineDao(); + List<ActivityLongline> allStubByTripId = dao.findAllStubByTripId(tripLonglineId, referenceLocale); LinkedHashSet<ReferenceDto<ActivityLonglineDto>> stubs = Sets.newLinkedHashSet(); - for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { + for (ActivityLongline activityLongline : allStubByTripId) { ReferenceDto<ActivityLonglineDto> stub = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, - Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, - ActivityLonglineDto.PROPERTY_TIME_STAMP, + Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - //FIXME - "hasSetLongline")); + ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE)); stub.setId(activityLongline.getTopiaId()); 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); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE, activityLongline.getSetLongline() != null); stubs.add(stub); } 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 67cabef..7b1a6e9 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 @@ -28,6 +28,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.entities.seine.ActivitySeineTopiaDao; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; @@ -46,6 +47,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -58,22 +60,21 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ReferenceLocale referenceLocale = getReferenceLocale(); - Route route = loadEntity(RouteDto.class, Route.class, routeId); + ActivitySeineTopiaDao dao = getTopiaPersistenceContext().getActivitySeineDao(); + List<ActivitySeine> allStubByTripId = dao.findAllStubByRouteId(routeId, referenceLocale); LinkedHashSet<ReferenceDto<ActivitySeineDto>> stubs = Sets.newLinkedHashSet(); - for (ActivitySeine activitySeine : route.getActivitySeine()) { + for (ActivitySeine activitySeine : allStubByTripId) { ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, - Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, - ActivitySeineDto.PROPERTY_TIME, + Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - //FIXME - "hasSetSeine")); + ActivitySeineDto.PROPERTY_HAS_SET_SEINE)); stub.setId(activitySeine.getTopiaId()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_HAS_SET_SEINE, activitySeine.getSetSeine() != null); stubs.add(stub); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index c6ef724..0fbaea8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -35,10 +36,10 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; import fr.ird.observe.services.service.DataNotFoundException; import java.util.LinkedHashSet; +import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -50,24 +51,15 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F ReferenceLocale referenceLocale = getReferenceLocale(); - ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - - - for(FloatingObject floatingObject : activitySeine.getFloatingObject()) { - - FloatingObjectStubDto stub = new FloatingObjectStubDto(); - stub.setId(floatingObject.getTopiaId()); - stub.setObjectTypeLabel(referenceLocale.getLabel(floatingObject.getObjectType())); - - } + FloatingObjectTopiaDao dao = getTopiaPersistenceContext().getFloatingObjectDao(); + List<FloatingObject> allStubByActivityId = dao.findAllStubByActivityId(activitySeineId, referenceLocale); LinkedHashSet<ReferenceDto<FloatingObjectDto>> stubs = Sets.newLinkedHashSet(); - for (FloatingObject floatingObject : activitySeine.getFloatingObject()) { + for (FloatingObject floatingObject : allStubByActivityId) { ReferenceDto<FloatingObjectDto> stub = ReferenceDtos.newReferenceDto(FloatingObjectDto.class, - Lists.newArrayList(FloatingObjectDto.PROPERTY_ID, - FloatingObjectDto.PROPERTY_OBJECT_TYPE)); + Lists.newArrayList(FloatingObjectDto.PROPERTY_OBJECT_TYPE)); stub.setId(floatingObject.getTopiaId()); stub.setPropertyValue(FloatingObjectDto.PROPERTY_OBJECT_TYPE, referenceLocale.getLabel(floatingObject.getObjectType())); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index ff473d5..29c4771 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -49,6 +49,7 @@ import org.nuiton.util.DateUtil; import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; /** @@ -59,15 +60,15 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + RouteTopiaDao dao = getTopiaPersistenceContext().getRouteDao(); + List<Route> allStubByTripId = dao.findAllStubByTripId(tripSeineId); LinkedHashSet<ReferenceDto<RouteDto>> stubs = Sets.newLinkedHashSet(); - for (Route route : tripSeine.getRoute()) { + for (Route route : allStubByTripId) { ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, - Lists.newArrayList(RouteDto.PROPERTY_ID, - RouteDto.PROPERTY_DATE)); + Lists.newArrayList(RouteDto.PROPERTY_DATE)); stub.setId(route.getTopiaId()); stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm