This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5682241e89918ba47c7a7fd665059d463946d4f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 22 18:13:55 2016 +0100 gestion des nœuds de création --- .../ActivityLonglineNavigationTreeNode.java | 22 ++++++++++++---------- .../longline/TripLonglineNavigationTreeNode.java | 6 ++++-- .../seine/ActivitySeineNavigationTreeNode.java | 20 +++++++++++--------- .../nodes/seine/RouteSeineNavigationTreeNode.java | 4 +++- .../nodes/seine/TripSeineNavigationTreeNode.java | 6 ++++-- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java index ab55e27..21d21d4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java @@ -33,18 +33,20 @@ public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeN public ActivityLonglineNavigationTreeNode(DataReference<ActivityLonglineDto> data) { super(data, true); - DataReference<SetLonglineDto> setLonglineRef = (DataReference) data.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE); - if (setLonglineRef != null) { - add(new SetLonglineNavigationTreeNode(setLonglineRef)); - } + if (data.getId() != null) { + DataReference<SetLonglineDto> setLonglineRef = (DataReference) data.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE); + if (setLonglineRef != null) { + add(new SetLonglineNavigationTreeNode(setLonglineRef)); + } - String vesselActivityId = (String) data.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); + String vesselActivityId = (String) data.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); - if (ENCOUNTERS_ID.contains(vesselActivityId)) { - add(new EncounterLonglineNavigationTreeNode()); - } - if (SENSOR_USED_ID.contains(vesselActivityId)) { - add(new SensorUsedLonglineNavigationTreeNode()); + if (ENCOUNTERS_ID.contains(vesselActivityId)) { + add(new EncounterLonglineNavigationTreeNode()); + } + if (SENSOR_USED_ID.contains(vesselActivityId)) { + add(new SensorUsedLonglineNavigationTreeNode()); + } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java index 6e57774..fb5a5c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java @@ -19,8 +19,10 @@ public class TripLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeS public TripLonglineNavigationTreeNode(DataReference<TripLonglineDto> data) { super(data, data.getId() != null); - add(new GearUseFeaturesLonglineNavigationTreeNode()); - add(new ActivitiesLonglineNavigationTreeNode()); + if (data.getId() != null) { + add(new GearUseFeaturesLonglineNavigationTreeNode()); + add(new ActivitiesLonglineNavigationTreeNode()); + } } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java index 8be338d..f2671fe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java @@ -22,15 +22,17 @@ public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNode public ActivitySeineNavigationTreeNode(DataReference<ActivitySeineDto> data) { super(data, true); - DataReference<SetSeineDto> set = (DataReference<SetSeineDto>) data.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); - if (set != null) { - add(new SetSeineNavigationTreeNode(set)); - } - - FloatingObjectService service = getMainDataSourceServicesProvider().newFloatingObjectService(); - DataReferenceSet<FloatingObjectDto> referenceSet = service.getFloatingObjectByActivitySeine(getId()); - for (DataReference<FloatingObjectDto> reference : referenceSet.getReferences()) { - add(new FloatingObjectSeineNavigationTreeNode(reference)); + if (data.getId() != null) { + DataReference<SetSeineDto> set = (DataReference<SetSeineDto>) data.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); + if (set != null) { + add(new SetSeineNavigationTreeNode(set)); + } + + FloatingObjectService service = getMainDataSourceServicesProvider().newFloatingObjectService(); + DataReferenceSet<FloatingObjectDto> referenceSet = service.getFloatingObjectByActivitySeine(getId()); + for (DataReference<FloatingObjectDto> reference : referenceSet.getReferences()) { + add(new FloatingObjectSeineNavigationTreeNode(reference)); + } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java index 44a6ec2..339158d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java @@ -18,7 +18,9 @@ public class RouteSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSup public RouteSeineNavigationTreeNode(DataReference<RouteDto> data) { super(data, true); - add(new ActivitiesSeineNavigationTreeNode()); + if (data.getId() != null) { + add(new ActivitiesSeineNavigationTreeNode()); + } } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java index ea0659e..5b78e8a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java @@ -19,8 +19,10 @@ public class TripSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupp public TripSeineNavigationTreeNode(DataReference<TripSeineDto> data) { super(data, true); - add(new GearUseFeaturesSeineNavigationTreeNode()); - add(new RoutesSeineNavigationTreeNode()); + if (data.getId() != null) { + add(new GearUseFeaturesSeineNavigationTreeNode()); + add(new RoutesSeineNavigationTreeNode()); + } } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.