This is an automated email from the git hooks/post-receive script. New commit to branch feature/7614-LL-VerifEcranComposition in repository tutti. See http://git.codelutin.com/tutti.git commit 2edfed0c2ccff64f48690fb6ea7fa74d35e3cc55 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 10 10:12:48 2016 +0100 Charger les références dans le modél principal et ses sous modéls (see #7614). --- .../src/main/java/fr/ird/observe/ui/content/ContentUIModel.java | 8 ++++++++ .../content/impl/longline/LonglineGlobalCompositionUIHandler.java | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index 52d2642..0ea3c04 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -290,6 +290,14 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab this.dataReferenceSetsByPropertyName = dataReferenceSetsByPropertyName; } + public ImmutableMap<String, ReferentialReferenceSet<?>> getReferentialReferenceSets() { + return referentialReferenceSetsByPropertyName; + } + + public ImmutableMap<String, DataReferenceSet<?>> getDataReferenceSets() { + return dataReferenceSetsByPropertyName; + } + protected <R extends DataDto> Optional<Set<DataReference<R>>> tryToGetDataReferenceSet(String propertyName) { DataReferenceSet<R> referenceSet = getDataReferenceSet(propertyName); Set<DataReference<R>> references = null; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index f0d857a..41f46fd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -144,6 +144,9 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong // update mode Form<SetLonglineGlobalCompositionDto> form = getSetLonglineGlobalCompositionService().loadForm(setId); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), getBean()); @@ -157,6 +160,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open floatlinesComposition tab FloatlinesCompositionUIModel floatlinesCompositionModel = getUi().getFloatlinesCompositionModel(); + floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); floatlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean()); @@ -168,6 +172,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open branchlinesComposition tab BranchlinesCompositionUIModel branchlinesCompositionModel = getUi().getBranchlinesCompositionModel(); + branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); branchlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean()); @@ -179,6 +184,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open hooksComposition tab HooksCompositionUIModel hooksCompositionModel = getUi().getHooksCompositionModel(); + hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); hooksCompositionModel.setForm(form); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean()); @@ -190,6 +196,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open baitsComposition tab BaitsCompositionUIModel baitsCompositionModel = getUi().getBaitsCompositionModel(); + baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); baitsCompositionModel.setForm(form); SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.