[Observe-commits] 02/02: fecthEntity sur les noeuds (refs #7553)

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 7a28fd1bdf3a528aa9e6fd64c11654b0527813c6 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 11:32:19 2015 +0200 fecthEntity sur les noeuds (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 7 ++++++ .../ird/observe/ui/tree/ActivityLonglineNode.java | 20 +++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 20 +++++++++++++++++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 5 +---- .../observe/ui/tree/FloatingObjectSeineNode.java | 22 ++++++++++++++----- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 ++++++++++++++----- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 18 ++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 25 ++++++++++++++++++++++ .../loadors/ActivityLonglineNodeChildLoador.java | 14 ++++++------ .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 ---- .../tree/loadors/SetLonglineNodeChildLoador.java | 17 ++++++++------- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- 13 files changed, 143 insertions(+), 35 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 0722641..a4c3756 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 @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -418,6 +419,8 @@ public class DecoratorService extends DecoratorProvider { ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(ActivitySeineDto.class, + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s"); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate @@ -435,6 +438,7 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s"); //FIXME Remove this registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this @@ -532,6 +536,9 @@ public class DecoratorService extends DecoratorProvider { // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); + registerReferenceDtoDecorator(TripLonglineDto.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + + libelle + "}$s##${observerLabel}$s"); String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 17d982d..0ec485b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; /** @@ -40,6 +45,21 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { super(ActivityLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivityLonglineNodeChildLoador.class)); } + @Override + protected ReferenceDto<ActivityLonglineDto> fetchEntity() { + ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + FormDto<ActivityLonglineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<ActivityLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, + ActivityLonglineDto.PROPERTY_TIME_STAMP)); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, formDto.getForm().getTimeStamp()); + + return referenceDto; + } + //FIXME // @Override // protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index e4abe09..eb4ed1d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; /** @@ -40,6 +45,21 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { super(ActivitySeineDto.class, entity, ObserveTreeHelper.getChildLoador(ActivitySeineNodeChildLoador.class)); } + @Override + protected ReferenceDto<ActivitySeineDto> fetchEntity() { + ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + FormDto<ActivitySeineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<ActivitySeineDto> referenceDto = + ReferenceDtos.newReferenceDto(ActivitySeineDto.class, Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, + ActivitySeineDto.PROPERTY_TIME)); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, formDto.getForm().getTime()); + + return referenceDto; + } + // @Override // protected ActivitySeine getEntity(DataService dataService, DataSource source) { // return dataService.getActivitySeineStub(source, id); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index a8eb79e..17f8914 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -56,10 +56,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { private boolean reloadEntity; - //FIXME make abstratc - protected ReferenceDto<E> fetchEntity() { - return null; - } + protected abstract ReferenceDto<E> fetchEntity(); protected DtoNodeSupport(Class<E> internalClass, ReferenceDto<E> entity) { this(internalClass, entity, null); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index bf25cce..fcfc125 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.tree.loadors.FloatingObjectNodeChildLoador; /** @@ -40,10 +45,17 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { super(FloatingObjectDto.class, entity, ObserveTreeHelper.getChildLoador(FloatingObjectNodeChildLoador.class)); } - //FIXME -// @Override -// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) { -// return dataService.getFloatinObjectStub(source, id); -// } + @Override + protected ReferenceDto<FloatingObjectDto> fetchEntity() { + FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + FormDto<FloatingObjectDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<FloatingObjectDto> referenceDto = + ReferenceDtos.newReferenceDto(FloatingObjectDto.class, Lists.newArrayList(FloatingObjectDto.PROPERTY_ID)); + referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index 5827a9d..d30feff 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.tree.loadors.SetLonglineNodeChildLoador; /** @@ -40,10 +45,17 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { super(SetLonglineDto.class, entity, ObserveTreeHelper.getChildLoador(SetLonglineNodeChildLoador.class)); } - //FIXME -// @Override -// protected SetLongline getEntity(DataService dataService, DataSource source) { -// return (SetLongline) dataService.loadEntity(source, id, true); -// } + @Override + protected ReferenceDto<SetLonglineDto> fetchEntity() { + SetLonglineService service = ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + FormDto<SetLonglineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<SetLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(SetLonglineDto.class, Lists.newArrayList(SetLonglineDto.PROPERTY_ID)); + referenceDto.setPropertyValue(SetLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 3e6e259..b77bdf3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.tree.loadors.SetSeineNodeChildLoador; /** @@ -40,6 +45,19 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { super(SetSeineDto.class, entity, ObserveTreeHelper.getChildLoador(SetSeineNodeChildLoador.class)); } + @Override + protected ReferenceDto<SetSeineDto> fetchEntity() { + SetSeineService service = ObserveSwingApplicationContext.get().newService(SetSeineService.class); + FormDto<SetSeineDto> formDto = service.loadToRead(entity.getId()); + + //FIXME kmorin 20151005 voir quels attributs sont à récupérer + ReferenceDto<SetSeineDto> referenceDto = + ReferenceDtos.newReferenceDto(SetSeineDto.class, Lists.newArrayList(SetSeineDto.PROPERTY_ID)); + referenceDto.setPropertyValue(SetSeineDto.PROPERTY_ID, formDto.getForm().getId()); + + return referenceDto; + } + //FIXME // @Override // protected SetSeine getEntity(DataService dataService, DataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index 2d4fbc6..6f87e8a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.TripLonglineService; /** * Created on 4/9/15. @@ -39,6 +44,26 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { super(TripLonglineDto.class, entity); } + @Override + protected ReferenceDto<TripLonglineDto> fetchEntity() { + TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + FormDto<TripLonglineDto> formDto = tripLonglineService.loadToRead(entity.getId()); + + ReferenceDto<TripLonglineDto> referenceDto = + ReferenceDtos.newReferenceDto(TripLonglineDto.class, Lists.newArrayList(TripLonglineDto.PROPERTY_ID, + TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); + + return referenceDto; + } + //FIXME // @Override // protected TripLongline getEntity(DataService dataService, DataSource source) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 47091aa..2bbd351 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -23,6 +23,8 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; @@ -30,6 +32,7 @@ import fr.ird.observe.ui.tree.SetLonglineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -91,13 +94,10 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str String parentId, NavDataProvider dataService) { - //FIXME -// List<String> result = new ArrayList<String>(); -// result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); -// result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); -// return result; - - return null; + List<String> result = new ArrayList<String>(); + result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); + result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); + return result; } 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 6e98c4c..375c753 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 @@ -78,7 +78,7 @@ public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoado parentNode.add(child); //FIXME -// ActivitySeineDto activitySeine = ((ActivitySeineNode) parentNode).getEntity(); +// ReferenceDto<ActivitySeineDto> activitySeine = ((ActivitySeineNode) parentNode).getEntity(); // SetSeine set = activitySeine.getSetSeine(); // if (set != null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index 53a7242..63be2af 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -53,10 +53,6 @@ public class ActivitySeinesNodeChildLoador extends AbstractReferenceDtoChildLoad String parentId, NavDataProvider dataProvider) throws Exception { -// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<ActivitySeineDto> data = getDataService().getActivitySeineByRoute(dataSource, parentId); -// return data; ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); ReferenceSetDto<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index a6b2415..07af584 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -23,10 +23,13 @@ package fr.ird.observe.ui.tree.loadors; */ +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -57,15 +60,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String parentId, NavDataProvider dataProvider) { -// FIXME -// List<String> result = new ArrayList<String>(); -// result.add("longlineGlobalComposition"); -// result.add("longlineDetailComposition"); -// result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); -// result.add(SetLonglineTdrDto.PROPERTY_TDR); + List<String> result = new ArrayList<String>(); + result.add("longlineGlobalComposition"); + result.add("longlineDetailComposition"); + result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); + result.add(SetLonglineTdrDto.PROPERTY_TDR); // -// return result; -return null; + return result; } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index 1378a00..39c79ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -74,7 +74,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, Str result.add(SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); //FIXME // result.add(SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return null; + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.