This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit e6cec26969eaef71c1e463b17a0d4638e410ce40 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) --- .../ird/observe/ui/content/ContentUIHandler.java | 5 +- .../content/impl/longline/BranchlineUIHandler.java | 29 ++-- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 127 +++++++------- ...tingObjectTransmittingBuoyOperationUIModel.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 31 ++-- .../impl/longline/ActivityLonglineUIHandler.java | 145 +++++++--------- .../open/impl/seine/ActivitySeineUIHandler.java | 98 +++++------ .../ui/content/ref/ContentReferenceUIHandler.java | 185 ++++++++++----------- .../ui/content/table/ContentTableUIHandler.java | 64 ++++--- .../v1/ReferentialServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 9 +- .../v1/seine/ActivitySeineServiceController.java | 4 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../services/service/ReferentialService.java | 2 +- .../service/longline/ActivityLonglineService.java | 8 +- .../service/seine/ActivitySeineService.java | 2 +- .../service/seine/FloatingObjectService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 35328 -> 36919 bytes ...on.zargo => observe-services-dto-common.zargo~} | Bin .../services/service/ReferentialServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 24 ++- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- 27 files changed, 381 insertions(+), 408 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index a6bb8ba..0406b97 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -442,9 +442,9 @@ public abstract class ContentUIHandler<E extends IdDto> { public final void saveUI(boolean refresh) { boolean ok = false; - //FIXME try { ok = doSave(getBean()); + } catch (Exception e) { ErrorDialogUI.showError(e); if (log.isErrorEnabled()) { @@ -457,7 +457,6 @@ public abstract class ContentUIHandler<E extends IdDto> { } } -//FIXME protected boolean doSave(E bean) throws Exception { return false; } @@ -504,8 +503,10 @@ public abstract class ContentUIHandler<E extends IdDto> { boolean ok = false; ui.stopEdit(); removeAllMessages(ui); + try { ok = doDelete(getBean()); + } catch (Exception e) { ErrorDialogUI.showError(e); if (log.isErrorEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index 04ab5e2..9a828bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -219,23 +219,20 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } - //FIXME -// @Override -// protected boolean doSave(BranchlineDto bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<BranchlineDto> binder) throws Exception { -// -// // bind back to model branchline -// BranchlineDto beanToSave = getModel().getBranchline(); + @Override + protected boolean doSave(BranchlineDto bean) throws Exception { + + // bind back to model branchline + BranchlineDto beanToSave = getModel().getBranchline(); + //FIXME // binder.copy(bean, beanToSave); -// -// // for external models -// getModel().fireSaved(); -// -// return true; -// -// } + + // for external models + getModel().fireSaved(); + + return true; + + } @Override public void resetEditUI() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index fef4675..17116e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -20,12 +20,12 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObjectDto' +<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObjectTransmittingBuoyDto' contentTitle='{n("observe.floatingObjectTransmittingBuoyOperation.title")}'> <import> fr.ird.observe.services.dto.ReferenceDto - fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto fr.ird.observe.services.dto.seine.TransmittingBuoyDto fr.ird.observe.services.dto.constants.seine.Ownership fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation @@ -51,7 +51,7 @@ <FloatingObjectTransmittingBuoyOperationUIModel id='model'/> <!-- edit bean --> - <FloatingObjectDto id='bean'/> + <FloatingObjectTransmittingBuoyDto id='bean'/> <!-- transmittingBuoy1 edit bean --> <TransmittingBuoyDto id='transmittingBuoy1' initializer='new TransmittingBuoyDto()'/> 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 5e24206..d461585 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 @@ -31,7 +31,9 @@ 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; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -41,6 +43,8 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.*; import java.awt.*; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIHandler<FloatingObjectDto> { +public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIHandler<FloatingObjectTransmittingBuoyDto> { /** Logger */ static private Log log = LogFactory.getLog(FloatingObjectTransmittingBuoyOperationUIHandler.class); @@ -103,7 +107,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH log.info("dcpId = " + dcpId); } - FloatingObjectDto bean = getBean(); + FloatingObjectTransmittingBuoyDto bean = getBean(); //FIXME // bean.clearTransmittingBuoy(); @@ -204,17 +208,18 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI ui = getUi(); addInfoMessage(t("observe.message.updating.floatingObject")); - //FIXME -// List<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); -// if (balises != null && !balises.isEmpty()) { -// TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); -// ui.getValidatorBalise1().setBean(transmittingBuoy1); -// -// if (balises.size() == 2) { -// TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); -// ui.getValidatorBalise2().setBean(transmittingBuoy2); -// } -// } + + Collection<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); + if (balises != null && !balises.isEmpty()) { + TransmittingBuoyDto transmittingBuoy1 = ui.getTransmittingBuoy1(); + ui.getValidatorBalise1().setBean(transmittingBuoy1); + + if (balises.size() == 2) { + TransmittingBuoyDto transmittingBuoy2 = ui.getTransmittingBuoy2(); + ui.getValidatorBalise2().setBean(transmittingBuoy2); + } + } + UIHelper.processDataBinding( ui, //FIXME @@ -243,16 +248,13 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } //FIXME -// @Override -// protected boolean doSave(FloatingObject bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<FloatingObject> binder) throws Exception { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// //FIXME, il faut declancher un evenement dans le cache du storage pour pouvoir redessiner le noeud -// return true; -// } + @Override + protected boolean doSave(FloatingObjectTransmittingBuoyDto bean) throws Exception { + + getTransmittingBuoyOperationService().save(bean); + //FIXME, il faut declancher un evenement dans le cache du storage pour pouvoir redessiner le noeud + return true; + } //FIXME // @Override @@ -304,12 +306,12 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } @Override - protected FormDto<FloatingObjectDto> loadToEdit(String id) { + protected FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String id) { return null; } @Override - protected FormDto<FloatingObjectDto> loadToReadDto(String id) { + protected FormDto<FloatingObjectTransmittingBuoyDto> loadToReadDto(String id) { return null; } @@ -322,22 +324,21 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } int nbBalises = typeOperation.getNbBalises(); - FloatingObjectDto bean = getBean(); + FloatingObjectTransmittingBuoyDto bean = getBean(); - //FIXME -// boolean hasBalise = !bean.isTransmittingBuoyEmpty(); -// -// List<TransmittingBuoyDto> objets = new ArrayList<TransmittingBuoyDto>(); -// if (!reset) { -// if (hasBalise) { -// objets.addAll(bean.getTransmittingBuoy()); -// } -// } -// -// if (hasBalise) { -// // always reset balise lues of editBean to avoid side-effects -// bean.getTransmittingBuoy().clear(); -// } + boolean hasBalise = !bean.isTransmittingBuoyEmpty(); + + List<TransmittingBuoyDto> objets = new ArrayList<TransmittingBuoyDto>(); + if (!reset) { + if (hasBalise) { + objets.addAll(bean.getTransmittingBuoy()); + } + } + + if (hasBalise) { + // always reset balise lues of editBean to avoid side-effects + bean.getTransmittingBuoy().clear(); + } // clean container JPanel editorPanel = ui.getTransmittingBuoys(); @@ -348,7 +349,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH ui.getTransmittingBuoyOperation1().getData(); TransmittingBuoyDto transmittingBuoy; - TransmittingBuoyOperationDto objectOperation; + ReferentialReferenceDto<TransmittingBuoyOperationDto> objectOperation; switch (nbBalises) { case 0: // no balise @@ -363,10 +364,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH case 1: //FIXME -// transmittingBuoy = reset ? null : objets.get(0); -// -// objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; -// bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); + transmittingBuoy = reset ? null : objets.get(0); + + objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(1, 0)); editorPanel.add(ui.getTransmittingBuoy1Editor()); @@ -378,13 +379,13 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH case 2: //FIXME -// transmittingBuoy = reset ? null : objets.get(0); -// objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; -// bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); -// -// transmittingBuoy = reset ? null : objets.get(1); -// objectOperation = reset ? getObjectOperation(operations, codeOperations[1]) : null; -// bindEditBalise(ui.getTransmittingBuoy2(), objectOperation, transmittingBuoy); + transmittingBuoy = reset ? null : objets.get(0); + objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); + + transmittingBuoy = reset ? null : objets.get(1); + objectOperation = reset ? getObjectOperation(operations, codeOperations[1]) : null; + bindEditBalise(ui.getTransmittingBuoy2(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(2, 0)); editorPanel.add(ui.getTransmittingBuoy1Editor()); @@ -408,7 +409,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } protected void bindEditBalise(TransmittingBuoyDto editBean, - TransmittingBuoyOperationDto transmittingBuoyOperation, + ReferentialReferenceDto<TransmittingBuoyOperationDto> transmittingBuoyOperation, TransmittingBuoyDto transmittingBuoy) { //FIXME @@ -416,12 +417,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH if (transmittingBuoy == null) { - //FIXME -// editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); + editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); if (log.isDebugEnabled()) { log.debug("Reuse an empty balise lue for objectOperation " + - transmittingBuoyOperation.getLabel1()); + transmittingBuoyOperation.getPropertyValue(TransmittingBuoyOperationDto.PROPERTY_LABEL1)); } if (isBalisePose(transmittingBuoyOperation)) { @@ -432,7 +432,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } } - FloatingObjectDto bean = getBean(); + FloatingObjectTransmittingBuoyDto bean = getBean(); // if (bean.getTransmittingBuoy() == null) { // bean.setTransmittingBuoy(new ArrayList<TransmittingBuoy>()); @@ -440,11 +440,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH // bean.getTransmittingBuoy().add(editBean); } - protected TransmittingBuoyOperationDto getObjectOperation(List<TransmittingBuoyOperationDto> objectOperations, + protected ReferentialReferenceDto<TransmittingBuoyOperationDto> getObjectOperation(List<ReferentialReferenceDto<TransmittingBuoyOperationDto>> objectOperations, String codeOperation) { - TransmittingBuoyOperationDto objectOperation = null; - for (TransmittingBuoyOperationDto op : objectOperations) { - if (codeOperation.equals(op.getCode())) { + ReferentialReferenceDto<TransmittingBuoyOperationDto> objectOperation = null; + for (ReferentialReferenceDto<TransmittingBuoyOperationDto> op : objectOperations) { + if (codeOperation.equals(op.getPropertyValue(TransmittingBuoyOperationDto.PROPERTY_CODE))) { objectOperation = op; break; } @@ -457,4 +457,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH return objectOperation; } + //FIXME + protected TransmittingBuoyOperationService getTransmittingBuoyOperationService() { + return null; + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java index 70dab24..815f408 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.seine; */ import fr.ird.observe.business.BinderService; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,7 +33,7 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIModel<FloatingObjectDto> { +public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIModel<FloatingObjectTransmittingBuoyDto> { private static final long serialVersionUID = 1L; @@ -41,7 +41,7 @@ public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIMod // protected TopiaEntityBinder<TransmittingBuoyDto> childLoador; public FloatingObjectTransmittingBuoyOperationUIModel() { - super(FloatingObjectDto.class); + super(FloatingObjectTransmittingBuoyDto.class); String binderName = getClass().getName() + "-open"; @@ -76,12 +76,12 @@ public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIMod // } @Override - protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( - FloatingObjectDto.class, - FloatingObjectDto.PROPERTY_COMMENT, - FloatingObjectDto.PROPERTY_OBJECT_OPERATION + BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> builder = binderService.newBinderBuilder( + FloatingObjectTransmittingBuoyDto.class, + FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT +// FloatingObjectTransmittingBuoyDto.PROPERTY_OBJECT_OPERATION ); return builder; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index dd172d4..32f9577 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; @@ -154,23 +155,15 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } //FIXME -// @Override -// protected boolean doSave(FloatingObject bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<FloatingObject> binder) throws Exception { -// -// String activityId = getSelectedParentId(); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, activityId, bean, binder, getCreateExecutor()); -// } else { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// } -// return true; -// } + @Override + protected boolean doSave(FloatingObjectDto bean) throws Exception { + + String activityId = getSelectedParentId(); + + getFloatingObjectService().save(activityId, bean); + + return true; + } //FIXME // @Override @@ -257,4 +250,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> // parentBean.removeFloatingObject(beanToDelete); // } + //FIXME + protected FloatingObjectService getFloatingObjectService() { + return null; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 4af6b58..7b21fd9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -22,13 +22,13 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.business.ObserveTechnicalException; 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.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -38,9 +38,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; -import java.util.Calendar; -import java.util.Date; - import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -271,36 +268,27 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity model.setModified(create); } - //FIXME -// @Override -// protected boolean doSave(ActivityLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<ActivityLongline> binder) throws Exception { -// -// if (log.isDebugEnabled()) { -// log.debug(" long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); -// } -// boolean create = bean.getTopiaId() == null; -// -// String tripId = getSelectedParentId(); -// -// bean.setOpen(true); -// -// if (create) { -// bean = dataService.create(dataSource, tripId, bean, binder, getCreateExecutor()); -// -// } else { -// -// dataService.update(dataSource, tripId, bean, getUpdateExecutor()); -// } -// -// updateTripEndDate(tripId); -// -// obtainChildPosition(bean, dataService, dataSource); -// -// return true; -// } + @Override + protected boolean doSave(ActivityLonglineDto bean) throws Exception { + + if (log.isDebugEnabled()) { + log.debug(" long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); + } + + String tripId = getSelectedParentId(); + + bean.setOpen(true); + + TripChildSaveResultDto saveResult = getActivityLonglineService().save(tripId, getModel().getBean()); + bean.setId(saveResult.getId()); + + setUpdateMareeNodeTag(saveResult.isTripEndDateUpdated()); + + //FIXME quand on gèrera l'arbre +// obtainChildPosition(bean); + + return true; + } //FIXME // @Override @@ -332,30 +320,26 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity // return beanToSave; // } - //FIXME -// @Override -// protected boolean doDelete(ActivityLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, ActivityLongline> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// if (log.isInfoEnabled()) { -// log.info("Will delete Activity " + bean.getTopiaId()); -// } -// -// String tripId = getSelectedParentId(); -// dataService.delete(dataSource, tripId, bean, deletor); -// if (log.isInfoEnabled()) { -// log.info("Delete done for Activity " + bean.getTopiaId()); -// } -// -// updateTripEndDate(tripId); -// return true; -// -// } + @Override + protected boolean doDelete(ActivityLonglineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + if (log.isInfoEnabled()) { + log.info("Will delete Activity " + bean.getId()); + } + + String tripId = getSelectedParentId(); + boolean wasTripEndDateUpdated = getActivityLonglineService().delete(tripId, bean.getId()); + if (log.isInfoEnabled()) { + log.info("Delete done for Activity " + bean.getId()); + } + + setUpdateMareeNodeTag(wasTripEndDateUpdated); + return true; + + } //FIXME // @Override @@ -392,31 +376,20 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity public static final String UPDATE_MAREE_NODE = "updateTripNode"; - //FIXME -// protected void updateTripEndDate(String tripId) { -// -// boolean wasUpdated; -// -// // on met a jour si necessaire la date de fin de la maree -// try { -// wasUpdated = getDataService().updateEndDate(getDataSource(), tripId); -// -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Could not update end date", e); -// } -// -// if (wasUpdated) { -// -// // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner -// getUi().setContextValue(Boolean.TRUE, UPDATE_MAREE_NODE); -// -// } else { -// -// getUi().removeContextValue(Boolean.class, UPDATE_MAREE_NODE); -// -// } -// -// } + protected void setUpdateMareeNodeTag(boolean wasUpdated) { + + if (wasUpdated) { + + // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner + getUi().setContextValue(Boolean.TRUE, UPDATE_MAREE_NODE); + + } else { + + getUi().removeContextValue(Boolean.class, UPDATE_MAREE_NODE); + + } + + } protected void repaintTripNode() { @@ -437,4 +410,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } + //FIXME + protected ActivityLonglineService getActivityLonglineService() { + return null; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 60ff366..23e0109 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -23,27 +23,23 @@ package fr.ird.observe.ui.content.open.impl.seine; 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.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; -import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import java.util.Date; import java.util.HashSet; -import java.util.List; import java.util.Set; import static org.nuiton.i18n.I18n.n; @@ -314,34 +310,25 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei model.setModified(create); } - //FIXME -// @Override -// protected boolean doSave(ActivitySeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<ActivitySeine> binder) throws Exception { -// -// if (log.isDebugEnabled()) { -// log.debug(" long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); -// } -// boolean create = bean.getTopiaId() == null; -// -// String routeId = getSelectedParentId(); -// -// bean.setOpen(true); -// -// if (create) { -// bean = dataService.create(dataSource, routeId, bean, binder, getCreateExecutor()); -// -// } else { -// -// dataService.update(dataSource, routeId, bean, getUpdateExecutor()); -// } -// -// obtainChildPosition(bean, dataService, dataSource); -// -// return true; -// } + @Override + protected boolean doSave(ActivitySeineDto bean) throws Exception { + + if (log.isDebugEnabled()) { + log.debug(" long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); + } + + String routeId = getSelectedParentId(); + + bean.setOpen(true); + + String beanId = getActivitySeineService().save(routeId, getModel().getBean()); + bean.setId(beanId); + + //FIXME quand on gèrera l'arbre +// obtainChildPosition(bean); + + return true; + } //FIXME // @Override @@ -378,27 +365,24 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei // return beanToSave; // } - //FIXME -// @Override -// protected boolean doDelete(ActivitySeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, ActivitySeine> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// if (log.isInfoEnabled()) { -// log.info("Will delete Activity " + bean.getTopiaId()); -// } -// -// String routeId = getSelectedParentId(); -// dataService.delete(dataSource, routeId, bean, deletor); -// if (log.isInfoEnabled()) { -// log.info("Delete done for Activity " + bean.getTopiaId()); -// } -// return true; -// } + @Override + protected boolean doDelete(ActivitySeineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + if (log.isInfoEnabled()) { + log.info("Will delete Activity " + bean.getId()); + } + + String routeId = getSelectedParentId(); + getActivitySeineService().delete(routeId, bean.getId()); + + if (log.isInfoEnabled()) { + log.info("Delete done for Activity " + bean.getId()); + } + return true; + } //FIXME @@ -460,4 +444,10 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } + + //FIXME + protected ActivitySeineService getActivitySeineService() { + return null; + } + } 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 ddfd2b5..b560617 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 @@ -29,8 +29,10 @@ import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.service.ReferentialService; @@ -38,6 +40,7 @@ import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.usage.UsagesUI; import fr.ird.observe.ui.util.SpringUtilities; import jaxx.runtime.JAXXContext; @@ -625,53 +628,47 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } //FIXME -// @Override -// protected boolean doSave(E bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<E> binder) throws Exception { -// -// ContentReferenceUIModel<EDto> model = getModel(); -// -// if (bean.getTopiaId() == null) { -// -// if (log.isInfoEnabled()) { -// log.info("Create referentiel " + bean); -// } -// dataService.create(dataSource, -// null, -// bean, -// binder, -// getCreateExecutor() -// ); -// -// if (bean instanceof Program) { -// -// // add the program in tree -// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); -// treeHelper.addProgram((Program) bean); -// } -// -// return true; -// } -// -// if (log.isInfoEnabled()) { -// log.info("Will update exisintg entity : " + bean.getTopiaId()); -// } -// // le bean original -// E oldBean = model.getSelectedBean(); -// -// if (oldBean != null && -// oldBean.getStatus() == ReferenceStatus.enabled && -// bean.getStatus() == ReferenceStatus.disabled) { -// -// // l'entite a ete desactive -// // on recherche les objets utilisant cette entitee -// // on indique a l'utilisateur ce changement -// if (log.isDebugEnabled()) { -// log.debug("entity status was desactivated, looking " + -// "for usage"); -// } + @Override + protected boolean doSave(E bean) throws Exception { + + ContentReferenceUIModel<E> model = getModel(); + + if (bean.getId() == null) { + + if (log.isInfoEnabled()) { + log.info("Create referentiel " + bean); + } + + String beanId = getReferentialService().save(bean); + bean.setId(beanId); + + if (bean instanceof ProgramDto) { + + // add the program in tree + ObserveTreeHelper treeHelper = getTreeHelper(getUi()); + treeHelper.addProgram((ProgramDto) bean); + } + + return true; + } + + if (log.isInfoEnabled()) { + log.info("Will update exisintg entity : " + bean.getId()); + } + // le bean original + E oldBean = model.getSelectedBean(); + + if (oldBean != null && + oldBean.getStatus() == ReferenceStatus.enabled && + bean.getStatus() == ReferenceStatus.disabled) { + + // l'entite a ete desactive + // on recherche les objets utilisant cette entitee + // on indique a l'utilisateur ce changement + if (log.isDebugEnabled()) { + log.debug("entity status was desactivated, looking " + + "for usage"); + } // EntityMap usages = dataService.findAllUsages(dataSource, bean); // // if (usages.isEmpty()) { @@ -690,23 +687,22 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // return false; // } // } -// } -// // sauvegarde du bean d'edition dans le bean de la base -// bean = dataService.update(dataSource, -// null, // pas de parent a sauvegarder -// bean, -// getUpdateExecutor() -// ); -// -// if (bean instanceof Program) { -// -// // update the program in tree -// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); -// treeHelper.updateProgram((Program) bean); -// } -// -// return true; -// } + } + + + // sauvegarde du bean d'edition dans le bean de la base + String beanId = getReferentialService().save(bean); + bean.setId(beanId); + + if (bean instanceof ProgramDto) { + + // update the program in tree + ObserveTreeHelper treeHelper = getTreeHelper(getUi()); + treeHelper.updateProgram((ProgramDto) bean); + } + + return true; + } //FIXME // @Override @@ -720,19 +716,16 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content //FIXME @Override -// protected boolean doDelete(E bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { -// -// ContentReferenceUI<E> ui = getUi(); -// ContentReferenceUIModel<EDto> model = getModel(); -// -// if (log.isInfoEnabled()) { -// log.info("entity to be deleted, looking for usage"); -// } -// -// // recherche des utilisation du bean dans la base + protected boolean doDelete(E bean) throws Exception { + + ContentReferenceUI<E> ui = getUi(); + ContentReferenceUIModel<E> model = getModel(); + + if (log.isInfoEnabled()) { + log.info("entity to be deleted, looking for usage"); + } + + // recherche des utilisation du bean dans la base // EntityMap usages = dataService.findAllUsages(getDataSource(), bean); // // if (usages.isEmpty()) { @@ -748,22 +741,22 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // showUsagesForDelete(ui, bean, usages); // return false; // } -// -// if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { -// return false; -// } -// -// String beanId = bean.getTopiaId(); -// dataService.delete(dataSource, null, bean, deletor); -// -// if (bean instanceof Program) { -// -// // remove the program in tree -// ObserveTreeHelper treeHelper = getTreeHelper(getUi()); -// treeHelper.removeProgram(beanId); -// } -// return true; -// } + + if (!UIHelper.confirmForEntityDelete(ui, model.getBeanType(), bean)) { + return false; + } + + String beanId = bean.getId(); + getReferentialService().delete(getBeanType(), beanId); + + if (bean instanceof ProgramDto) { + + // remove the program in tree + ObserveTreeHelper treeHelper = getTreeHelper(getUi()); + treeHelper.removeProgram(beanId); + } + return true; + } //FIXME // @Override @@ -872,4 +865,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content FormDto<E> formDto = referentialService.loadToRead(getBeanType(), id); return formDto; } + + //FIXME + protected ReferentialService getReferentialService() { + return null; + } + } 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 d0e2558..67a5e5e 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 @@ -36,6 +36,7 @@ import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ObserveContentUI; import fr.ird.observe.ui.tree.ObserveNode; +import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -346,42 +347,35 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex } //FIXME -// @Override -// protected boolean doSave(E bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<E> binder) throws Exception { -// -// ObserveContentTableUI<E, D> ui = getUi(); -// -// List<D> objets = ui.getTableModel().getData(); -// -// boolean canContinue; -// try { -// canContinue = prepareSave(bean, objets); -// } catch (Exception e) { -// if (log.isErrorEnabled()) { -// log.error(e); -// } -// ErrorDialogUI.showError(e); -// canContinue = false; -// } -// if (!canContinue) { -// -// // l'utilisateur a choisi de ne pas sauvegarder -// return false; -// } -// doPersist(bean, dataService, dataSource); -// -// -// return true; -// } + @Override + protected boolean doSave(E bean) throws Exception { - //FIXME -// protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { -// // sauvegarde du bean en base -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// } + ObserveContentTableUI<E, D> ui = getUi(); + + List<D> objets = ui.getTableModel().getData(); + + boolean canContinue; + try { + canContinue = prepareSave(bean, objets); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error(e); + } + ErrorDialogUI.showError(e); + canContinue = false; + } + if (!canContinue) { + + // l'utilisateur a choisi de ne pas sauvegarder + return false; + } + doPersist(bean); + + + return true; + } + + protected abstract void doPersist(E bean); //FIXME // @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index a917f4f..c28786d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -68,8 +68,8 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override - public <R extends ReferentialDto> String save(FormDto<R> form) { - return service.save(form); + public <R extends ReferentialDto> String save(R bean) { + return service.save(bean); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 88ed874..10d8c27 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -26,6 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; import java.util.List; @@ -60,12 +61,12 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public String save(String tripLonglineId, FormDto<ActivityLonglineDto> form) { - return service.save(tripLonglineId, form); + public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto bean) { + return service.save(tripLonglineId, bean); } @Override - public void delete(String tripLonglineId, String activityLonglineId) { - service.delete(tripLonglineId, activityLonglineId); + public boolean delete(String tripLonglineId, String activityLonglineId) { + return service.delete(tripLonglineId, activityLonglineId); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index daec866..7c0d960 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -60,8 +60,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public String save(String routeId, FormDto<ActivitySeineDto> form) { - return service.save(routeId, form); + public String save(String routeId, ActivitySeineDto dto) { + return service.save(routeId, dto); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index a819989..f2b2ce4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -60,8 +60,8 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public String save(String activitySeineId, FormDto<FloatingObjectDto> form) { - return service.save(activitySeineId, form); + public String save(String activitySeineId, FloatingObjectDto dto) { + return service.save(activitySeineId, dto); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java index 53171fc..a291d0f 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java @@ -47,7 +47,7 @@ public class TransmittingBuoyOperationServiceController extends ObserveAuthentic } @Override - public String save(FormDto<FloatingObjectTransmittingBuoyDto> form) { - return service.save(form); + public String save(FloatingObjectTransmittingBuoyDto dto) { + return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 950b4fe..9d4921f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -60,7 +60,7 @@ public interface ReferentialService extends ObserveService { @WriteReferentialPermission @Write @PostRequest - <R extends ReferentialDto> String save(FormDto<R> form); + <R extends ReferentialDto> String save(R bean); @WriteReferentialPermission @Write diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index 607a902..14812b8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -26,6 +26,7 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -54,10 +55,13 @@ public interface ActivityLonglineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String tripLonglineId, FormDto<ActivityLonglineDto> form); + TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto bean); @Write @WriteDataPermission @DeleteRequest - void delete(String tripLonglineId, String activityLonglineId); + /** + * @return true if the trip end date has been updated + */ + boolean delete(String tripLonglineId, String activityLonglineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 161bd55..cb6549d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -54,7 +54,7 @@ public interface ActivitySeineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String routeId, FormDto<ActivitySeineDto> form); + String save(String routeId, ActivitySeineDto dto); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index 424aa7d..7a541fd 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -54,7 +54,7 @@ public interface FloatingObjectService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String activitySeineId, FormDto<FloatingObjectDto> form); + String save(String activitySeineId, FloatingObjectDto dto); @Write @WriteDataPermission diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index 88cf87e..72987d9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -44,6 +44,6 @@ public interface TransmittingBuoyOperationService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<FloatingObjectTransmittingBuoyDto> form); + String save(FloatingObjectTransmittingBuoyDto dto); } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 59c5da7..346fde6 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ similarity index 100% copy from observe-services-model/src/main/xmi/observe-services-dto-common.zargo copy to observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 70b7b16..0b8c41f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -86,10 +86,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return form; } - public <D extends ReferentialDto> String save(FormDto<D> form) { - Class<D> dtoType = form.getType(); + public <D extends ReferentialDto> String save(D bean) { + Class<D> dtoType = (Class<D>) bean.getClass(); Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = dtoToEntity(dtoType, entityType, form.getForm()); + TopiaEntity entity = dtoToEntity(dtoType, entityType, bean); entity = saveEntity(entityType, entity); FormDto<D> model = entityToEditFormDto(dtoType, entityType, entity); return model.getForm().getId(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 101dd16..b0e1928 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -27,11 +27,13 @@ import com.google.common.collect.Lists; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; @@ -140,16 +142,18 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public String save(String tripLonglineId, FormDto<ActivityLonglineDto> form) { + public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto activityLonglineDto) { - TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + TripChildSaveResultDto result = new TripChildSaveResultDto(); - ActivityLonglineDto activityLonglineDto = form.getForm(); + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); ActivityLongline activityLongline = dtoToEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineDto); activityLongline = saveEntity(ActivityLongline.class, activityLongline); + result.setId(activityLongline.getTopiaId()); + if (activityLonglineDto.isNotPersisted()) { tripLongline.addActivityLongline(activityLongline); @@ -158,12 +162,17 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } - return activityLongline.getTopiaId(); + TripLonglineTopiaDao tripLonglineTopiaDao = getTopiaPersistenceContext().getTripLonglineDao(); + boolean wasEndDateUpdated = tripLonglineTopiaDao.updateEndDate(tripLongline); + + result.setTripEndDateUpdated(wasEndDateUpdated); + + return result; } @Override - public void delete(String tripLonglineId, String activityLonglineId) { + public boolean delete(String tripLonglineId, String activityLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -177,7 +186,10 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements tripLongline.removeActivityLongline(activityLongline); - } + TripLonglineTopiaDao tripLonglineTopiaDao = getTopiaPersistenceContext().getTripLonglineDao(); + boolean wasEndDateUpdated = tripLonglineTopiaDao.updateEndDate(tripLongline); + return wasEndDateUpdated; + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 2dc4065..4c286b4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -140,12 +140,10 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override - public String save(String routeId, FormDto<ActivitySeineDto> form) { + public String save(String routeId, ActivitySeineDto activitySeineDto) { Route route = loadEntity(RouteDto.class, Route.class, routeId); - ActivitySeineDto activitySeineDto = form.getForm(); - ActivitySeine activitySeine = dtoToEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineDto); activitySeine = saveEntity(ActivitySeine.class, activitySeine); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index de441c3..18a8b19 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -92,12 +92,10 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public String save(String activitySeineId, FormDto<FloatingObjectDto> form) { + public String save(String activitySeineId, FloatingObjectDto floatingObjectDto) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - FloatingObjectDto floatingObjectDto = form.getForm(); - FloatingObject floatingObject = dtoToEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectDto); floatingObject = saveEntity(FloatingObject.class, floatingObject); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java index b8027b9..a505456 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -64,10 +64,10 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i } @Override - public String save(FormDto<FloatingObjectTransmittingBuoyDto> form) { + public String save(FloatingObjectTransmittingBuoyDto dto) { FloatingObject floatingObject = - dtoToEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, form.getForm()); + dtoToEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, dto); floatingObject = saveEntity(FloatingObject.class, floatingObject); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit eefe00196889adb745c6adbef684867164ecfaee Merge: a74653a 3f97619 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 10:34:07 2015 +0200 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 Conflicts: observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java observe-application-swing/pom.xml | 11 + .../src/main/filters/observe-ui.properties | 1 + .../java/fr/ird/observe/ObserveActionExecutor.java | 22 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 30 +- .../main/java/fr/ird/observe/ObserveConfig.java | 1004 ----- .../main/java/fr/ird/observe/ObserveContext.java | 594 --- .../fr/ird/observe/ObserveResourceManager.java | 20 +- .../main/java/fr/ird/observe/ObserveRunner.java | 74 +- .../{business => }/ObserveServiceHelper.java | 63 +- .../observe/ObserveSwingApplicationContext.java | 764 ++++ .../fr/ird/observe/business/IObserveConfig.java | 4 +- .../business/ObserveApplicationContext.java | 9 +- .../ird/observe/business/db/DataSourceConfig.java | 2 +- .../ird/observe/business/db/DataSourceFactory.java | 2 +- .../db/constants/CommonDataSourceConfigParam.java | 1 + .../business/report/model/ReportExecute.java | 15 +- .../business/validation/ObserveValidator.java | 6 +- .../validation/ValidationMessageDetector.java | 2 +- .../ObserveApplicationConfigProvider.java | 7 +- .../ObserveSwingApplicationConfig.java | 1152 +++++ .../ObserveSwingApplicationConfigOption.java} | 217 +- .../ObserveSwingApplicationConfigProvider.java | 37 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 304 ++ .../constantes}/ConnexionStatus.java | 2 +- .../constants => db/constantes}/CreationMode.java | 28 +- .../db/constants => db/constantes}/DbMode.java | 7 +- .../db/event/ObserveSwingDataSourceEvent.java | 83 + .../db/event/ObserveSwingDataSourceListener.java | 75 + .../ObserveSwingDataSourceListenerAdapter.java} | 41 +- .../src/main/java/fr/ird/observe/package.html | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 51 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 12 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 18 +- .../actions/ChangeApplicationLanguageAction.java | 12 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 12 +- .../observe/ui/actions/ChangeStorageAction.java | 6 +- .../observe/ui/actions/CloseApplicationAction.java | 6 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 10 +- .../ird/observe/ui/actions/CloseStorageAction.java | 21 +- .../fr/ird/observe/ui/actions/GotoSiteAction.java | 8 +- .../ui/actions/ImportStorageFromFileAction.java | 9 +- .../ird/observe/ui/actions/LaunchAdminAction.java | 4 +- .../ui/actions/ReloadApplicationAction.java | 8 +- .../actions/ReloadDefaultConfigurationAction.java | 12 +- .../observe/ui/actions/ReloadResourcesAction.java | 8 +- .../observe/ui/actions/ReloadStorageAction.java | 92 +- .../ui/actions/SaveStorageToFileAction.java | 32 +- .../ird/observe/ui/actions/ShowConfigAction.java | 128 +- .../observe/ui/actions/ShowStorageInfoAction.java | 4 +- .../observe/ui/actions/StartServerModeAction.java | 7 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 6 +- .../ui/actions/shared/CloseOpenUIAction.java | 6 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 6 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 33 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 28 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 107 +- .../observe/ui/admin/config/ConfigUIHandler.java | 2 - .../ui/admin/consolidate/ConsolidateModel.java | 8 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 14 +- .../observe/ui/admin/export/ExportUIHandler.java | 12 +- .../ui/admin/gps/GPSActivityTableModel.java | 4 +- .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 6 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 5 +- .../observe/ui/admin/report/ReportUIHandler.java | 21 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 28 +- .../ObsoleteEntityListCellRenderer.java | 4 +- .../ui/admin/synchronize/SynchronizeModel.java | 20 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 17 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 6 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../observe/ui/admin/validate/ValidateModel.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 11 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 15 +- .../ird/observe/ui/content/ContentUIHandler.java | 143 +- .../observe/ui/content/ContentUIInitializer.java | 215 +- .../content/impl/longline/BranchlineUIHandler.java | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../LonglineDetailCompositionUIHandler.java | 28 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 10 - .../impl/longline/SetLonglineUIHandler.java | 11 - .../ActivitySeineObservedSystemUIHandler.java | 11 - .../impl/seine/FloatingObjectUIHandler.java | 11 - .../ui/content/impl/seine/SetSeineUIHandler.java | 11 - .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/open/ContentOpenableUIHandler.java | 10 - .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 1 + .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 - .../ui/content/ref/UniqueKeyTableModel.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 25 +- .../impl/longline/CatchLonglineUIHandler.java | 21 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 12 +- .../table/impl/longline/SensorUsedUIHandler.java | 9 +- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 18 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 19 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 10 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 3 +- .../ui/storage/StorageBackupUILauncher.java | 68 +- .../ird/observe/ui/storage/StorageUIHandler.java | 893 ++-- .../ird/observe/ui/storage/StorageUILauncher.java | 52 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 1213 +++--- .../ird/observe/ui/storage/tabs/ChooseDbModeUI.css | 13 + .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 14 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 26 + .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 46 +- .../ui/storage/tabs}/DataSelectionModel.java | 255 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 67 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 23 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 95 +- .../ui/tree/NavigationTreeSelectionModel.java | 4 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 10 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 14 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 4 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 6 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 4 +- .../util/ObserveValidatorMessageTableRenderer.java | 4 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 12 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 1823 ++++---- .../observe-application-swing_es_ES.properties | 2125 +++++----- .../observe-application-swing_fr_FR.properties | 4405 ++++++++++---------- .../src/main/resources/icons/action-db-server.png | Bin 0 -> 923 bytes .../src/main/resources/observeSwing.conf | 5 + ...glineDetailCompositionValidatorServiceTest.java | 127 +- .../DataSourceDumpProducerServiceController.java | 29 + .../controller/v1/DataSourceServiceController.java | 3 +- .../web/controller/v1/PingServiceController.java | 8 +- .../ObserveWebSecurityApplicationContext.java | 2 +- observe-entities/pom.xml | 62 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../ird/observe/services/service/PingService.java | 2 + observe-services-configuration-api/pom.xml | 6 + .../configuration/ObserveDataSourceConnection.java | 5 + .../ObserveDataSourceConnectionSupport.java | 13 +- observe-services-configuration-rest/pom.xml | 6 + .../ObserveDataSourceConnectionRest.java | 7 +- observe-services-configuration-topia/pom.xml | 4 +- .../ObserveDataSourceConnectionTopia.java | 7 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../observe/services/dto/gson/VersionAdapter.java | 36 + .../services/dto/referential/ProgramDtos.java | 44 + .../services/dto/referential/ReferentialDtos.java | 116 +- .../ird/observe/services/TestMethodResource.java | 2 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 35 + .../services/ObserveServiceContextTopia.java | 3 + .../EntityToReferentialReferenceDtoBuilder.java | 13 + .../services/dto/ObserveDtosInitializer.java | 284 +- .../services/service/DataSourceServiceTopia.java | 12 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 3 +- ...EntityToReferentialReferenceDtoBuilderTest.java | 57 + pom.xml | 3 + 180 files changed, 10010 insertions(+), 8264 deletions(-) diff --cc observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index ada124a,1847895..a0a11aa --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@@ -21,8 -21,10 +21,9 @@@ */ package fr.ird.observe.ui.content.open.impl.seine; +import fr.ird.observe.ObserveContext; + 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.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 71a5e4e4fa2cdbcf01bbe3a09a18ad240b1ee573 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 505e400..ae21928 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 b76cd00..b0016d7 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 @@ -40,12 +40,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; @@ -200,8 +198,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); @@ -211,6 +209,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 { @@ -289,7 +289,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>.