This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b63d9d02f2a02d7120a3d51bc559e0dd20f2f20f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 17:44:55 2016 +0200 Fix mispell of encouter → encounter... Bloody stuff\! --- .../swing/validation/BeanValidatorDetectorTest.java | 8 ++++---- .../fr/ird/observe/ui/content/ContentUIManager.java | 4 ++-- .../ui/content/table/impl/longline/EncounterUI.jaxx | 8 ++++---- .../table/impl/longline/EncounterUIHandler.java | 18 +++++++++--------- .../table/impl/longline/EncounterUIModel.java | 20 ++++++++++---------- .../loadors/ActivityLonglineNodeChildLoador.java | 4 ++-- ...ActivityLongLineEncounterServiceController.java} | 14 +++++++------- ...e.java => ActivityLongLineEncounterService.java} | 8 ++++---- .../main/xmi/observe-services-dto-longline.zargo | Bin 67309 -> 67306 bytes .../services/binder/BinderEngineInitializer.java | 8 ++++---- .../data/ActivityLonglineEncouterDtoBinder.java | 14 +++++++------- ...a => ActivityLongLineEncounterServiceTopia.java} | 16 ++++++++-------- .../observe/services/binder/BinderEngineTest.java | 4 ++-- 13 files changed, 63 insertions(+), 63 deletions(-) diff --git a/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index 2b3f83f..6280341 100644 --- a/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/observe-application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -1,7 +1,7 @@ package fr.ird.observe.application.swing.validation; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BasketDto; @@ -141,7 +141,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { public static void setUpClass() throws Exception { ALL_TYPES = new Class[]{ ActivityLonglineDto.class, - ActivityLonglineEncouterDto.class, + ActivityLonglineEncounterDto.class, ActivityLonglineSensorUsedDto.class, ActivitySeineDto.class, ActivitySeineObservedSystemDto.class, @@ -254,7 +254,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(175, validators.size()); + assertEquals(176, validators.size()); } @@ -357,7 +357,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { assertValidatorSetWithSameContextName2(validators, contextName, ActivityLonglineDto.class, -//FIXME ActivityLonglineEncouterDto.class, + ActivityLonglineEncounterDto.class, ActivityLonglineSensorUsedDto.class, ActivitySeineDto.class, ActivitySeineObservedSystemDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index a534be1..86c493c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -164,7 +164,7 @@ public class ContentUIManager { addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); - addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, EncounterUI.class); + addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncounterDto.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx index 0ca7a8e..a656654 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='ActivityLonglineEncouterDto, EncounterDto' + superGenericType='ActivityLonglineEncounterDto, EncounterDto' contentTitle='{n("observe.encounter.title")}' saveNewEntryText='{n("observe.encounter.action.create")}' saveNewEntryTip='{n("observe.encounter.action.create.tip")}'> @@ -30,7 +30,7 @@ <import> fr.ird.observe.services.dto.CommentableDto - fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto + fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto fr.ird.observe.services.dto.longline.EncounterDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto @@ -53,7 +53,7 @@ <EncounterUIModel id='model'/> <!-- edit bean --> - <ActivityLonglineEncouterDto id='bean'/> + <ActivityLonglineEncounterDto id='bean'/> <!-- table edit bean --> <EncounterDto id='tableEditBean'/> @@ -63,7 +63,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-encounter' - beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto' errorTableModel='{getErrorTableModel()}'/> <!-- le validateur d'une entrée de tableau --> 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 9b706b9..7cfb8f7 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 @@ -25,8 +25,8 @@ package fr.ird.observe.ui.content.table.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; 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.ActivityLonglineEncounterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDtos; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -36,7 +36,7 @@ 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.services.service.longline.ActivityLongLineEncounterService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; @@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEncouterDto, EncounterDto> { +public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEncounterDto, EncounterDto> { /** Logger */ static private Log log = LogFactory.getLog(EncounterUIHandler.class); @@ -106,7 +106,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn } @Override - protected void doPersist(ActivityLonglineEncouterDto bean) { + protected void doPersist(ActivityLonglineEncounterDto bean) { SaveResultDto saveResult = getActivityLongLineEncouterService().save(bean); saveResult.toDto(bean); @@ -115,11 +115,11 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn @Override protected void loadEditBean(String beanId) { - Form<ActivityLonglineEncouterDto> form = getActivityLongLineEncouterService().loadForm(beanId); + Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncouterService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - ActivityLonglineEncouterDtos.copyActivityLonglineEncouterDto(form.getObject(), getBean()); + ActivityLonglineEncounterDtos.copyActivityLonglineEncounterDto(form.getObject(), getBean()); } @Override @@ -155,7 +155,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn } - protected ActivityLongLineEncouterService getActivityLongLineEncouterService() { - return ObserveSwingApplicationContext.get().newService(ActivityLongLineEncouterService.class); + protected ActivityLongLineEncounterService getActivityLongLineEncouterService() { + return ObserveSwingApplicationContext.get().newService(ActivityLongLineEncounterService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java index d0a28e2..3ae0187 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.EncounterDtos; import fr.ird.observe.ui.content.table.ContentTableMeta; @@ -40,16 +40,16 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncouterDto, EncounterDto> { +public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncounterDto, EncounterDto> { private static final long serialVersionUID = 1L; public EncounterUIModel(EncounterUI ui) { - super(ActivityLonglineEncouterDto.class, + super(ActivityLonglineEncounterDto.class, EncounterDto.class, new String[]{ - ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, - ActivityLonglineEncouterDto.PROPERTY_COMMENT}, + ActivityLonglineEncounterDto.PROPERTY_ENCOUNTER, + ActivityLonglineEncounterDto.PROPERTY_COMMENT}, new String[]{ EncounterDto.PROPERTY_SPECIES, EncounterDto.PROPERTY_DISTANCE, @@ -67,12 +67,12 @@ public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncout } @Override - protected ContentTableModel<ActivityLonglineEncouterDto, EncounterDto> createTableModel( - ObserveContentTableUI<ActivityLonglineEncouterDto, EncounterDto> ui, + protected ContentTableModel<ActivityLonglineEncounterDto, EncounterDto> createTableModel( + ObserveContentTableUI<ActivityLonglineEncounterDto, EncounterDto> ui, List<ContentTableMeta<EncounterDto>> contentTableMetas) { - return new ContentTableModel<ActivityLonglineEncouterDto, EncounterDto>(ui, contentTableMetas) { + return new ContentTableModel<ActivityLonglineEncounterDto, EncounterDto>(ui, contentTableMetas) { @Override - protected Collection<EncounterDto> getChilds(ActivityLonglineEncouterDto bean) { + protected Collection<EncounterDto> getChilds(ActivityLonglineEncounterDto bean) { return bean.getEncounter(); } @@ -82,7 +82,7 @@ public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncout } @Override - protected void setChilds(ActivityLonglineEncouterDto parent, List<EncounterDto> childs) { + protected void setChilds(ActivityLonglineEncounterDto parent, List<EncounterDto> childs) { parent.setEncounter(childs); } }; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 508b20c..77cf63d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ActivityLonglineNode; @@ -95,7 +95,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str NavDataProvider dataService) { List<String> result = new ArrayList<>(); - result.add(ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); + result.add(ActivityLonglineEncounterDto.PROPERTY_ENCOUNTER); result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); return result; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java similarity index 74% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java index 21c67f2..13c2252 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncounterServiceController.java @@ -24,26 +24,26 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; +import fr.ird.observe.services.service.longline.ActivityLongLineEncounterService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ActivityLongLineEncouterServiceController extends ObserveAuthenticatedServiceControllerSupport<ActivityLongLineEncouterService> implements ActivityLongLineEncouterService { +public class ActivityLongLineEncounterServiceController extends ObserveAuthenticatedServiceControllerSupport<ActivityLongLineEncounterService> implements ActivityLongLineEncounterService { - public ActivityLongLineEncouterServiceController() { - super(ActivityLongLineEncouterService.class); + public ActivityLongLineEncounterServiceController() { + super(ActivityLongLineEncounterService.class); } @Override - public Form<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { + public Form<ActivityLonglineEncounterDto> loadForm(String activityLonglineId) { return service.loadForm(activityLonglineId); } @Override - public SaveResultDto save(ActivityLonglineEncouterDto dto) { + public SaveResultDto save(ActivityLonglineEncounterDto dto) { return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java similarity index 86% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java rename to observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java index 5fe4fe9..01debfa 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterService.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -34,14 +34,14 @@ import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface ActivityLongLineEncouterService extends ObserveService { +public interface ActivityLongLineEncounterService extends ObserveService { @ReadDataPermission - Form<ActivityLonglineEncouterDto> loadForm(String activityLonglineId); + Form<ActivityLonglineEncounterDto> loadForm(String activityLonglineId); @WriteDataPermission @Write @PostRequest - SaveResultDto save(ActivityLonglineEncouterDto dto); + SaveResultDto save(ActivityLonglineEncounterDto dto); } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 39d3e71..dcf7570 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index bdd24bb..61beb37 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -237,7 +237,7 @@ import fr.ird.observe.services.binder.referential.WindBinder; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.ObserveModelInitializer; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; @@ -496,9 +496,9 @@ class BinderEngineInitializer implements ObserveModelInitializer { } @Override - public void initActivityLonglineEncouterDto() { - dataDtoToEntityTypeBuilder.put(ActivityLonglineEncouterDto.class, ActivityLongline.class); - dataBinderBuilder.put(ActivityLonglineEncouterDto.class, new ActivityLonglineEncouterDtoBinder()); + public void initActivityLonglineEncounterDto() { + dataDtoToEntityTypeBuilder.put(ActivityLonglineEncounterDto.class, ActivityLongline.class); + dataBinderBuilder.put(ActivityLonglineEncounterDto.class, new ActivityLonglineEncouterDtoBinder()); } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java index 2eaf87a..63bbb4b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java @@ -26,7 +26,7 @@ import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.EncounterDto; /** @@ -34,14 +34,14 @@ import fr.ird.observe.services.dto.longline.EncounterDto; * * @author Tony Chemit - chemit@codelutin.com */ -public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineEncouterDto> { +public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineEncounterDto> { public ActivityLonglineEncouterDtoBinder() { - super(ActivityLongline.class, ActivityLonglineEncouterDto.class, false); + super(ActivityLongline.class, ActivityLonglineEncounterDto.class, false); } @Override - public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineEncouterDto dto, ActivityLongline entity) { + public void copyToEntity(ReferentialLocale referentialLocale, ActivityLonglineEncounterDto dto, ActivityLongline entity) { copyDtoDataFieldsToEntity(dto, entity); @@ -50,7 +50,7 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit } @Override - public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineEncouterDto dto) { + public void copyToDto(ReferentialLocale referentialLocale, ActivityLongline entity, ActivityLonglineEncounterDto dto) { copyEntityDataFieldsToDto(entity, dto); @@ -59,14 +59,14 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit } @Override - public DataReference<ActivityLonglineEncouterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLongline entity) { + public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLongline entity) { return toDataReference(entity); } @Override - public DataReference<ActivityLonglineEncouterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLonglineEncouterDto dto) { + public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLonglineEncounterDto dto) { return toDataReference(dto); 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/ActivityLongLineEncounterServiceTopia.java similarity index 80% rename from observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncounterServiceTopia.java index cfb23e1..6d50fa9 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/ActivityLongLineEncounterServiceTopia.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; @@ -34,20 +34,20 @@ import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncouterService { +public class ActivityLongLineEncounterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncounterService { - private static final Log log = LogFactory.getLog(ActivityLongLineEncouterServiceTopia.class); + private static final Log log = LogFactory.getLog(ActivityLongLineEncounterServiceTopia.class); @Override - public Form<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { + public Form<ActivityLonglineEncounterDto> loadForm(String activityLonglineId) { if (log.isTraceEnabled()) { log.trace("loadForm(" + activityLonglineId + ")"); } - ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, activityLonglineId); + ActivityLongline activityLongline = loadEntity(ActivityLonglineEncounterDto.class, activityLonglineId); - Form<ActivityLonglineEncouterDto> form = dataEntityToForm( - ActivityLonglineEncouterDto.class, + Form<ActivityLonglineEncounterDto> form = dataEntityToForm( + ActivityLonglineEncounterDto.class, activityLongline, ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_ENCOUTER_FORM); @@ -56,7 +56,7 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im } @Override - public SaveResultDto save(ActivityLonglineEncouterDto dto) { + public SaveResultDto save(ActivityLonglineEncounterDto dto) { if (log.isTraceEnabled()) { log.trace("save(" + dto.getId() + ")"); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java index fcd569e..5fb10b0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java @@ -28,7 +28,7 @@ import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; @@ -246,7 +246,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { public void testTransformEntityToDataDto() throws Exception { transformDataEntityToDto(ActivityLonglineDto.class); - transformDataEntityToDto(ActivityLonglineEncouterDto.class); + transformDataEntityToDto(ActivityLonglineEncounterDto.class); transformDataEntityToDto(ActivityLonglineSensorUsedDto.class); transformDataEntityToDto(ActivityLonglineStubDto.class); transformDataEntityToDto(BaitsCompositionDto.class); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.