This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b878fd0ecc90e0576031a2981cd6da951e0b538f Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 17:03:15 2015 +0200 appel de services dans dopersist (refs #7531) --- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 ------ .../ActivitySeineObservedSystemUIHandler.java | 32 +++++++++------ ...ngObjectTransmittingBuoyOperationUIHandler.java | 12 ------ .../ui/content/ref/ContentReferenceUIHandler.java | 46 ++++++++++------------ .../ui/content/table/ContentTableUIHandler.java | 13 +++--- .../impl/longline/BaitsCompositionUIHandler.java | 20 ++++++++++ .../longline/BranchlinesCompositionUIHandler.java | 26 +++++++++--- .../impl/longline/CatchLonglineUIHandler.java | 30 ++++++++++---- .../table/impl/longline/EncounterUIHandler.java | 24 ++++++++++- .../longline/FloatlinesCompositionUIHandler.java | 26 +++++++++--- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 ++++++++++---- .../impl/longline/HooksCompositionUIHandler.java | 26 +++++++++--- .../table/impl/longline/SensorUsedUIHandler.java | 21 +++++++++- .../content/table/impl/longline/TdrUIHandler.java | 21 +++++++++- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 ++++++++++---- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++++++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++++++++++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 +++++++++- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++++++++++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++++++++++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++++++++++ .../impl/seine/TargetDiscardCatchUIHandler.java | 24 ++++++++--- .../table/impl/seine/TargetSampleUIHandler.java | 22 +++++++++++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 ------ ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../service/seine/TripSeineServiceRestTest.java | 2 +- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../fr/ird/observe/services/service/RigthTest.java | 2 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +-- 36 files changed, 434 insertions(+), 151 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index eec3d9f..ebc7b42 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -106,10 +106,6 @@ public class AdminTabUIHandler implements SendMessageAble { /** Service de decoration. */ private DecoratorService decoratorService; - /** Service de manipulation de données depuis des bases. */ - //FIXME -// private DataService dataService; - /** Service de binders. */ private BinderService binderService; @@ -149,14 +145,6 @@ public class AdminTabUIHandler implements SendMessageAble { return decoratorService; } - //FIXME -// public final DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - public final BinderService getBinderService() { if (binderService == null) { binderService = ObserveSwingApplicationContext.get().getBinderService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index fa39ae2..a45c705 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -21,10 +21,14 @@ */ package fr.ird.observe.ui.content.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDtos; +import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; @@ -82,8 +86,9 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ ContentMode mode = computeContentMode(); - //FIXME -// getDataService().loadEditEntity(getDataSource(), activityId, getLoadExecutor()); + FormDto<ActivitySeineObservedSystemDto> formDto = getActivitySeineObservedSystemService().loadToEdit(activityId); + getModel().setFormDto(formDto); + ActivitySeineObservedSystemDtos.copyActivitySeineObservedSystemDto(formDto.getForm(), getBean()); getModel().setMode(mode); @@ -98,17 +103,15 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ super.startEditUI(binding); } - //FIXME -// @Override -// protected boolean doSave(ActivitySeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<ActivitySeine> binder) throws Exception { -// -// // on sauvegarde l'activity (mais pas la set) -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// return true; -// } + @Override + protected boolean doSave(ActivitySeineObservedSystemDto bean) throws Exception { + + // on sauvegarde l'activity (mais pas la set) + String beanId = getActivitySeineObservedSystemService().save(bean); + bean.setId(beanId); + + return true; + } //FIXME // @Override @@ -136,4 +139,7 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ // return beanToSave; // } + protected ActivitySeineObservedSystemService getActivitySeineObservedSystemService() { + return ObserveSwingApplicationContext.get().newService(ActivitySeineObservedSystemService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index d461585..877afa2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -24,13 +24,11 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; @@ -305,16 +303,6 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH resetEditUI(); } - @Override - protected FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String id) { - return null; - } - - @Override - protected FormDto<FloatingObjectTransmittingBuoyDto> loadToReadDto(String id) { - return null; - } - protected void changeTypeOperation(TypeTransmittingBuoyOperation typeOperation, boolean reset) { FloatingObjectTransmittingBuoyOperationUI ui = getUi(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 628c537..76d2a01 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -107,7 +107,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content E entity, Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { - DecoratorService service = ObserveContext.get().getDecoratorService(); + DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); @@ -135,7 +135,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content E entity, Map<Class<? extends IdDto>, List<? extends IdDto>> usages) { - DecoratorService service = ObserveContext.get().getDecoratorService(); + DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); @@ -178,7 +178,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content //FIXME // getLoadBinder().load(selectedBean, getBean(), true); - loadBean(selectedBean); + ReferentialDtos.copyReferentialDto(selectedBean, getBean()); //TODO update data cache @@ -330,7 +330,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // } // return; // } - DecoratorService dService = ObserveContext.get().getDecoratorService(); + DecoratorService dService = getDecoratorService(); Decorator<?> decorator = dService.getDecoratorByType(bean.getClass()); String type = DecoratorService.getEntityLabel(bean.getClass()); type = t(type); @@ -554,9 +554,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content log.debug("Will create new entity [" + getModel().getBeanType() + "]"); } - //FIXME -// getLoadBinder().load(null, getBean(), true); - loadBean((E) null); + ReferentialDtos.copyReferentialDto(null, getBean()); // on demarre l'edition ui.startEdit(null); @@ -571,9 +569,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content model.setMode(ContentMode.UPDATE); } - //FIXME -// getLoadBinder().load(model.getSelectedBean(), getBean(), true); - loadBean(model.getSelectedBean()); + ReferentialDtos.copyReferentialDto(model.getSelectedBean(), getBean()); getUi().startEdit(null); } @@ -614,9 +610,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // then resynch the selected bean to edit bean (used for // example to delete)... // repush selected bean to bean - //FIXME -// getLoadBinder().load(model.getSelectedBean(), getBean(), true); - loadBean(model.getSelectedBean()); + ReferentialDtos.copyReferentialDto(model.getSelectedBean(), getBean()); } } @@ -845,19 +839,19 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUI.LIST_VIEW; } - @Override - protected FormDto<E> loadToEdit(String id) { - ReferentialService referentialService = getReferentialService(); - FormDto<E> formDto = referentialService.loadToEdit(getBeanType(), id); - return formDto; - } - - @Override - protected FormDto<E> loadToReadDto(String id) { - ReferentialService referentialService = getReferentialService(); - FormDto<E> formDto = referentialService.loadToRead(getBeanType(), id); - return formDto; - } +// @Override +// protected FormDto<E> loadToEdit(String id) { +// ReferentialService referentialService = getReferentialService(); +// FormDto<E> formDto = referentialService.loadToEdit(getBeanType(), id); +// return formDto; +// } +// +// @Override +// protected FormDto<E> loadToReadDto(String id) { +// ReferentialService referentialService = getReferentialService(); +// FormDto<E> formDto = referentialService.loadToRead(getBeanType(), id); +// return formDto; +// } protected ReferentialService getReferentialService() { return ObserveSwingApplicationContext.get().newService(ReferentialService.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index d5e6dec..9c7f21f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -39,12 +39,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Rectangle; +import java.awt.*; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -199,8 +197,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex // preparation du bean d'édition // dataService.loadEditEntity(dataSource, id, getLoadExecutor()); - //FIXME -// loadBean(id); + loadEditBean(id); + getModel().setMode(mode); @@ -210,6 +208,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex return editBean; } + protected abstract void loadEditBean(String beanId); + //FIXME // @Override // protected final void onLoad(TopiaContext tx, E bean) throws TopiaException { @@ -288,7 +288,6 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex ui.getTableModel().dettachModel(); // chargement du bean d'édition - //FIXME loadEditBean(mode); boolean canEdit = mode == ContentMode.UPDATE; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 9cc96bb..6f535f5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -22,11 +22,15 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; @@ -112,6 +116,18 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline return getDataContext().getSelectedSetId(); } + @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + //FIXME // @Override // public SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { @@ -122,4 +138,8 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline public void afterSave(boolean refresh) { super.afterSave(refresh); } + + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index fa95c87..d84e7d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -22,21 +22,21 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -122,4 +122,20 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo super.afterSave(refresh); } + @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } + } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index d4a00bb..58ba0a6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -25,12 +25,14 @@ package fr.ird.observe.ui.content.table.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -38,6 +40,7 @@ import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentUIInitializer; @@ -52,8 +55,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; @@ -191,6 +193,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto // updating mode: loading from db //FIXME + // try { // sizes = getDataService().getCatchLonglineSizeMeasures(getDataSource(), bean, sizeMeasuresTableModel.getLoader()); @@ -500,12 +503,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto } - //FIXME // @Override -// protected SetLongline loadEditBean(ContentMode mode, -// DataContext dataContext, -// DataService dataService, -// DataSource dataSource) throws DataSourceException { +// protected SetLonglineDto loadEditBean(ContentMode mode, +// DataContext dataContext) { // // SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // @@ -550,6 +550,18 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto } @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + + @Override protected void closeSafeUI() { if (log.isInfoEnabled()) { @@ -996,4 +1008,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto // return branchlineUpdateExecutor; // } + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } + } \ No newline at end of file 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 87a2f16..81859fb 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 @@ -22,18 +22,22 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -104,4 +108,20 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDt super.initUI(); } + + @Override + protected void doPersist(ActivityLonglineDto bean) { + getActivityLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<ActivityLonglineDto> formDto = getActivityLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), getBean()); + } + + protected ActivityLonglineService getActivityLonglineService() { + return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index 67846fa..86f49c0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -22,20 +22,20 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -118,4 +118,20 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon public void afterSave(boolean refresh) { super.afterSave(refresh); } + + @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 6195071..585c342 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -25,11 +25,14 @@ package fr.ird.observe.ui.content.table.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -46,17 +49,11 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.GridBagConstraints; -import java.awt.Insets; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -547,6 +544,22 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } + @Override + protected void doPersist(TripLonglineDto bean) { + getTripLonglineService().save(bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<TripLonglineDto> formDto = getTripLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + TripLonglineDtos.copyTripLonglineDto(formDto.getForm(), getBean()); + } + + protected TripLonglineService getTripLonglineService() { + return ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + } + static class SectionTemplatesAutotSelectRowAndShowPopupAction extends AutotSelectRowAndShowPopupActionSupport { private final GearUseFeaturesLonglineUI ui; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index 8af0f4e..aba9b82 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -22,21 +22,21 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -121,4 +121,20 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline public void afterSave(boolean refresh) { super.afterSave(refresh); } + + @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index 00813aa..c4e32fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -28,11 +28,14 @@ import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -161,7 +164,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD t("observe.sensorUsed.delete.data.message"), JOptionPane.WARNING_MESSAGE, new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, + t("observe.choice.cancel")}, 1); boolean doDelete = response == 0; @@ -231,4 +234,20 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD } + @Override + protected void doPersist(ActivityLonglineDto bean) { + getActivityLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<ActivityLonglineDto> formDto = getActivityLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), getBean()); + } + + protected ActivityLonglineService getActivityLonglineService() { + return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + } + } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 2a2bc0f..33f070a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -29,9 +29,12 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -342,7 +345,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> t("observe.tdr.delete.data.message"), JOptionPane.WARNING_MESSAGE, new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, + t("observe.choice.cancel")}, 1); boolean doDelete = response == 0; @@ -479,4 +482,20 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> bean.setFishingEnd(timestamp); } + + @Override + protected void doPersist(SetLonglineDto bean) { + getSetLonglineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + } + + protected SetLonglineService getSetLonglineService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index cf26366..93ad580 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -25,11 +25,14 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDtos; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -44,17 +47,11 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTable; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.GridBagConstraints; -import java.awt.Insets; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -545,6 +542,22 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + @Override + protected void doPersist(TripSeineDto bean) { + getTripSeineService().save(bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<TripSeineDto> formDto = getTripSeineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + TripSeineDtos.copyTripSeineDto(formDto.getForm(), getBean()); + } + + protected TripSeineService getTripSeineService() { + return ObserveSwingApplicationContext.get().newService(TripSeineService.class); + } + static class SectionTemplatesAutotSelectRowAndShowPopupAction extends AutotSelectRowAndShowPopupActionSupport { private final GearUseFeaturesSeineUI ui; 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 65bd7ef..4c3821f 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 @@ -21,7 +21,9 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; @@ -29,6 +31,8 @@ import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -439,4 +443,20 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, // echantillon.getNonTargetLength().removeAll(tailleToDelete); // } // } + + @Override + protected void doPersist(SetSeineDto bean) { + getSetSeineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetSeineDto> formDto = getSetSeineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetSeineDtos.copySetSeineDto(formDto.getForm(), getBean()); + } + + protected SetSeineService getSetSeineService() { + return ObserveSwingApplicationContext.get().newService(SetSeineService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index af2a97d..47cc1c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -21,14 +21,18 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.NonTargetSampleService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -429,4 +433,20 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam editBean.setAcquisitionMode(newMode.ordinal()); } } + + @Override + protected void doPersist(NonTargetSampleDto bean) { + getNonTargetSampleService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<NonTargetSampleDto> formDto = getNonTargetSampleService().loadToEdit(beanId); + getModel().setFormDto(formDto); + NonTargetSampleDtos.copyNonTargetSampleDto(formDto.getForm(), getBean()); + } + + protected NonTargetSampleService getNonTargetSampleService() { + return ObserveSwingApplicationContext.get().newService(NonTargetSampleService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 0215342..85e26bf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -21,18 +21,22 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.TargetSampleDtos; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -100,4 +104,19 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati } + @Override + protected void doPersist(FloatingObjectDto bean) { + getFloatingObjectService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<FloatingObjectDto> formDto = getFloatingObjectService().loadToEdit(beanId); + getModel().setFormDto(formDto); + TargetSampleDtos.copyCommentableDto(formDto.getForm(), getBean()); + } + + protected FloatingObjectService getFloatingObjectService() { + return ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 61f21d8..4b8ff2c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -21,11 +21,15 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.TargetSampleDtos; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; @@ -95,4 +99,20 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin super.initUI(); } + + @Override + protected void doPersist(FloatingObjectDto bean) { + getFloatingObjectService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<FloatingObjectDto> formDto = getFloatingObjectService().loadToEdit(beanId); + getModel().setFormDto(formDto); + TargetSampleDtos.copyCommentableDto(formDto.getForm(), getBean()); + } + + protected FloatingObjectService getFloatingObjectService() { + return ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 98b159b..a429375 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -21,10 +21,14 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -169,4 +173,20 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, return true; } + + @Override + protected void doPersist(SetSeineDto bean) { + getSetSeineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetSeineDto> formDto = getSetSeineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetSeineDtos.copySetSeineDto(formDto.getForm(), getBean()); + } + + protected SetSeineService getSetSeineService() { + return ObserveSwingApplicationContext.get().newService(SetSeineService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index 60001fd..354e09b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -21,14 +21,18 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -463,4 +467,20 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar List<ReferenceDto<WeightCategoryDto>> list = new ArrayList<>(ALL_CATEGORIES_ENTRY.getContextValue(context)); return list; } + + @Override + protected void doPersist(SetSeineDto bean) { + getSetSeineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetSeineDto> formDto = getSetSeineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetSeineDtos.copySetSeineDto(formDto.getForm(), getBean()); + } + + protected SetSeineService getSetSeineService() { + return ObserveSwingApplicationContext.get().newService(SetSeineService.class); + } } 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 ae7a6ec..441ffec 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 @@ -21,15 +21,19 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -292,11 +296,6 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD } @Override - protected void doPersist(SetSeineDto bean) { - //FIXME quel service ? - } - - @Override protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { // on recupere les speciess acceptables pour des echantillonnages @@ -682,4 +681,19 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD } } + @Override + protected void doPersist(SetSeineDto bean) { + getSetSeineService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<SetSeineDto> formDto = getSetSeineService().loadToEdit(beanId); + getModel().setFormDto(formDto); + SetSeineDtos.copySetSeineDto(formDto.getForm(), getBean()); + } + + protected SetSeineService getSetSeineService() { + return ObserveSwingApplicationContext.get().newService(SetSeineService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 95c2ae9..66da3e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -21,14 +21,20 @@ */ package fr.ird.observe.ui.content.table.impl.seine; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.dto.seine.TargetSampleDtos; +import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.seine.TargetSampleService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -449,4 +455,20 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto editBean.setAcquisitionMode(newMode.ordinal()); } } + + @Override + protected void doPersist(TargetSampleDto bean) { + getTargetSampleService().save(getSelectedParentId(), bean); + } + + @Override + protected void loadEditBean(String beanId) { + FormDto<TargetSampleDto> formDto = getTargetSampleService().loadToEdit(beanId, discarded); + getModel().setFormDto(formDto); + TargetSampleDtos.copyTargetSampleDto(formDto.getForm(), getBean()); + } + + protected TargetSampleService getTargetSampleService() { + return ObserveSwingApplicationContext.get().newService(TargetSampleService.class); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index 2a47d48..19b594a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -53,9 +53,6 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { */ protected transient E entity; - //FIXME -// protected transient DataService dataService; - private boolean reloadEntity; //FIXME @@ -155,14 +152,6 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } - //FIXME -// private DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - public void setReloadEntity(boolean reloadEntity) { this.reloadEntity = reloadEntity; } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java index dda4d4e..190c0f1 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java @@ -47,7 +47,7 @@ public class ActivitySeineObservedSystemServiceController extends ObserveAuthent } @Override - public String save(FormDto<ActivitySeineObservedSystemDto> form) { - return service.save(form); + public String save(ActivitySeineObservedSystemDto dto) { + return service.save(dto); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java index 7a029c3..0efcba4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java @@ -52,7 +52,7 @@ public class NonTargetSampleServiceController extends ObserveAuthenticatedServic } @Override - public String save(String setSeineId, FormDto<NonTargetSampleDto> form) { - return service.save(setSeineId, form); + public String save(String setSeineId, NonTargetSampleDto dto) { + return service.save(setSeineId, dto); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java index 73bfb35..ced9af1 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java @@ -52,7 +52,7 @@ public class TargetSampleServiceController extends ObserveAuthenticatedServiceCo } @Override - public String save(String setSeineId, FormDto<TargetSampleDto> form) { - return service.save(setSeineId, form); + public String save(String setSeineId, TargetSampleDto dto) { + return service.save(setSeineId, dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index 2e0ace9..7640dff 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -44,6 +44,6 @@ public interface ActivitySeineObservedSystemService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<ActivitySeineObservedSystemDto> form); + String save(ActivitySeineObservedSystemDto dto); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java index 2e83c2d..68a0e73 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java @@ -47,6 +47,6 @@ public interface NonTargetSampleService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String setSeineId, FormDto<NonTargetSampleDto> form); + String save(String setSeineId, NonTargetSampleDto dto); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java index d4c8e2b..528c66c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java @@ -47,6 +47,6 @@ public interface TargetSampleService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String setSeineId, FormDto<TargetSampleDto> form); + String save(String setSeineId, TargetSampleDto dto); } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java index b6c049f..677deef 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java @@ -257,7 +257,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ tripSeineDto.setComment("Un commentaire"); - service.save(formDto); + service.save(formDto.getForm()); FormDto<TripSeineDto> formDtoReload = service.loadToRead(TRIP_SEINE_ID_1); TripSeineDto tripSeineDtoReload = formDtoReload.getForm(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java index ca266d5..4a7f416 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -53,9 +53,9 @@ public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia } @Override - public String save(FormDto<ActivitySeineObservedSystemDto> form) { + public String save(ActivitySeineObservedSystemDto dto) { - ActivitySeine activitySeine = dtoToEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, form.getForm()); + ActivitySeine activitySeine = dtoToEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, dto); activitySeine = saveEntity(ActivitySeine.class, activitySeine); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java index 6b3da11..0deb45c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java @@ -121,12 +121,10 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } @Override - public String save(String setSeineId, FormDto<NonTargetSampleDto> form) { + public String save(String setSeineId, NonTargetSampleDto nonTargetSampleDto) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - NonTargetSampleDto nonTargetSampleDto = form.getForm(); - NonTargetSample nonTargetSample = dtoToEntity(NonTargetSampleDto.class, NonTargetSample.class, nonTargetSampleDto); nonTargetSample = saveEntity(NonTargetSample.class, nonTargetSample); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index a026ec5..8d2e108 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -129,12 +129,10 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar } @Override - public String save(String setSeineId, FormDto<TargetSampleDto> form) { + public String save(String setSeineId, TargetSampleDto targetSampleDto) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - TargetSampleDto targetSampleDto = form.getForm(); - TargetSample targetSample = dtoToEntity(TargetSampleDto.class, TargetSample.class, targetSampleDto); targetSample = saveEntity(TargetSample.class, targetSample); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java index 1509d73..4f12763 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java @@ -153,7 +153,7 @@ public class RigthTest { FormDto<TripSeineDto> tripSeineDtoFormDto = service.loadToEdit(TRIP_SEINE_ID); - service.save(tripSeineDtoFormDto); + service.save(tripSeineDtoFormDto.getForm()); } protected void testReadReferential(String login) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index a991c4c..f5f8865 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -275,7 +275,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Date lastUpdateBefore = getLastUpdate(TripSeine.class); - String tripSeineId = service.save(formDto); + String tripSeineId = service.save(formDto.getForm()); TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, tripSeineId); @@ -331,7 +331,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Date lastUpdateBefore = getLastUpdate(TripSeine.class); - service.save(formDto); + service.save(formDto.getForm()); TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); @@ -381,7 +381,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { calendar.add(Calendar.HOUR, - 1); tripSeineDto.setLastUpdate(calendar.getTime()); - service.save(formDto); + service.save(formDto.getForm()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.