This is an automated email from the git hooks/post-receive script. New commit to branch feature/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git commit 29f4e65c5a6d9db90509e9e5cd8601ca384f5ff4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:20:25 2016 +0100 Ajout de trace dans les appels des services Suppression d'un paramêtre inutil (see #7604). --- .../table/impl/seine/TargetDiscardCatchUIHandler.java | 3 +-- .../v1/seine/TargetCatchServiceController.java | 4 ++-- .../services/service/seine/TargetCatchService.java | 2 +- .../services/service/seine/TargetCatchServiceTopia.java | 17 +++++++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 5167056..2a8a5a0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -492,8 +492,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true, tripSeineId); + Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java index cf613f5..b4e8242 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java @@ -38,8 +38,8 @@ public class TargetCatchServiceController extends ObserveAuthenticatedServiceCon } @Override - public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { - return service.loadForm(setSeineId, discarded, tripSeineId); + public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded) { + return service.loadForm(setSeineId, discarded); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java index be5bdb1..a0de095 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TargetCatchService extends ObserveService { @ReadDataPermission - Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId); + Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded); @Write @WriteDataPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java index 4e26028..60180e7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java @@ -11,7 +11,6 @@ import fr.ird.observe.entities.seine.TargetCatchs; import fr.ird.observe.entities.seine.TargetLenghts; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.Form; @@ -20,7 +19,8 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDtos; -import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; import java.util.Collection; @@ -32,18 +32,20 @@ import java.util.Set; */ public class TargetCatchServiceTopia extends ObserveServiceTopia implements TargetCatchService { + private static final Log log = LogFactory.getLog(TargetCatchServiceTopia.class); + @Override - public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { + public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + setSeineId + ", " + discarded + ")"); + } SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, setSeineId); - TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - Form<SetSeineTargetCatchDto> form = dataEntityToForm( SetSeineTargetCatchDto.class, setSeine, ReferenceSetRequestDefinitions.SET_SEINE_TARGET_CATCH_FORM - //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context ); SetSeineTargetCatchDto setSeineTargetCatchDto = form.getObject(); @@ -83,6 +85,9 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ @Override public SaveResultDto save(SetSeineTargetCatchDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } // on affect le discarded a toute les capture reçus. for (TargetCatchDto targetCatchDto : dto.getTargetCatch()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.