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 9b06a035271aa10f27e0ca7826314285bc738e0a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 14 11:01:30 2015 +0200 affichage de la calée dans l'arbre de navigation (refs #7598) --- .../ui/tree/loadors/ActivitySeineNodeChildLoador.java | 18 +++++++++--------- .../observe/services/dto/seine/ActivitySeineDto.java | 2 +- .../service/seine/ActivitySeineServiceTopia.java | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 375c753..3b0442d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -25,10 +25,12 @@ 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.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.ui.tree.ActivitySeineNode; import fr.ird.observe.ui.tree.FloatingObjectSeineNode; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; @@ -77,16 +79,14 @@ public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoado parentNode.add(child); - //FIXME -// ReferenceDto<ActivitySeineDto> activitySeine = ((ActivitySeineNode) parentNode).getEntity(); + ReferenceDto<ActivitySeineDto> activitySeineRef = ((ActivitySeineNode) parentNode).getEntity(); + ReferenceDto<SetSeineDto> setSeineRef = (ReferenceDto<SetSeineDto>) activitySeineRef.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); + if (setSeineRef != null) { -// SetSeine set = activitySeine.getSetSeine(); -// if (set != null) { -// -// // si set present, ajout d'un noeud -// child = createSetNode(set); -// parentNode.add(child); -// } + // si set present, ajout d'un noeud + child = createSetNode(setSeineRef); + parentNode.add(child); + } // ajout des objets flottants super.loadChilds(model, parentNode, dataProvider); 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 466bac7..aa9ab18 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,7 +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"; + public static final String PROPERTY_SET_SEINE = "setSeine"; private static final long serialVersionUID = 3846974823980413495L; 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 7b1a6e9..68168c3 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 @@ -41,6 +41,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; @@ -70,11 +71,13 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_HAS_SET_SEINE)); + ActivitySeineDto.PROPERTY_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(ActivitySeineDto.PROPERTY_HAS_SET_SEINE, activitySeine.getSetSeine() != null); + if (activitySeine.getSetSeine() != null) { + stub.setPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE, entityToReferenceDto(SetSeineDto.class, activitySeine.getSetSeine())); + } stubs.add(stub); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.