branch feature/7469-3 created (now 0a57f67)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7469-3 in repository observe. See http://git.codelutin.com/observe.git at 0a57f67 brancher l'arbre de navigation sur gestionnaire de données ouverte pour voirs les noeuds ouverts (refs #7469). This branch includes the following new commits: new 09afc5a A la fermeture de la source de données, fermeer la marée, la route et l'activité ouvertes. (refs #7469). new 0a57f67 brancher l'arbre de navigation sur gestionnaire de données ouverte pour voirs les noeuds ouverts (refs #7469). 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 0a57f67bbbb1cd4a552d07ad5240790992eabd81 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 10:09:17 2015 +0200 brancher l'arbre de navigation sur gestionnaire de données ouverte pour voirs les noeuds ouverts (refs #7469). commit 09afc5a75e77c504f83f0f75515ffccf7e5e62ed Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:46:57 2015 +0200 A la fermeture de la source de données, fermeer la marée, la route et l'activité ouvertes. (refs #7469). -- 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/7469-3 in repository observe. See http://git.codelutin.com/observe.git commit 09afc5a75e77c504f83f0f75515ffccf7e5e62ed Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:46:57 2015 +0200 A la fermeture de la source de données, fermeer la marée, la route et l'activité ouvertes. (refs #7469). --- .../src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index e8290a1..fc9dd44 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -666,6 +666,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // on met a jour l'état dans la config getConfig().setMainStorageOpened(false); + } @@ -675,6 +676,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // references vers le service ObserveSwingDataSource source = event.getSource(); + // on ferme la maréé, la route ou l'activité ouvertes + getOpenDataManager().close(); + ObserveMainUI mainUI = getObserveMainUI(); // nettoyage de l'ui ( suppression navigation et autres ) -- 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/7469-3 in repository observe. See http://git.codelutin.com/observe.git commit 0a57f67bbbb1cd4a552d07ad5240790992eabd81 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 10:09:17 2015 +0200 brancher l'arbre de navigation sur gestionnaire de données ouverte pour voirs les noeuds ouverts (refs #7469). --- .../src/main/java/fr/ird/observe/ObserveOpenDataManager.java | 9 ++++++++- .../main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java | 6 +++--- .../java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java | 1 + .../main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java | 1 + 12 files changed, 21 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java index 1180b80..005ad3d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java @@ -140,6 +140,14 @@ public class ObserveOpenDataManager implements Closeable { openActivityLonglineId = null; } + public boolean isOpen(String openableId) { + return isOpenTripSeine(openableId) + || isOpenRoute(openableId) + || isOpenActivitySeine(openableId) + || isOpenTripLongline(openableId) + || isOpenActivityLongline(openableId); + } + @Override public void close() { openTripSeineId = null; @@ -148,5 +156,4 @@ public class ObserveOpenDataManager implements Closeable { openTripLonglineId = null; openActivityLonglineId = null; } - } 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 0ec485b..1d61903 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 @@ -54,6 +54,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { ReferenceDto<ActivityLonglineDto> referenceDto = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, ActivityLonglineDto.PROPERTY_TIME_STAMP)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, formDto.getForm().getTimeStamp()); 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 eb4ed1d..86c5edd 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 @@ -54,6 +54,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { ReferenceDto<ActivitySeineDto> referenceDto = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, ActivitySeineDto.PROPERTY_TIME)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, formDto.getForm().getTime()); 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 17f8914..ea710e6 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 @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; * #L% */ +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -91,9 +92,8 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } - if (OpenableDto.class.isAssignableFrom(entity.getClass())) { - open = (Boolean) entity.getPropertyValue(OpenableDto.PROPERTY_OPEN); - + if (OpenableDto.class.isAssignableFrom(entity.getType())) { + open = ObserveServiceHelper.get().getOpenDataManager().isOpen(entity.getId()); if (log.isDebugEnabled()) { log.debug("Set open: " + open + " for entity: " + id); } 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 fcfc125..492fc60 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 @@ -53,6 +53,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { //FIXME kmorin 20151005 voir quels attributs sont à récupérer ReferenceDto<FloatingObjectDto> referenceDto = ReferenceDtos.newReferenceDto(FloatingObjectDto.class, Lists.newArrayList(FloatingObjectDto.PROPERTY_ID)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_ID, formDto.getForm().getId()); return referenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index 7bd5c7d..0177f34 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -59,6 +59,7 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { ProgramDto.PROPERTY_CODE, ProgramDto.PROPERTY_GEAR_TYPE, ReferentialReferenceDto.PROPERTY_LABEL)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index 7ca4370..cb885a1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -58,6 +58,7 @@ public class ProgramSeineNode extends DtoNodeSupport<ProgramDto> { ProgramDto.PROPERTY_CODE, ProgramDto.PROPERTY_GEAR_TYPE, ReferentialReferenceDto.PROPERTY_LABEL)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index a9e8b74..e6843fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -52,6 +52,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { ReferenceDto<RouteDto> referenceDto = ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, RouteDto.PROPERTY_DATE)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(RouteDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, formDto.getForm().getDate()); 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 d30feff..5993b7f 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 @@ -53,6 +53,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { //FIXME kmorin 20151005 voir quels attributs sont à récupérer ReferenceDto<SetLonglineDto> referenceDto = ReferenceDtos.newReferenceDto(SetLonglineDto.class, Lists.newArrayList(SetLonglineDto.PROPERTY_ID)); + referenceDto.setId(formDto.getForm().getId()); 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 b77bdf3..0542047 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 @@ -53,6 +53,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { //FIXME kmorin 20151005 voir quels attributs sont à récupérer ReferenceDto<SetSeineDto> referenceDto = ReferenceDtos.newReferenceDto(SetSeineDto.class, Lists.newArrayList(SetSeineDto.PROPERTY_ID)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(SetSeineDto.PROPERTY_ID, formDto.getForm().getId()); return referenceDto; 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 6f87e8a..51ba0b1 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 @@ -55,6 +55,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { TripLonglineDto.PROPERTY_END_DATE, TripLonglineDto.PROPERTY_VESSEL, TripLonglineDto.PROPERTY_OBSERVER)); + referenceDto.setId(formDto.getForm().getId()); 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()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index abe4361..24d9413 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -56,6 +56,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { TripSeineDto.PROPERTY_END_DATE, TripSeineDto.PROPERTY_VESSEL, TripSeineDto.PROPERTY_OBSERVER)); + referenceDto.setId(formDto.getForm().getId()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_ID, formDto.getForm().getId()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); -- 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