This is an automated email from the git hooks/post-receive script. New commit to branch feature/7609-VerifEcranFauneAccesoire in repository tutti. See http://git.codelutin.com/tutti.git commit 32cbe039c62ad17f5a1854cd742392d82a8f464c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 11:06:31 2016 +0100 suppression d'un paramêtre inutil (see #7609). --- .../ui/content/table/impl/seine/NonTargetCatchUIHandler.java | 3 +-- .../web/controller/v1/seine/NonTargetCatchServiceController.java | 4 ++-- .../ird/observe/services/service/seine/NonTargetCatchService.java | 2 +- .../observe/services/service/seine/NonTargetCatchServiceTopia.java | 7 +------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index e99beac..96042ff 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -369,8 +369,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId, tripSeineId); + Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java index cd82162..09ea8ac 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java @@ -38,8 +38,8 @@ public class NonTargetCatchServiceController extends ObserveAuthenticatedService } @Override - public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { - return service.loadForm(setSeineId, tripSeineId); + public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId) { + return service.loadForm(setSeineId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java index df1b67b..86c7553 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface NonTargetCatchService extends ObserveService { @ReadDataPermission - Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId); + Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId); @Write @WriteDataPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 57b91b1..8193f2f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -50,19 +50,14 @@ import java.util.Set; public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements NonTargetCatchService { @Override - public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { + public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, setSeineId); - TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - - Ocean ocean = tripSeine.getOcean(); - Form<SetSeineNonTargetCatchDto> form = dataEntityToForm( SetSeineNonTargetCatchDto.class, setSeine, ReferenceSetRequestDefinitions.SET_SEINE_FORM - //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getObject(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.