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

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5788fd3703e5130023c0c889b8ca7148f38dc765 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) --- .../content/impl/longline/BranchlineUIHandler.java | 8 ++--- .../LonglineDetailCompositionUIHandler.java | 36 ++++++++++++---------- .../LonglineDetailCompositionUIInitializer.java | 4 --- .../longline/LonglineDetailCompositionUIModel.java | 7 ----- .../impl/longline/ActivityLonglinesUIHandler.java | 26 ++++++++-------- .../list/impl/longline/TripLonglinesUIHandler.java | 27 ++++++++-------- .../list/impl/seine/ActivitySeinesUIHandler.java | 26 ++++++++-------- .../content/list/impl/seine/RoutesUIHandler.java | 25 +++++++-------- .../list/impl/seine/TripSeinesUIHandler.java | 29 ++++++++--------- .../ActivityLonglineServiceController.java | 5 ++- .../v1/longline/TripLonglineServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 5 ++- .../v1/seine/RouteServiceController.java | 5 ++- .../v1/seine/TripSeineServiceController.java | 5 ++- .../service/longline/ActivityLonglineService.java | 5 ++- .../service/longline/TripLonglineService.java | 5 ++- .../service/seine/ActivitySeineService.java | 5 ++- .../services/service/seine/RouteService.java | 5 ++- .../services/service/seine/TripSeineService.java | 5 ++- .../longline/ActivityLonglineServiceTopia.java | 30 +++++++++--------- .../service/longline/TripLonglineServiceTopia.java | 25 ++++++++------- .../service/seine/ActivitySeineServiceTopia.java | 28 +++++++++-------- .../services/service/seine/RouteServiceTopia.java | 24 +++++++++------ .../service/seine/TripSeineServiceTopia.java | 25 ++++++++------- 24 files changed, 184 insertions(+), 186 deletions(-) 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 f3d5478..52f3c67 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 @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineDtos; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -81,9 +82,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { } getModel().setBranchline(branchline); - //FIXME -// getLoadBinder().copy(branchline, getBean()); -// loadBean(branchline); + BranchlineDtos.copyBranchlineDto(branchline, getBean()); if (branchline == null) { @@ -223,8 +222,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { // bind back to model branchline BranchlineDto beanToSave = getModel().getBranchline(); - //FIXME -// binder.copy(bean, beanToSave); + BranchlineDtos.copyBranchlineDto(bean, beanToSave); // for external models getModel().fireSaved(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 56da8e2..8de09df 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -27,11 +27,14 @@ 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.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; 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.service.longline.SetLonglineService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -90,7 +93,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void tableChanged(TableModelEvent e) { SectionsTableModel source = (SectionsTableModel) e.getSource(); - //FIXME +// FIXME // onSectionsTableModelChanged(source.getData()); } }; @@ -309,8 +312,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(getUi()); - //FIXME -// uiInitializer.initUI(getDataSource()); + uiInitializer.initUI(); LonglineDetailCompositionUI ui1 = getUi(); @@ -372,10 +374,6 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong super.openUI(); - // Load binders (used to load section, basket, branchline binders...) - //FIXME -// getLoadBinder(); - { // open brancheline detail BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); @@ -388,20 +386,22 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong log.info("setId = " + setId); } ContentMode mode = computeContentMode(); + // utilisation du mode requis + setContentMode(mode); - //FIXME -// DataService dataService = getDataService(); + SetLonglineService setLonglineService = getSetLonglineService(); - DataSource source = getDataSource(); + FormDto<SetLonglineDto> setLonglineDtoFormDto; + if (mode == ContentMode.READ) { + setLonglineDtoFormDto = setLonglineService.loadToRead(setId); - // update mode - //FIXME -// dataService.loadEditEntity(source, setId, getLoadExecutor()); - - // utilisation du mode requis - setContentMode(mode); + } else { + setLonglineDtoFormDto = setLonglineService.loadToEdit(setId); + } + getModel().setFormDto(setLonglineDtoFormDto); SetLonglineDto bean = getBean(); + SetLonglineDtos.copySetLonglineDto(setLonglineDtoFormDto.getForm(), bean); //FIXME Validate this default date if (log.isInfoEnabled()) { @@ -1618,4 +1618,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } + 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/impl/longline/LonglineDetailCompositionUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index 2262b7d..37dbbcd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -58,10 +58,6 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer LonglineDetailCompositionUIModel model = ui.getModel(); - // To be sure all loaders are initialized - //FIXME -// model.getLoadBinder(); - { // init section templates table JTable table = ui.getSectionTemplatesTable(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java index ebd363b..fea3f23 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java @@ -61,13 +61,6 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline protected boolean branchlineDetailTabValid; - //FIXME -// protected TopiaEntityBinder<SectionDto> sectionBinder; -// -// protected TopiaEntityBinder<BasketDto> basketBinder; -// -// protected TopiaEntityBinder<BranchlineDto> branchlineBinder; - public LonglineDetailCompositionUIModel() { super(SetLonglineDto.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 87ff3e9..d3b6aa2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -22,17 +22,21 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +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.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; 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.service.longline.ActivityLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -110,18 +114,14 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected List<ReferenceDto> getChilds(TripLonglineDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; + ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ReferenceSetDto<ActivityLonglineStubDto> activityLonglineStubByRoute = service.getActivityLonglineStubByRoute(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + activityLonglineStubByRoute.sizeReference() + " activities."); + } + + return new ArrayList<>(activityLonglineStubByRoute.getReference()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index ac6da70..5548135 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -22,17 +22,21 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +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.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -93,19 +97,14 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected List<ReferenceDto> getChilds(ProgramDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " trips."); -// } -// -// return list; - - return null; + TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + ReferenceSetDto<TripLonglineStubDto> tripLonglineStubByProgram = service.getTripLonglineStubByProgram(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + tripLonglineStubByProgram.sizeReference() + " trips."); + } + + return new ArrayList<>(tripLonglineStubByProgram.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index b24fd39..405edc7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -21,17 +21,21 @@ */ package fr.ird.observe.ui.content.list.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.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -108,18 +112,14 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { - DataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; + ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ReferenceSetDto<ActivitySeineStubDto> activitySeineStubByRoute = service.getActivitySeineStubByRoute(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + activitySeineStubByRoute.sizeReference() + " activities."); + } + + return new ArrayList<>(activitySeineStubByRoute.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index fcd5f74..d424f3c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -21,16 +21,21 @@ */ package fr.ird.observe.ui.content.list.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.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -104,18 +109,14 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected List<ReferenceDto> getChilds(TripSeineDto bean) { - //FIXME -// DataSource source = getDataSource(); -// DataService dataService = getDataService(); -// -// List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " routes."); -// } -// -// return list; - return null; + RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + ReferenceSetDto<RouteStubDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + routeByTripSeine.sizeReference() + " routes."); + } + + return new ArrayList<>(routeByTripSeine.getReference()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 388068d..2dcd5a4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -21,16 +21,21 @@ */ package fr.ird.observe.ui.content.list.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.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -88,19 +93,15 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected List<ReferenceDto> getChilds(ProgramDto bean) { - //FIXME -// DataSource source = getDataSource(); -// DataService dataService = getDataService(); -// -// List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " trips."); -// } -// -// return list; - - return null; - + + TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); + + if (log.isDebugEnabled()) { + log.debug("Will use " + tripSeineByProgram.sizeReference() + " trips."); + } + + return new ArrayList<>(tripSeineByProgram.getReference()); + } } 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 10d8c27..cefa9dc 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 @@ -24,13 +24,12 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; 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; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -41,7 +40,7 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { return service.getActivityLonglineStubByRoute(tripLonglineId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index a3dc624..52ede2b 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.service.longline.TripLonglineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { return service.getTripLonglineStubByProgram(programId); } 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 7c0d960..263fba8 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 @@ -24,12 +24,11 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { return service.getActivitySeineStubByRoute(routeId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index 4b65180..fa69e04 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -24,13 +24,12 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -41,7 +40,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(tripSeineId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index e346f06..749e6f4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +39,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } 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 14812b8..0889ff9 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; @@ -33,15 +34,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission - List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); + ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 1cf2937..be7c753 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripLonglineService extends ObserveService { @ReadDataPermission - List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); + ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); @ReadDataPermission FormDto<TripLonglineDto> loadToRead(String tripLonglineId); 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 cb6549d..a7c1337 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivitySeineService extends ObserveService { @ReadDataPermission - List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); + ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 0c53283..242c630 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -33,15 +34,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface RouteService extends ObserveService { @ReadDataPermission - List<RouteStubDto> getRouteByTripSeine(String tripSeineId); + ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId); @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 74707e9..10d0a82 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -32,15 +33,13 @@ import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripSeineService extends ObserveService { @ReadDataPermission - List<TripSeineStubDto> getTripSeineByProgram(String programId); + ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId); @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); 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 b0e1928..a2291e9 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 @@ -22,14 +22,19 @@ package fr.ird.observe.services.service.longline; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.collect.Sets; 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.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -39,7 +44,7 @@ import fr.ird.type.CoordinateHelper; import java.util.Calendar; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,29 +52,26 @@ import java.util.List; public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLonglineService { @Override - public List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { ReferenceLocale referenceLocale = getReferenceLocale(); TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - List<ActivityLonglineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivityLonglineStubDto>> stubs = Sets.newLinkedHashSet(); for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { - ActivityLonglineStubDto stub = new ActivityLonglineStubDto(); - - stub.setId(activityLongline.getTopiaId()); - - stub.setTimeStamp(activityLongline.getTimeStamp()); - - stub.setVesselActivityLonglineLabel(referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); - - stub.setHasSetLongline(activityLongline.getSetLongline() != null); + ReferenceDto<ActivityLonglineStubDto> stub = entityToReferenceDto(ActivityLonglineStubDto.class, activityLongline); + stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<ActivityLonglineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(ActivityLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 23e3de1..50a70f8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -22,13 +22,17 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.Lists; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -36,6 +40,7 @@ import org.nuiton.util.DateUtil; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,28 +53,26 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { + public ReferenceSetDto<TripLonglineStubDto> getTripLonglineStubByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, referenceLocale); - List<TripLonglineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<TripLonglineStubDto>> stubs = Sets.newLinkedHashSet(); for (TripLongline tripLongline : tripLonglines) { - TripLonglineStubDto stub = new TripLonglineStubDto(); - stub.setId(tripLongline.getTopiaId()); - stub.setStartDate(tripLongline.getStartDate()); - stub.setEndDate(tripLongline.getEndDate()); - stub.setVesselLabel(referenceLocale.getLabel(tripLongline.getVessel())); - stub.setObserverLabel(tripLongline.getObserverLabel()); - + ReferenceDto<TripLonglineStubDto> stub = entityToReferenceDto(TripLonglineStubDto.class, tripLongline); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(TripLongline.class); + ReferenceSetDto<TripLonglineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override 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 4c286b4..9e730e8 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 @@ -22,14 +22,17 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import fr.ird.observe.entities.constants.ReferenceLocale; +import com.google.common.collect.Sets; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -38,7 +41,7 @@ import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,25 +50,24 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - - ReferenceLocale referenceLocale = getReferenceLocale(); + public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); - List<ActivitySeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivitySeineStubDto>> stubs = Sets.newLinkedHashSet(); for (ActivitySeine activitySeine : route.getActivitySeine()) { - ActivitySeineStubDto stub = new ActivitySeineStubDto(); - stub.setId(activitySeine.getTopiaId()); - stub.setTime(activitySeine.getTime()); - stub.setVesselActivitySeineLabel(referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setHasSetSeine(activitySeine.getSetSeine() != null); + ReferenceDto<ActivitySeineStubDto> stub = entityToReferenceDto(ActivitySeineStubDto.class, activitySeine); + stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<ActivitySeineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(ActivitySeineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index c352c86..d80de13 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -22,14 +22,19 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.RouteTopiaDao; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -39,7 +44,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,23 +52,24 @@ import java.util.List; public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteStubDto> getRouteByTripSeine(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - List<RouteStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<RouteStubDto>> stubs = Sets.newLinkedHashSet(); for (Route route : tripSeine.getRoute()) { - RouteStubDto stub = new RouteStubDto(); - stub.setId(route.getTopiaId()); - stub.setDate(route.getDate()); - + ReferenceDto<RouteStubDto> stub = entityToReferenceDto(RouteStubDto.class, route); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); + ReferenceSetDto<RouteStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(RouteStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 525c082..41c8980 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -22,13 +22,17 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Lists; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; @@ -36,6 +40,7 @@ import org.nuiton.util.DateUtil; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,7 +53,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -57,22 +62,20 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - List<TripSeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<TripSeineStubDto>> stubs = Sets.newLinkedHashSet(); for (TripSeine tripSeine : tripSeines) { - TripSeineStubDto stub = new TripSeineStubDto(); - stub.setId(tripSeine.getTopiaId()); - stub.setStartDate(tripSeine.getStartDate()); - stub.setEndDate(tripSeine.getEndDate()); - stub.setVesselLabel(referenceLocale.getLabel(tripSeine.getVessel())); - stub.setObserverLabel(tripSeine.getObserverLabel()); - + ReferenceDto<TripSeineStubDto> stub = entityToReferenceDto(TripSeineStubDto.class, tripSeine); stubs.add(stub); } - return stubs; + Optional<Date> lastUpdateOptional = getLastUpdate(TripSeine.class); + ReferenceSetDto<TripSeineStubDto> stubReferences = + ReferenceSetDtos.newReferenceSetDto(TripSeineStubDto.class, stubs, lastUpdateOptional.orNull()); + + return stubReferences; } @Override -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit ed2dfa8a1ab9bb0353e7af55fc4fcade99f3cc39 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 18:54:27 2015 +0200 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) --- .../observe/ObserveSwingApplicationContext.java | 16 +++++--- .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 ++++++------- .../service/seine/TripSeineServiceRestTest.java | 44 +++++++++++----------- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 756316c..abdc6d0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -706,14 +706,18 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { String programName = (String) programDtoRef.getPropertyValue("label"); log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { - List<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); - for (TripSeineStubDto tripSeine : tripSeines) { - log.info(" - " + tripSeine.getVesselLabel() + " " + tripSeine.getStartDate() + " - " + tripSeine.getEndDate()); + ReferenceSetDto<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); + for (ReferenceDto tripSeine : tripSeines.getReference()) { + log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) + + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) + + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { - List<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); - for (TripLonglineStubDto tripLongline : tripLonglines) { - log.info(" - " + tripLongline.getVesselLabel() + " " + tripLongline.getStartDate() + " - " + tripLongline.getEndDate()); + ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); + for (ReferenceDto tripLongline : tripLonglines.getReference()) { + log.info(" - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL) + + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) + + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 1b9c1c7..7906baa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -80,7 +80,8 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public Version getVersion() { Version result = null; if (connection != null) { - result = connection.getVersion(); + //FIXME +// result = connection.getVersion(); } return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index f20ad4f..2d9ee1d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -61,7 +61,7 @@ public class DataSelectionModel implements Serializable { Preconditions.checkState(source.isOpen()); - Map<ReferenceDto<ProgramDto>, List<IdDto>> datas = Maps.newHashMap(); + Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas = Maps.newHashMap(); ReferentialService referentialService = source.newService(ReferentialService.class); TripSeineService tripSeineService = source.newService(TripSeineService.class); @@ -73,19 +73,19 @@ public class DataSelectionModel implements Serializable { for (ReferenceDto<ProgramDto> program : programSet.getReference()) { - List<IdDto> idDtos = Lists.newArrayList(); + List<ReferenceDto> referenceDtos = Lists.newArrayList(); if (ProgramDtos.isProgramSeine(program)) { - idDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId())); + referenceDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId()).getReference()); } else if (ProgramDtos.isProgramLongline(program)) { - idDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId())); + referenceDtos.addAll(tripLonglineService.getTripLonglineStubByProgram(program.getId()).getReference()); } - populate(model, program, idDtos, datas); + populate(model, program, referenceDtos, datas); } model.setDatas(datas); @@ -94,8 +94,8 @@ public class DataSelectionModel implements Serializable { protected static void populate(DataSelectionModel model, ReferenceDto<ProgramDto> program, - List<IdDto> trips, - Map<ReferenceDto<ProgramDto>, List<IdDto>> datas) { + List<ReferenceDto> trips, + Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas) { if (!trips.isEmpty()) { @@ -136,7 +136,7 @@ public class DataSelectionModel implements Serializable { protected boolean useReferentiel; /** la liste des programs utilisables (qui ont des marees) */ - protected transient Map<ReferenceDto<ProgramDto>, List<IdDto>> datas; + protected transient Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas; /** la liste des marees selectionnee */ protected transient Set<IdDto> selectedData; @@ -213,7 +213,7 @@ public class DataSelectionModel implements Serializable { return selectedReferentiel; } - public Map<ReferenceDto<ProgramDto>, List<IdDto>> getDatas() { + public Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> getDatas() { if (datas == null) { datas = Maps.newHashMap(); } @@ -257,7 +257,7 @@ public class DataSelectionModel implements Serializable { if (idDto instanceof ReferenceDto) { - List<IdDto> trips = datas.get(idDto); + List<ReferenceDto> trips = datas.get(idDto); result = ! CollectionUtils.isEmpty(trips); for (IdDto trip : trips) { @@ -335,13 +335,13 @@ public class DataSelectionModel implements Serializable { firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); } - public void setDatas(Map<ReferenceDto<ProgramDto>, List<IdDto>> datas) { + public void setDatas(Map<ReferenceDto<ProgramDto>, List<ReferenceDto>> datas) { this.datas = datas; // on compte le count de marées totale int nbTrips = 0; if (datas != null) { - for (List<IdDto> marees : datas.values()) { + for (List<ReferenceDto> marees : datas.values()) { nbTrips += marees.size(); } } @@ -379,7 +379,7 @@ public class DataSelectionModel implements Serializable { if (log.isDebugEnabled()) { log.debug("All all data."); } - for (List<IdDto> p : datas.values()) { + for (List<ReferenceDto> p : datas.values()) { getSelectedData().addAll(p); } firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); 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 677deef..b5a246e 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 @@ -26,6 +26,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -42,7 +43,7 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Collection; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -62,37 +63,38 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ @Test public void getTripSeineByProgramTest() { - List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.size()); + Assert.assertEquals(135, stubDtos.sizeReference()); - TripSeineStubDto tripSeineStub1Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); + LinkedHashSet<ReferenceDto> referenceDtos = stubDtos.getReference(); + ReferenceDto tripSeineStub1Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getEndDate()); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getVesselLabel()); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - TripSeineStubDto tripSeineStu2Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); + ReferenceDto tripSeineStu2Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStu2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getEndDate()); - Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getVesselLabel()); - Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - TripSeineStubDto tripSeineStub3Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDto tripSeineStub3Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getEndDate()); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getVesselLabel()); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); + Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); } @@ -284,11 +286,11 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ service.delete(TRIP_SEINE_ID_1); - List<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); - Assert.assertEquals(2, tripSeineByProgram.size()); + Assert.assertEquals(2, tripSeineByProgram.sizeReference()); - Assert.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram, TRIP_SEINE_ID_1))); + Assert.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram.getReference(), TRIP_SEINE_ID_1))); } -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 6cbffa6627beaef45d90208c5734b17ff85486b9 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 29 14:44:12 2015 +0200 modif d'une mauvais classe de DTO (refs #7531) --- .../ui/content/open/ContentOpenableUIHandler.java | 18 +++--------------- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +++++------ .../impl/longline/BaitsCompositionUIHandler.java | 22 +++++++++++----------- .../impl/longline/BaitsCompositionUIModel.java | 9 ++++----- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +++++------ .../longline/BranchlinesCompositionUIHandler.java | 19 ++++++++++--------- .../longline/BranchlinesCompositionUIModel.java | 8 ++++---- ...LonglineGlobalCompositionServiceController.java | 4 ++-- .../SetLonglineGlobalCompositionService.java | 2 +- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +--- 11 files changed, 47 insertions(+), 63 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index 3ccdb75..e16f02d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -76,7 +76,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co public final void openDataUI() { boolean ok = false; try { - doOpenData(); + getBean().setOpen(true); ok = true; } catch (Exception e) { ErrorDialogUI.showError(e); @@ -91,12 +91,6 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public final void doOpenData() throws Exception { - String id = getBean().getId(); - //FIXME -// getDataService().updateOpenProperty(getDataSource(), id, true); - } - public final void afterOpenData() { ContentOpenableUI<E> ui = getUi(); @@ -131,14 +125,8 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public boolean doCloseData() throws Exception { - - return doCloseData(getBean().getId()); - } - - public final boolean doCloseData(String id) throws Exception { - //FIXME -// getDataService().updateOpenProperty(getDataSource(), id, false); + public boolean doCloseData() { + getBean().setOpen(false); return true; } diff --git 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 index 9fec73c..32b78e2 100644 --- 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 @@ -336,7 +336,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // } @Override - public boolean doCloseData() throws Exception { + public boolean doCloseData() { RouteDto route = getBean(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx index 9964763..02be4d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLonglineDto, BaitsCompositionDto' + superGenericType='SetLonglineGlobalCompositionDto, BaitsCompositionDto' contentTitle='{n("observe.baitsComposition.title")}' saveNewEntryText='{n("observe.baitsComposition.action.create")}' saveNewEntryTip='{n("observe.baitsComposition.action.create.tip")}' @@ -32,7 +32,7 @@ <import> fr.ird.observe.services.dto.ReferenceDto - fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BaitsCompositionDto fr.ird.observe.services.dto.referential.longline.BaitTypeDto fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto @@ -52,7 +52,7 @@ <BaitsCompositionUIModel id='model'/> <!-- edit bean --> - <SetLonglineDto id='bean'/> + <SetLonglineGlobalCompositionDto id='bean'/> <!-- table edit bean --> <BaitsCompositionDto id='tableEditBean'/> @@ -62,10 +62,9 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-baitsComposition' - beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> - <!--FIXME--> - <!--<field name="baitsComposition" component="editorPanel"/>--> + <field name="baitsComposition" component="editorPanel"/> </BeanValidator> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 6f535f5..df4d179 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 @@ -26,17 +26,17 @@ 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.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDtos; 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.services.service.longline.SetLonglineGlobalCompositionService; 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.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; @@ -49,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BaitsCompositionDto> { +public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BaitsCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BaitsCompositionUIHandler.class); @@ -117,15 +117,15 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void doPersist(SetLonglineDto bean) { - getSetLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(SetLonglineGlobalCompositionDto bean) { + getSetLonglineGlobalCompositionService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadToEdit(beanId); getModel().setFormDto(formDto); - SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(formDto.getForm(), getBean()); } //FIXME @@ -139,7 +139,7 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline super.afterSave(refresh); } - protected SetLonglineService getSetLonglineService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + protected SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineGlobalCompositionService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java index 9667d33..5e30b0f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,16 +37,15 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BaitsCompositionDto> { +public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineGlobalCompositionDto, BaitsCompositionDto> { private static final long serialVersionUID = 1L; public BaitsCompositionUIModel(BaitsCompositionUI ui) { - super(SetLonglineDto.class, + super(SetLonglineGlobalCompositionDto.class, BaitsCompositionDto.class, new String[]{ - //FIXME -// SetLonglineDto.PROPERTY_BAITS_COMPOSITION + SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION }, new String[]{BaitsCompositionDto.PROPERTY_BAIT_TYPE, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 6624b7f..348c309 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLonglineDto, BranchlinesCompositionDto' + superGenericType='SetLonglineGlobalCompositionDto, BranchlinesCompositionDto' contentTitle='{n("observe.branchlinesComposition.title")}' saveNewEntryText='{n("observe.branchlinesComposition.action.create")}' saveNewEntryTip='{n("observe.branchlinesComposition.action.create.tip")}' @@ -32,7 +32,7 @@ <import> fr.ird.observe.services.dto.ReferenceDto - fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BranchlinesCompositionDto fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.ui.content.table.* @@ -51,7 +51,7 @@ <BranchlinesCompositionUIModel id='model'/> <!-- edit bean --> - <SetLonglineDto id='bean'/> + <SetLonglineGlobalCompositionDto id='bean'/> <!-- table edit bean --> <BranchlinesCompositionDto id='tableEditBean'/> @@ -61,10 +61,9 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-branchlinesComposition' - beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> - <!--FIXME--> - <!--<field name="branchlinesComposition" component="editorPanel"/>--> + <field name="branchlinesComposition" component="editorPanel"/> </BeanValidator> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index d84e7d5..b21c9e4 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 @@ -26,10 +26,11 @@ 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.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDtos; 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.SetLonglineGlobalCompositionService; import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -47,7 +48,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BranchlinesCompositionDto> { +public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BranchlinesCompositionUIHandler.class); @@ -123,19 +124,19 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo } @Override - protected void doPersist(SetLonglineDto bean) { - getSetLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(SetLonglineGlobalCompositionDto bean) { + getSetLonglineGlobalCompositionService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadToEdit(beanId); getModel().setFormDto(formDto); - SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(formDto.getForm(), getBean()); } - protected SetLonglineService getSetLonglineService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + protected SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineGlobalCompositionService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java index bc3109c..9262147 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java @@ -25,6 +25,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,16 +38,15 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BranchlinesCompositionDto> { +public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto> { private static final long serialVersionUID = 1L; public BranchlinesCompositionUIModel(BranchlinesCompositionUI ui) { - super(SetLonglineDto.class, + super(SetLonglineGlobalCompositionDto.class, BranchlinesCompositionDto.class, new String[]{ - //FIXME -// SetLonglineDto.PROPERTY_BRANCHLINES_COMPOSITION + SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION }, new String[]{BranchlinesCompositionDto.PROPERTY_TOP_TYPE, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java index ccde45d..8af13a2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java @@ -47,7 +47,7 @@ public class SetLonglineGlobalCompositionServiceController extends ObserveAuthen } @Override - public String save(FormDto<SetLonglineGlobalCompositionDto> form) { - return service.save(form); + public String save(SetLonglineGlobalCompositionDto dto) { + return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java index 6d2cee8..fbac7ec 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java @@ -44,6 +44,6 @@ public interface SetLonglineGlobalCompositionService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<SetLonglineGlobalCompositionDto> form); + String save(SetLonglineGlobalCompositionDto dto); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java index 4cf189e..8e423bf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -71,9 +71,7 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi } @Override - public String save(FormDto<SetLonglineGlobalCompositionDto> form) { - - SetLonglineGlobalCompositionDto setLonglineGlobalCompositionDto = form.getForm(); + public String save(SetLonglineGlobalCompositionDto setLonglineGlobalCompositionDto) { SetLongline setLongline = dtoToEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineGlobalCompositionDto); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 248c1f68bd20115e5fd9d882839399613c84d765 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 28 09:55:57 2015 +0200 mise en place du générateur de text (refs #7547) --- observe-application-swing/pom.xml | 6 + .../java/fr/ird/observe/ObserveTextGenerator.java | 106 +++++++ .../observe/ui/actions/ShowStorageInfoAction.java | 13 +- .../ird/observe/ui/storage/StorageUIHandler.java | 350 +-------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 37 +-- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 ++ .../ftl/dataSourceConnectionReport_fr.ftl | 348 ++++++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 ++++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 +++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 ++ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + pom.xml | 7 + 16 files changed, 623 insertions(+), 387 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 4c2464d..783b8f8 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -232,6 +232,12 @@ <artifactId>jxlayer</artifactId> </dependency> + <!-- FreeMarker --> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + </dependency> + <!-- Map --> <dependency> <groupId>org.geotools</groupId> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java new file mode 100644 index 0000000..d06f59b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java @@ -0,0 +1,106 @@ +package fr.ird.observe; + +import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.ui.storage.StorageUIModel; +import freemarker.cache.ClassTemplateLoader; +import freemarker.template.Configuration; +import freemarker.template.Template; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.jaxx.application.ApplicationTechnicalException; + +import java.io.StringWriter; +import java.io.Writer; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObserveTextGenerator { + + private static final Log log = LogFactory.getLog(ObserveTextGenerator.class); + + protected static final ObserveTextGenerator currentInstance = new ObserveTextGenerator(); + + public static ObserveTextGenerator get() { + return currentInstance; + } + + protected static final String DATA_SOURCE_CONFIGURATION_TEMPLATE = "dataSourceConfiguration.ftl"; + + protected static final String CONNEXION_TEST_RESULT_TEMPLATE = "connexionTestResult.ftl"; + + protected static final String DATA_SOURCE_SELECT_MODE_RESUME_TEMPLATE = "dataSourceSelectModeResume.ftl"; + + protected static final String DATA_SOURCE_CONNECTION_REPORT_TEMPLATE = "dataSourceConnectionReport.ftl"; + + protected static final String DATA_SOURCE_INFORMATION_TEMPLATE = "dataSourceInformation.ftl"; + + + protected final Configuration freemarkerConfiguration; + + private ObserveTextGenerator() { + freemarkerConfiguration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); + + // needed to overwrite "Defaults to default system encoding." + // fix encoding issue on some systems + freemarkerConfiguration.setEncoding(Locale.getDefault(), "UTF-8"); + + // specific template loader to get template from jars (classpath) + ClassTemplateLoader templateLoader = new ClassTemplateLoader(ObserveTextGenerator.class, "/ftl"); + freemarkerConfiguration.setTemplateLoader(templateLoader); + +// freemarkerConfiguration.setObjectWrapper(new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS)); + } + + public String getConfigurationDetail(ObserveDataSourceConfiguration dataSourceConfiguration) { + return generateHtml(DATA_SOURCE_CONFIGURATION_TEMPLATE, dataSourceConfiguration); + } + + public String getConnexionTestResultMessage(StorageUIModel model) { + return generateHtml(CONNEXION_TEST_RESULT_TEMPLATE, model); + } + + public String getLoadDataSourceResume(StorageUIModel model) { + return generateHtml(DATA_SOURCE_SELECT_MODE_RESUME_TEMPLATE, model); + } + + public String getDataSourceConnectionReport(StorageUIModel model) { + return generateHtml(DATA_SOURCE_CONNECTION_REPORT_TEMPLATE, model); + } + + public String getDataSourceInfo(ObserveSwingDataSource source) { + return generateHtml(DATA_SOURCE_INFORMATION_TEMPLATE, source); + } + + protected String generateHtml(String templateName, Object model) { + return generateHtml(I18n.getDefaultLocale(), templateName, model); + } + + protected String generateHtml(Locale locale, String templateName, Object model) { + + try { + + // Get freemarker template + Template mapTemplate = freemarkerConfiguration.getTemplate(templateName, locale); + + Writer out = new StringWriter(); + mapTemplate.process(model, out); + + out.flush(); + + return out.toString(); + + + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("error while generating html", ex); + } + throw new ApplicationTechnicalException(t("observe.generateHtml.error", templateName), ex); + } + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java index 346fd9e..e1cc041 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java @@ -23,9 +23,12 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.ObserveTextGenerator; +import fr.ird.observe.db.ObserveSwingDataSource; import jaxx.runtime.SwingUtil; import fr.ird.observe.ui.*; import javax.swing.AbstractAction; +import javax.swing.JLabel; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; @@ -55,15 +58,17 @@ public class ShowStorageInfoAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { - String text; + ObserveSwingDataSource source; if (ui.getConfig().isMainStorageOpened()) { - text = ObserveSwingApplicationContext.get().getDataSource().toString(); + source = ObserveSwingApplicationContext.get().getDataSource(); } else { - text = t("observe.message.db.none.loaded"); + source = null; } + + String text = ObserveTextGenerator.get().getDataSourceInfo(source); JOptionPane.showMessageDialog( ui, - text, + new JLabel(text), t("observe.title.storage.info"), JOptionPane.INFORMATION_MESSAGE); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index dbdf8db..0cd4773 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.util.SecurityModel; @@ -45,6 +45,7 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.service.DataSourceDumpProducerService; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; @@ -666,35 +667,8 @@ public class StorageUIHandler { log.debug("Build report from step " + step); } StorageUIModel model = ui.getModel(); - DbMode dbMode = model.getDbMode(); - if (dbMode == null) { - return ""; - } - SelectDataUI selectDataUI = (SelectDataUI) - ui.getStepUI(StorageStep.SELECT_DATA); - - StringBuilder sb = new StringBuilder(512); - if (model.isBackupAction()) { - - computeBackupReport(selectDataUI, model, sb); - } else { - switch (model.getDbMode()) { - - case USE_LOCAL: - computeConnectLocalReport(model, sb); - break; - case CREATE_LOCAL: - computeCreateLocalReport(model, sb); - break; - case USE_REMOTE: - computeConnectRemoteReport(selectDataUI, model, sb); - break; - case USE_SERVER: - computeConnectServerReport(selectDataUI, model, sb); - break; - } - } - return sb.toString(); + String report = ObserveTextGenerator.get().getDataSourceConnectionReport(model); + return report; } public void destroy(StorageUI ui) { @@ -721,292 +695,6 @@ public class StorageUIHandler { return decoratorService; } - protected void computeCreateLocalReport(StorageUIModel model, - StringBuilder sb) { - - // mode de creation - CreationMode creationMode = model.getCreationMode(); - if (creationMode == null) { - return; - } - - if (model.isDoBackup()) { - addTag("h2", sb, t("observe.storage.report.action.backup.local")); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.backup.file")); - - addOpenTag("ul", sb); - addTag("li", sb, model.getBackupFile().getAbsolutePath()); - addCloseTag("ul", sb); - } - - addTag("h2", sb, t("observe.storage.report.action.create.local")); - addTag("hr", sb, ""); - - switch (creationMode) { - case IMPORT_INTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.import.internal")); - addOpenTag("ul", sb); - addTag("li", sb, - model.getConfig().getInitialDbDump().getAbsoluteFile().getAbsolutePath()); - - addCloseTag("ul", sb); - break; - - case IMPORT_EXTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.import.backup")); - addOpenTag("ul", sb); - addTag("li", sb, model.getDumpFile().getAbsolutePath()); - addCloseTag("ul", sb); - break; - - /*case IMPORT_LOCAL_STORAGE: - sb.append(t("observe.storage.report.config")+"\n"); - tmpStr = model.getLocalStorageFile().getAbsolutePath(); - sb.append(t("observe.storage.report.selected.localStorageFile",tmpStr)); - break;*/ - case IMPORT_REMOTE_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.remote.referentiel")); - - addTag("pre", sb, model.getDataSourceConfigDetail()); - break; - case IMPORT_SERVER_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.server.referentiel")); - - addTag("pre", sb, model.getDataSourceConfigDetail()); - break; - - case EMPTY: - break; - case IMPORT_LOCAL_STORAGE: - // cas non géré pour le moment - break; - } - - computeCanMigrateAction(model, sb); - } - - protected void computeConnectLocalReport(StorageUIModel model, - StringBuilder sb) { - - addTag("h2", sb, t("observe.storage.report.action.connect.local")); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.localStorageFile")); - addOpenTag("ul", sb); - addTag("li", sb, - model.getH2Config().getDirectory().getAbsolutePath() - ); - addCloseTag("ul", sb); - - computeCanMigrateAction(model, sb); - } - - protected void computeConnectRemoteReport(SelectDataUI tabUI, - StorageUIModel model, - StringBuilder sb) { - - ObstunaAdminAction action = model.getAdminAction(); - if (action == null) { - addTag("h2", sb, t("observe.storage.report.action.connect.remote")); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.remoteStorage")); - - addTag("pre", sb, model.getPgConfig().toString()); - - computeCanMigrateAction(model, sb); - } else { - addTag("h2", sb, t(action.getLabel())); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.remoteStorage")); - addTag("pre", sb, model.getPgConfig().toString()); - - if (ObstunaAdminAction.CREATE == action) { - - if (model.isImportReferentiel()) { - switch (model.getReferentielImportMode()) { - - case IMPORT_EXTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.referentiel.import.backup")); - addOpenTag("ul", sb); - addTag("li", sb, model.getCentralSourceModel().getDumpFile().getAbsolutePath()); - addCloseTag("ul", sb); - break; - - case IMPORT_REMOTE_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.remote.referentiel")); - addTag("pre", sb, model.getCentralSourceModel().getPgConfig().toString()); - break; - - case IMPORT_SERVER_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.server.referentiel")); - addTag("pre", sb, model.getCentralSourceModel().getRestConfig().toString()); - break; - } - - } else { - - addTag("h3", sb, - t("observe.storage.report.action.no.referentiel.import")); - - } - - if (model.isImportData()) { - - switch (model.getDataImportMode()) { - - case IMPORT_EXTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.data.import.backup")); - addOpenTag("ul", sb); - addTag("li", sb, model.getDataSourceModel().getDumpFile().getAbsolutePath()); - addCloseTag("ul", sb); - break; - - case IMPORT_REMOTE_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.remote.data")); - addTag("pre", sb, model.getDataSourceModel().getPgConfig().toString()); - break; - - case IMPORT_SERVER_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.server.data")); - addTag("pre", sb, model.getDataSourceModel().getRestConfig().toString()); - break; - } - - try { - computeImportDataReport(model, sb); - } catch (DataSourceException e) { - throw new RuntimeException("Could not render data to import", e); - } - - } else { - - addTag("h3", sb, - t("observe.storage.report.action.no.data.import")); - - } - - } else { - computeCanMigrateAction(model, sb); - } - - computeSecurityreport(model, sb); - } - } - - protected void computeConnectServerReport(SelectDataUI tabUI, - StorageUIModel model, - StringBuilder sb) { - - ObstunaAdminAction action = model.getAdminAction(); - if (action == null) { - addTag("h2", sb, t("observe.storage.report.action.connect.remote")); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.remoteStorage")); - - addTag("pre", sb, model.getRestConfig().toString()); - - computeCanMigrateAction(model, sb); - } else { - addTag("h2", sb, t(action.getLabel())); - addTag("hr", sb, ""); - - addTag("h3", sb, t("observe.storage.report.selected.remoteStorage")); - addTag("pre", sb, model.getRestConfig().toString()); - - if (ObstunaAdminAction.CREATE == action) { - - if (model.isImportReferentiel()) { - switch (model.getReferentielImportMode()) { - - case IMPORT_EXTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.referentiel.import.backup")); - addOpenTag("ul", sb); - addTag("li", sb, model.getCentralSourceModel().getDumpFile().getAbsolutePath()); - addCloseTag("ul", sb); - break; - - case IMPORT_REMOTE_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.remote.referentiel")); - addTag("pre", sb, model.getCentralSourceModel().getPgConfig().toString()); - break; - - case IMPORT_SERVER_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.server.referentiel")); - addTag("pre", sb, model.getCentralSourceModel().getRestConfig().toString()); - break; - } - - } else { - - addTag("h3", sb, - t("observe.storage.report.action.no.referentiel.import")); - - } - - if (model.isImportData()) { - - switch (model.getDataImportMode()) { - - case IMPORT_EXTERNAL_DUMP: - addTag("h3", sb, - t("observe.storage.report.action.data.import.backup")); - addOpenTag("ul", sb); - addTag("li", sb, model.getDataSourceModel().getDumpFile().getAbsolutePath()); - addCloseTag("ul", sb); - break; - - case IMPORT_REMOTE_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.remote.data")); - addTag("pre", sb, model.getDataSourceModel().getPgConfig().toString()); - break; - - case IMPORT_SERVER_STORAGE: - addTag("h3", sb, - t("observe.storage.report.action.import.server.data")); - addTag("pre", sb, model.getDataSourceModel().getRestConfig().toString()); - break; - } - - try { - computeImportDataReport(model, sb); - } catch (DataSourceException e) { - throw new RuntimeException("Could not render data to import", e); - } - - } else { - - addTag("h3", sb, - t("observe.storage.report.action.no.data.import")); - - } - - } else { - computeCanMigrateAction(model, sb); - } - - computeSecurityreport(model, sb); - } - } - protected void computeBackupReport(SelectDataUI stepUI, StorageUIModel model, StringBuilder sb) { @@ -1180,36 +868,6 @@ public class StorageUIHandler { addCloseTag("ul", sb); } - protected void computeCanMigrateAction(StorageUIModel model, StringBuilder sb) { - addTag("h3", sb, t("observe.storage.report.action.migrate") + " :"); - addOpenTag("ul", sb); - if (model.isCanMigrate()) { - Version version = model.getModelVersion(); - addTag("li", sb, t("observe.storage.report.can.migrate", version)); - if (model.isShowMigrationProgression()) { - addTag("li", sb, t("observe.storage.showMigrationProgression")); - } - if (model.isShowMigrationSql()) { - addTag("li", sb, t("observe.storage.showMigrationSql")); - } - } else { - addTag("li", sb, t("observe.storage.report.can.not.migrate")); - } - addCloseTag("ul", sb); - } - - protected void computeSecurityreport(StorageUIModel model, StringBuilder sb) { - - addTag("h3", sb, t("observe.storage.report.selected.security")); - addOpenTag("ul", sb); - SecurityModel security = model.getSecurityModel(); - addTag("li", sb, t("observe.storage.report.security.owner", security.getAdministrateur())); - addTag("li", sb, t("observe.storage.report.security.techniciens", security.getTechnicien())); - addTag("li", sb, t("observe.storage.report.security.readers", security.getUtilisateur())); - addTag("li", sb, t("observe.storage.report.security.referentiels", security.getReferentiel())); - addCloseTag("ul", sb); - } - public static void addTag(String tag, StringBuilder sb, String message) { sb.append('<').append(tag).append('>'); sb.append(message); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css index 4399f7b..81fb7d4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css @@ -134,10 +134,11 @@ } #connexionStatus { - rows:4; - editable:false; + height : 70; focusable:false; font-size:11; + contentType : "text/html"; + editorKit : {new HTMLEditorKit()}; text:{getHandler().updateConnexionStatutText(ConfigUI.this, model.getConnexionStatus())}; _untestedColor:{Color.GRAY}; _successColor:{Color.GREEN}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx index aed93d0..97ac53f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx @@ -37,6 +37,7 @@ java.io.File javax.swing.border.LineBorder + javax.swing.text.html.HTMLEditorKit static org.nuiton.i18n.I18n.n </import> @@ -271,7 +272,7 @@ public void init() { <row> <cell weightx='1' weighty='1'> <JScrollPane id="connexionStatusPanel"> - <JTextArea id='connexionStatus'/> + <JTextPane id='connexionStatus'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 7dfa946..5b5b1f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.storage.tabs; +import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.ConnexionStatus; @@ -29,7 +30,6 @@ import fr.ird.observe.db.constantes.DbMode; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.StorageStep; -import fr.ird.observe.ui.storage.StorageUIHandler; import fr.ird.observe.ui.storage.StorageUILauncher; import fr.ird.observe.ui.storage.StorageUIModel; import fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer; @@ -99,26 +99,7 @@ public class StorageTabUIHandler { @Override public void propertyChange(PropertyChangeEvent evt) { StorageUIModel model = (StorageUIModel) evt.getSource(); - DbMode dbMode = model.getDbMode(); - CreationMode creationMode = model.getCreationMode(); - StringBuilder sb = new StringBuilder(); - StorageUIHandler.addTag("h3", sb, t("observe.storage.selected.dbMode")); - if (dbMode == null) { - StorageUIHandler.addTag("pre", sb, t("observe.storage.no.dbMode")); - } else { - StorageUIHandler.addTag("pre", sb, t(dbMode.getDescription())); - } - StorageUIHandler.addTag("h3", sb, t("observe.storage.selectedCreationMode")); - if (DbMode.CREATE_LOCAL == dbMode) { - if (creationMode == null) { - StorageUIHandler.addTag("pre", sb, t("observe.storage.no.creationMode")); - } else { - StorageUIHandler.addTag("pre", sb, t(creationMode.getDescription())); - } - } else { - StorageUIHandler.addTag("pre", sb, t("observe.storage.no.creationMode.required")); - } - String txt = sb.toString(); + String txt = ObserveTextGenerator.get().getLoadDataSourceResume(model); ui.getResume().setText(txt); } }; @@ -342,21 +323,9 @@ public class StorageTabUIHandler { } public String updateConnexionStatutText(ConfigUI ui, ConnexionStatus status) { - String text = status.getDescription(); - switch (status) { - case UNTESTED: - text = t(text); - break; - case SUCCESS: - text = t(text, ui.model.getDataSourceConfigDetail()); - break; - case FAILED: - text = t(text, ui.model.getConnexionStatusError()); - break; - } + String text = ObserveTextGenerator.get().getConnexionTestResultMessage(ui.getModel()); return text; } - public void chooseDumpFile(ConfigUI ui) { File f = UIHelper.chooseFile( ui, diff --git a/observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl b/observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl new file mode 100644 index 0000000..f4efabc --- /dev/null +++ b/observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl @@ -0,0 +1,20 @@ +<html> +<body> + <#if connexionStatus.name() == "UNTESTED"> + + <h3>La connexion n'a jamais été validée ou a été modifiée depuis le dernier test de connexion.</h3> + + <#elseif connexionStatus.name() == "FAILED"> + + <h3>La connexion a échouée pour la raison suivante :</h3> + + <ul> + <li>${connexionStatusError}</li> + </ul> + + <#elseif connexionStatus.name() == "SUCCESS"> + Information sur la connexion : + <#include "storageModelDataSourceConfiguration_fr.ftl"> + </#if> +</body> +</html> \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl new file mode 100644 index 0000000..3d578a4 --- /dev/null +++ b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -0,0 +1,348 @@ +<html> +<body> + +<#if backupAction> + + <h2> + <#if local> + Sauvegarde de la base locale + <#elseif remote> + Sauvegarde de la base distante + <#elseif server> + Sauvegarde du serveur + </#if> + </h2> + + <hr/> + + <h3> + Emplacement de la sauvegarde : + <ul> + <li>${backupFile.absolutePath}</li> + </ul> + </h3> + + <#if useSelectData && selectDataModel != null> + + <h3>Données à exporter :</h3> + + <ul> + <!--Todo see fr.ird.observe.ui.storage.StorageUIHandler.computeBackupReport--> + <li>Le référentiel sera exporté</li> + </ul> + + </#if> + +<#else> + + <#if dbMode.name() == "USE_LOCAL"> + + <h2>Connection à la base locale</h2> + <hr/> + + <h3>Emplacement de la base locale :</h3> + + <ul> + <li>${h2config.directory.absolutePath}</li> + </ul> + + <#elseif dbMode.name() == "CREATE_LOCAL"> + + <#if doBackup> + + <h2>Sauvegarde de la base locale</h2> + <hr/> + <h3>Emplacement de la sauvegarde :</h3> + <ul> + <li>${backupFile.absolutePath}</li> + </ul> + + </#if> + + <h2>Création de la base locale</h2> + <hr/> + + <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> + <h3>Import depuis une le dernier référentiel téléchargé :</h3> + + <ul> + <li>${config.initialDbDump.absoluteFile.absolutePath}</li> + </ul> + + <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> + + <h3>Import depuis une sauvegarde :</h3> + + <ul> + <li>${dumpFile.absolutePath}</li> + </ul> + + <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> + + <h3>Import du référentiel depuis une base distante :</h3> + + <#include "storageModelDataSourceConfiguration.ftl"> + + + <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> + + <h3>Import du référentiel depuis un serveur distant :</h3> + + <#include "storageModelDataSourceConfiguration_fr.ftl"> + + </#if> + + + <#elseif dbMode.name() == "USE_REMOTE"> + <#if !adminAction??> + + <h2>Connexion à une base distante</h2> + <hr/> + + <h3>Informations sur la base distante à utiliser :</h3> + + <#include "storageModelDataSourceConfiguration_fr.ftl"> + + <#else> + + <h2>${adminAction.label}</h2> + <hr/> + + <h3>Informations sur la connexion distance à utiliser :</h3> + + <#include "storageModelDataSourceConfiguration_fr.ftl"> + + <#if adminAction.name() == "CREATE"> + + <#if importReferentiel> + + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + + <h3>Import du référentiel depuis une sauvegarde :</h3> + + <ul> + <li>${centralSourceModel.dumpFile.absolutePath}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + + <h3>Import du référentiel depuis une base distante :</h3> + <ul> + <li><strong>URL jdbc : </strong>${centralSourceModel.pgConfig.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.pgConfig.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + <li><strong>Mode SSL : </strong>${centralSourceModel.pgConfig.useSsl?then('Oui', 'Non')}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + + <h3>Import du référentiel depuis un serveur distant :</h3> + <ul> + <li><strong>URL du serveur : </strong>${centralSourceModel.restConfig.serverUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.restConfig.login}</li> + <li><strong>Mot de passe : </strong>*****</li> + <#if centralSourceModel.restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${centralSourceModel.restConfig.optionalDatabaseName.get()}</li> + </#if> + </ul> + + </#if> + + <#else> + <h3>Pas d'import de référentiel</h3> + </#if> + + <#if importData> + + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + + <h3>Import du référentiel depuis une sauvegarde :</h3> + + <ul> + <li>${centralSourceModel.dumpFile.absolutePath}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + + <h3>Import du référentiel depuis une base distante :</h3> + <ul> + <li><strong>URL jdbc : </strong>${centralSourceModel.pgConfig.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.pgConfig.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + <li><strong>Mode SSL : </strong>${centralSourceModel.pgConfig.useSsl?then('Oui', 'Non')}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + + <h3>Import du référentiel depuis un serveur distant :</h3> + <ul> + <li><strong>URL du serveur : </strong>${centralSourceModel.restConfig.serverUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.restConfig.login}</li> + <li><strong>Mot de passe : </strong>*****</li> + <#if centralSourceModel.restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${centralSourceModel.restConfig.optionalDatabaseName.get()}</li> + </#if> + </ul> + + </#if> + + <#else> + <h3>Pas d'import de données</h3> + + </#if> + + </#if> + + <h3>Sécurité</h3> + <ul> + <li><strong>Propriétaire : : </strong>${securityModel.administrateu}</li> + <li><strong>Techniciens : : </strong>${securityModel.technicien}</li> + <li><strong>Lecteurs : : </strong>${securityModel.utilisateur}</li> + <li><strong>Référentiels : : </strong>${securityModel.referentiel}</li> + </ul> + + + </#if> + + <#elseif dbMode.name() == "USE_SERVER"> + <#if !adminAction??> + + <h2>Connexion à un serveur distant</h2> + <hr/> + + <h3>Informations sur le serveur connexion distant à utiliser :</h3> + + <#include "storageModelDataSourceConfiguration_fr.ftl"> + + <#else> + + <h2>${adminAction.label}</h2> + <hr/> + + <h3>Informations sur le serveur connexion distant à utiliser :</h3> + + <#include "storageModelDataSourceConfiguration_fr.ftl"> + + <#if adminAction.name() == "CREATE"> + + <#if importReferentiel> + + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + + <h3>Import du référentiel depuis une sauvegarde :</h3> + + <ul> + <li>${centralSourceModel.dumpFile.absolutePath}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + + <h3>Import du référentiel depuis une base distante :</h3> + <ul> + <li><strong>URL jdbc : </strong>${centralSourceModel.pgConfig.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.pgConfig.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + <li><strong>Mode SSL : </strong>${centralSourceModel.pgConfig.useSsl?then('Oui', 'Non')}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + + <h3>Import du référentiel depuis un serveur distant :</h3> + <ul> + <li><strong>URL du serveur : </strong>${centralSourceModel.restConfig.serverUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.restConfig.login}</li> + <li><strong>Mot de passe : </strong>*****</li> + <#if centralSourceModel.restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${centralSourceModel.restConfig.optionalDatabaseName.get()}</li> + </#if> + </ul> + + </#if> + + <#else> + <h3>Pas d'import de référentiel</h3> + </#if> + + <#if importData> + + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + + <h3>Import du référentiel depuis une sauvegarde :</h3> + + <ul> + <li>${centralSourceModel.dumpFile.absolutePath}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + + <h3>Import du référentiel depuis une base distante :</h3> + <ul> + <li><strong>URL jdbc : </strong>${centralSourceModel.pgConfig.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.pgConfig.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + <li><strong>Mode SSL : </strong>${centralSourceModel.pgConfig.useSsl?then('Oui', 'Non')}</li> + </ul> + + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + + <h3>Import du référentiel depuis un serveur distant :</h3> + <ul> + <li><strong>URL du serveur : </strong>${centralSourceModel.restConfig.serverUrl}</li> + <li><strong>Utilisateur : </strong>${centralSourceModel.restConfig.login}</li> + <li><strong>Mot de passe : </strong>*****</li> + <#if centralSourceModel.restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${centralSourceModel.restConfig.optionalDatabaseName.get()}</li> + </#if> + </ul> + + </#if> + + <#else> + <h3>Pas d'import de données</h3> + + </#if> + + </#if> + + <h3>Sécurité</h3> + <ul> + <li><strong>Propriétaire : : </strong>${securityModel.administrateu}</li> + <li><strong>Techniciens : : </strong>${securityModel.technicien}</li> + <li><strong>Lecteurs : : </strong>${securityModel.utilisateur}</li> + <li><strong>Référentiels : : </strong>${securityModel.referentiel}</li> + </ul> + + </#if> + + </#if> + + <h3>Politique de mise à jour</h3> + + <ul> + + <#if canMigrate> + + <li>Mise à jour si nécessaire (version actuelle : ${modelVersion})</li> + + <#if showMigrationProgression> + + <li>Afficher la progression lors des mises à jour</li> + + </#if> + + <#if showMigrationSql> + + <li>Afficher les requêtes sql lors des mises à jour</li> + + </#if> + + <#else> + + <li>Pas de mise à jour possible</li> + + </#if> + + </ul> +</#if> +</body> +</html> \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl new file mode 100644 index 0000000..4655558 --- /dev/null +++ b/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl @@ -0,0 +1,54 @@ +<html> +<body> + +<#if configuration??> + <h3>${label}</h3> + <ul> + <#if configuration.h2Database??> + <li><strong>Utilisateur : </strong>${configuration.username}</li> + <#elseif configuration.postgresDatabase??> + <li><strong>URL jdbc : </strong>${configuration.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${configuration.username}</li> + <li><strong>Mode SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> + <#else> + <li><strong>URL du serveur : </strong>${configuration.serverUrl}</li> + <li><strong>Utilisateur : </strong>${configuration.login}</li> + <#if restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${configuration.optionalDatabaseName.get()}</li> + </#if> + </#if> + </ul> + <h3>Droits</h3> + <li><strong>Référentiel : </strong> + <#if canReadReferential() > + Lecture + <#if canWriteReferential() > + / Ecriture + </#if> + <#elseif canWriteReferential()> + Ecriture + <#else> + Aucun droit + </#if> + </li> + <li><strong>Données observateur : </strong> + <#if canReadData() > + Lecture + <#if canWriteData() > + / Ecriture + </#if> + <#elseif canWriteData() > + Ecriture + <#else> + Aucun droit + </#if> + </li> + </ul> + <h3>Version</h3> + v ${connection.version} +<#else> + Aucune source de données chargée +</#if> + +</body> +</html> \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl new file mode 100644 index 0000000..493779e --- /dev/null +++ b/observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl @@ -0,0 +1,40 @@ +<html> +<body> + + <h3>Type de source de données sélectionné</h3> + + <#if dbMode.name() == "USE_LOCAL"> + Utiliser une base locale de type h2 + <#elseif dbMode.name() == "CREATE_LOCAL"> + Creer une base locale de type h2 + <#elseif dbMode.name() == "USE_REMOTE"> + Utiliser une base distante de type postgres + <#elseif dbMode.name() == "USE_SERVER"> + Utiliser un serveur distant + <#else> + Aucun type de source de données sélectionné + </#if> + + <h3>Mode de création sélectionné</h3> + + <#if dbMode.name() == "CREATE_LOCAL"> + <#if !creationMode??> + Aucun mode de création sélectionné + <#elseif creationMode.name() == "EMPTY"> + Générer une nouvelle base locale vide.Cette base n'aura pas de référentiel et il vous faudra ensuite faire un import de référentiel... + <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> + Générer une nouvelle base locale à partir de la dernière version de la base embarquée. + <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> + Créer une nouvelle base locale à partir d'une précédente sauvegarde de l'application + <#elseif creationMode.name() == "IMPORT_LOCAL_STORAGE"> + Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. + <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> + Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. + <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> + Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. + </#if> + <#else> + Non requis. + </#if> +</body> +</html> \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl b/observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl new file mode 100644 index 0000000..d1eb1aa --- /dev/null +++ b/observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl @@ -0,0 +1,18 @@ +<ul> + <#if editRemoteConfig> + <li><strong>URL jdbc : </strong>${pgConfig.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${pgConfig.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + <li><strong>Mode SSL : </strong>${pgConfig.useSsl?then('Oui', 'Non')}</li> + <#elseif editServerConfig> + <li><strong>URL du serveur : </strong>${restConfig.serverUrl}</li> + <li><strong>Utilisateur : </strong>${restConfig.login}</li> + <li><strong>Mot de passe : </strong>*****</li> + <#if restConfig.optionalDatabaseName.present> + <li><strong>Base de données : </strong>${restConfig.optionalDatabaseName.get()}</li> + </#if> + <#else> + <li><strong>Utilisateur : </strong>${h2Config.username}</li> + <li><strong>Mot de passe : </strong>*****</li> + </#if> +</ul> \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index edc8d1e..04ff1c7 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1235,6 +1235,7 @@ observe.gearUseFeaturesSeine.table.value=Value observe.gearUseFeaturesSeine.table.value.tip=Caracteristic value observe.gearUseFeaturesSeine.title=Gears observe.gearUseFeaturesSeine.usedInTrip=Used in trip +observe.generateHtml.error= observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 5fa9165..424014b 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1237,6 +1237,7 @@ observe.gearUseFeaturesSeine.table.value= observe.gearUseFeaturesSeine.table.value.tip= observe.gearUseFeaturesSeine.title= observe.gearUseFeaturesSeine.usedInTrip= +observe.generateHtml.error= observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 1ca4299..eb26822 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1235,6 +1235,7 @@ observe.gearUseFeaturesSeine.table.value=Valeur observe.gearUseFeaturesSeine.table.value.tip=Valeur observe.gearUseFeaturesSeine.title=Équipements observe.gearUseFeaturesSeine.usedInTrip=Utilisé dans la marée +observe.generateHtml.error= observe.harbour.coordinates=Nom observe.harbour.locode=Locode observe.harbour.name=Nom diff --git a/pom.xml b/pom.xml index 7fbc20d..bf54549 100644 --- a/pom.xml +++ b/pom.xml @@ -455,6 +455,13 @@ <classifier>tests</classifier> </dependency> + <!-- FreeMarker --> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.23</version> + </dependency> + <!-- db --> <dependency> <groupId>com.h2database</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.