This is an automated email from the git hooks/post-receive script. New change to branch feature/7618-LL-VerifEcranRencontres in repository tutti. See http://git.codelutin.com/tutti.git at ef9d34c Ajouter du filtre sur les espèces (see #7618). This branch includes the following new commits: new 6acd0dc Ajout de trace dans les appels des services (see #7618). new ef9d34c Ajouter du filtre sur les espèces (see #7618). 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 ef9d34c2f592be5178799cff0adedeb655004e8d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 17:16:01 2016 +0100 Ajouter du filtre sur les espèces (see #7618). commit 6acd0dc21bee7691c0adb010a8a9918340362de3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 17:12:06 2016 +0100 Ajout de trace dans les appels des services (see #7618). -- 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/7618-LL-VerifEcranRencontres in repository tutti. See http://git.codelutin.com/tutti.git commit 6acd0dc21bee7691c0adb010a8a9918340362de3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 17:12:06 2016 +0100 Ajout de trace dans les appels des services (see #7618). --- .../service/longline/ActivityLongLineEncouterServiceTopia.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java index 53fb1c4..cfb23e1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -28,14 +28,21 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; 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 ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncouterService { + private static final Log log = LogFactory.getLog(ActivityLongLineEncouterServiceTopia.class); + @Override public Form<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + activityLonglineId + ")"); + } ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, activityLonglineId); @@ -50,6 +57,9 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im @Override public SaveResultDto save(ActivityLonglineEncouterDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } ActivityLongline 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/7618-LL-VerifEcranRencontres in repository tutti. See http://git.codelutin.com/tutti.git commit ef9d34c2f592be5178799cff0adedeb655004e8d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 17:16:01 2016 +0100 Ajouter du filtre sur les espèces (see #7618). --- .../table/impl/longline/EncounterUIHandler.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index fe2ef62..9b706b9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -28,9 +28,14 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDtos; import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -39,6 +44,9 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; +import java.util.Collection; +import java.util.LinkedList; +import java.util.Set; import static org.nuiton.i18n.I18n.n; @@ -114,6 +122,39 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn ActivityLonglineEncouterDtos.copyActivityLonglineEncouterDto(form.getObject(), getBean()); } + @Override + protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { + + Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); + + switch (propertyName) { + + case EncounterDto.PROPERTY_SPECIES: { + + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); + + ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + + Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); + SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); + + Set<String> speciesIds = speciesListDto.getSpeciesIds(); + + result = ReferentialReferences.filterContains(result, speciesIds); + + if (log.isDebugEnabled()) { + log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + } + } + + break; + + } + + return result; + + } + protected ActivityLongLineEncouterService getActivityLongLineEncouterService() { return ObserveSwingApplicationContext.get().newService(ActivityLongLineEncouterService.class); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm