branch feature/7614-LL-VerifEcranComposition created (now 6cfca8a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7614-LL-VerifEcranComposition in repository tutti. See http://git.codelutin.com/tutti.git at 6cfca8a sur l'association SetLongline et mitigationType, suppression de la composition (see #7614). This branch includes the following new commits: new fea8375 Ajout de trace dans les appels des services (see #7614). new 2edfed0 Charger les références dans le modél principal et ses sous modéls (see #7614). new 6cfca8a sur l'association SetLongline et mitigationType, suppression de la composition (see #7614). The 3 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 6cfca8a0499b6f447e665313dff0a1cd3551cbfc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 10 11:07:58 2016 +0100 sur l'association SetLongline et mitigationType, suppression de la composition (see #7614). 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). commit fea8375ae8511b195bb3320378a7884020fbd1bf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 10 10:12:25 2016 +0100 Ajout de trace dans les appels des services (see #7614). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 fea8375ae8511b195bb3320378a7884020fbd1bf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 10 10:12:25 2016 +0100 Ajout de trace dans les appels des services (see #7614). --- .../longline/SetLonglineGlobalCompositionServiceTopia.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java index 732a8d9..69982fc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -28,14 +28,21 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopia implements SetLonglineGlobalCompositionService { + private static final Log log = LogFactory.getLog(SetLonglineGlobalCompositionServiceTopia.class); + @Override public Form<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + setLonglineId + ")"); + } SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, setLonglineId); @@ -49,6 +56,9 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi @Override public SaveResultDto save(SetLonglineGlobalCompositionDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } SetLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); copyDataDtoToEntity(dto, entity); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 6cfca8a0499b6f447e665313dff0a1cd3551cbfc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 10 11:07:58 2016 +0100 sur l'association SetLongline et mitigationType, suppression de la composition (see #7614). --- .../src/main/xmi/observe-longline.zargo | Bin 93586 -> 93566 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 41164f5..9a401bd 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm