This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5f545dc51ecd49a739484d63b6640e92d5487ed5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:15:51 2016 +0200 Chargement des sous formulaires en adéquation avec le type d'activité bateau (LL) --- .../loadors/ActivityLonglineNodeChildLoador.java | 26 +++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 0ea250f..b0b4ad2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; import fr.ird.observe.application.swing.ui.tree.ObserveNode; import fr.ird.observe.application.swing.ui.tree.SetLonglineNode; @@ -30,10 +31,12 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -47,6 +50,15 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Cla private static final long serialVersionUID = 1L; + private final static ImmutableSet<String> ENCOUNTERS_ID = ImmutableSet.of( + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4" // rencontre interaction + ); + private final static ImmutableSet<String> SENSOR_USED_ID = ImmutableSet.of( + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3" // station oceanographique + ); + public ActivityLonglineNodeChildLoador() { super(String.class); } @@ -69,15 +81,19 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Cla parentNode.add(createSetNode(setLonglineRef)); } - // ajout des autres fils avant la calée - super.loadChilds(model, parentNode, dataProvider); + String vesselActivityId = (String) activityLonglineRef.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); + if (ENCOUNTERS_ID.contains(vesselActivityId)) { + parentNode.add(createNode(EncounterDto.class, dataProvider)); + } + if (SENSOR_USED_ID.contains(vesselActivityId)) { + parentNode.add(createNode(SensorUsedDto.class, dataProvider)); + } } @Override public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { - return Arrays.asList(EncounterDto.class, SensorUsedDto.class); - + return Collections.emptyList(); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.