[Observe-commits] 06/17: appel des services pour le load et precreate (refs #7531)

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 eb4831192d1324325e3b1752241d94873b2d0aa7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 11:32:25 2015 +0200 appel des services pour le load et precreate (refs #7531) --- .../impl/longline/SetLonglineUIHandler.java | 41 +++++++------- .../impl/seine/FloatingObjectUIHandler.java | 34 ++++++------ .../ui/content/impl/seine/SetSeineUIHandler.java | 62 ++++++++++++---------- .../impl/longline/ActivityLonglineUIHandler.java | 37 ++++++------- .../open/impl/longline/TripLonglineUIHandler.java | 30 +++++------ .../open/impl/seine/ActivitySeineUIHandler.java | 40 +++++++------- .../ui/content/open/impl/seine/RouteUIHandler.java | 41 +++++++------- .../open/impl/seine/TripSeineUIHandler.java | 58 ++++++++++---------- .../ui/content/ref/ContentReferenceUIHandler.java | 18 ++----- 9 files changed, 177 insertions(+), 184 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 62b2f46..f7bb1ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -22,11 +22,14 @@ package fr.ird.observe.ui.content.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.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; 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.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -207,28 +210,25 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } ContentMode mode = computeContentMode(); - //FIXME -// DataService dataService = getDataService(); - SetLonglineDto bean = getBean(); + FormDto<SetLonglineDto> formDto; + if (setId == null) { + + // create mode + formDto = getSetLonglineService().preCreate(activityId); + + } else { + + // update mode + formDto = getSetLonglineService().loadToEdit(setId); + + } + + getModel().setFormDto(formDto); + SetLonglineDtos.copySetLonglineDto(formDto.getForm(), bean); + //FIXME -// TopiaEntityBinder<SetLongline> binder = getLoadBinder(); -// DataSource source = getDataSource(); -// if (setId == null) { -// -// // creation mode -// dataService.preCreate(source, activityId, bean, binder, getPreCreateExecutor()); -// -// getUi().getFishingOperationTabPane().setSelectedIndex(0); -// -// } else { -// -// // update mode -// dataService.loadEditEntity(source, setId, getLoadExecutor()); -// -// } -// // passage en coordonnes absolues + utilisation du quadrant // bean.initCoordinates(); @@ -576,8 +576,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME protected SetLonglineService getSetLonglineService() { - return null; + return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); } } 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 7fef2ec..bfdd365 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 @@ -21,11 +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.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDtos; import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -106,19 +109,21 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> FloatingObjectDto bean = getBean(); - //FIXME -// DataService dataService = getDataService(); -// if (dcpId == null) { -// -// // creation mode -// -// dataService.preCreate(getDataSource(), activityId, bean, getLoadBinder(), getPreCreateExecutor()); -// } else { -// -// // update mode -// -// dataService.loadEditEntity(getDataSource(), dcpId, getLoadExecutor()); -// } + FormDto<FloatingObjectDto> formDto; + if (dcpId == null) { + + // create mode + formDto = getFloatingObjectService().preCreate(activityId); + + } else { + + // update mode + formDto = getFloatingObjectService().loadToEdit(dcpId); + + } + + getModel().setFormDto(formDto); + FloatingObjectDtos.copyFloatingObjectDto(formDto.getForm(), bean); // utilisation du mode requis setContentMode(mode); @@ -234,8 +239,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> // parentBean.removeFloatingObject(beanToDelete); // } - //FIXME protected FloatingObjectService getFloatingObjectService() { - return null; + return ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); } } 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 8dd1f8d..465474e 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 @@ -21,12 +21,17 @@ */ 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.constants.seine.SchoolType; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDtos; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -39,12 +44,14 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; 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.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -151,6 +158,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { String activityId = getSelectedParentId(); String setId = getSelectedId(); + String selectedRouteId = getDataContext().getSelectedRouteId(); if (log.isInfoEnabled()) { log.info("activityId = " + activityId); @@ -158,35 +166,34 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } ContentMode mode = computeContentMode(); - //FIXME -// DataService dataService = getDataService(); - SetSeineDto bean = getBean(); - //FIXME -// TopiaEntityBinder<SetSeine> binder = getLoadBinder(); -// DataSource source = getDataSource(); -// if (setId == null) { -// -// // creation mode -// dataService.preCreate(source, activityId, bean, binder, getPreCreateExecutor()); -// -// } else { -// -// // update mode -// dataService.loadEditEntity(source, setId, getLoadExecutor()); -// } + FormDto<SetSeineDto> formDto; + if (setId == null) { - //FIXME -// RouteDto route = (RouteDto) getDataService().loadEntity(source, getDataContext().getSelectedRouteId(), false); -// -// Date time = bean.getStartTime(); -// -// Date date = route.getDate(); -// -// Date dateAndTime = DateUtil.getDateAndTime(date, time, false, false); -// -// getUi().getStartTime().setDate(dateAndTime); + // create mode + formDto = getSetSeineService().preCreate(selectedRouteId, activityId); + + } else { + + // update mode + formDto = getSetSeineService().loadToEdit(setId); + + } + + getModel().setFormDto(formDto); + SetSeineDtos.copySetSeineDto(formDto.getForm(), bean); + + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + FormDto<RouteDto> route = routeService.loadToRead(selectedRouteId); + + Date time = bean.getStartTime(); + + Date date = route.getForm().getDate(); + + Date dateAndTime = DateUtil.getDateAndTime(date, time, false, false); + + getUi().getStartTime().setDate(dateAndTime); // utilisation du mode requis setContentMode(mode); @@ -418,8 +425,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } - //FIXME protected SetSeineService getSetSeineService() { - return null; + return ObserveSwingApplicationContext.get().newService(SetSeineService.class); } } 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 7b21fd9..0bd0866 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,10 +22,12 @@ package fr.ird.observe.ui.content.open.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.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -150,29 +152,23 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } ActivityLonglineDto bean = getBean(); - //FIXME -// DataService dataService = getDataService(); - boolean create = activityId == null; - //FIXME -// Loador<ActivityLongline> binder = getLoadBinder(); + FormDto<ActivityLonglineDto> formDto; + if (create) { - DataSource source = getDataSource(); + // create mode + formDto = getActivityLonglineService().preCreate(tripId); + } else { - //FIXME -// if (create) { -// -// // create mode -// dataService.preCreate(source, tripId, bean, binder, getPreCreateExecutor()); -// -// } else { -// -// // update mode -// dataService.loadEditEntity(source, activityId, getLoadExecutor()); -// -// } + // update mode + formDto = getActivityLonglineService().loadToEdit(activityId); + + } + + getModel().setFormDto(formDto); + ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), bean); if (log.isDebugEnabled()) { log.debug(" long - lat = " + bean.getLongitude() + @@ -410,8 +406,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } - //FIXME protected ActivityLonglineService getActivityLonglineService() { - return null; + return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 3ed11d6..507c493 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -22,11 +22,13 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +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.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -147,22 +149,18 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline log.info(prefix + "mode = " + mode); } - //FIXME -// DataService dataService = getDataService(); - TripLonglineDto bean = getBean(); - DataSource source = getDataSource(); boolean create = tripId == null; - if (create) { - // create mode + FormDto<TripLonglineDto> formDto; + if (create) { if (log.isInfoEnabled()) { log.info(prefix + "create a new trip"); } - //FIXME -// dataService.preCreate(source, programId, bean, getLoadBinder(), getPreCreateExecutor()); + // create mode + formDto = getTripLonglineService().preCreate(programId); } else { @@ -170,10 +168,10 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline if (log.isInfoEnabled()) { log.info(prefix + "using existing trip " + tripId); } - //FIXME -// dataService.loadEditEntity(source, tripId, getLoadExecutor()); - //FIXME + // update mode + formDto = getTripLonglineService().loadToEdit(tripId); +//FIXME // if (!bean.isActivityLonglineEmpty()) { // on force le trie des routes @@ -181,6 +179,9 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline // } } + getModel().setFormDto(formDto); + TripLonglineDtos.copyTripLonglineDto(formDto.getForm(), bean); + getUi().getTripLonglineTabPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; @@ -335,8 +336,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } - //FIXME protected TripLonglineService getTripLonglineService() { - return null; + return ObserveSwingApplicationContext.get().newService(TripLonglineService.class); } } 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 23e0109..c6b5f3b 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 @@ -21,10 +21,12 @@ */ package fr.ird.observe.ui.content.open.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.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDtos; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -173,28 +175,24 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } ActivitySeineDto bean = getBean(); - //FIXME -// DataService dataService = getDataService(); - boolean create = activityId == null; - //FIXME -// Loador<ActivitySeine> binder = getLoadBinder(); + FormDto<ActivitySeineDto> formDto; + if (create) { - DataSource source = getDataSource(); + // create mode + formDto = getActivitySeineService().preCreate(routeId); + + } else { + + // update mode + formDto = getActivitySeineService().loadToEdit(activityId); + + } + + getModel().setFormDto(formDto); + ActivitySeineDtos.copyActivitySeineDto(formDto.getForm(), bean); - //FIXME -// if (create) { -// -// // create mode -// dataService.preCreate(source, routeId, bean, binder, getPreCreateExecutor()); -// -// } else { -// -// // update mode -// dataService.loadEditEntity(source, activityId, getLoadExecutor()); -// -// } if (log.isDebugEnabled()) { log.debug(prefix + "long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); @@ -444,10 +442,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } - - //FIXME protected ActivitySeineService getActivitySeineService() { - return null; + return ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); } } 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 4ed3b09..9fec73c 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 @@ -21,15 +21,15 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import fr.ird.observe.ObserveContext; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.UIHelper; @@ -37,7 +37,6 @@ import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -135,23 +134,27 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { boolean create = routeId == null; - //FIXME -// if (create) { -// -// // create mode -// dataService.preCreate(getDataSource(), tripId, editBean, getLoadBinder(), getPreCreateExecutor()); -// -// } else { -// -// // update mode -// dataService.loadEditEntity(getDataSource(), routeId, getLoadExecutor()); -// + FormDto<RouteDto> formDto; + if (create) { + + // create mode + formDto = getRouteService().preCreate(tripId); + + } else { + + // update mode + formDto = getRouteService().loadToEdit(routeId); + + //FIXME // if (!editBean.isActivitySeineEmpty()) { // // // on force le trie des activitys // ActivitySeines.sort(editBean.getActivitySeine()); // } -// } + } + + getModel().setFormDto(formDto); + RouteDtos.copyRouteDto(formDto.getForm(), editBean); finalizeOpenUI(mode, create); } @@ -444,8 +447,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { treeHelper.addUnsavedNode(parentNode, ActivitySeineDto.class); // on recupère l'écran d'édition - ActivitySeineUI selectedUI = (ActivitySeineUI) - ObserveContext.get().getSelectedContentUI(); + ActivitySeineUI selectedUI = (ActivitySeineUI) ObserveSwingApplicationContext.get().getSelectedContentUI(); // on recupère l'activity de fin de veille VesselActivitySeineDto vesselActivitySeine = null; @@ -524,8 +526,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } - //FIXME protected RouteService getRouteService() { - return null; + return ObserveSwingApplicationContext.get().newService(RouteService.class); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index c8ec607..7de1ee5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -21,11 +21,13 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +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.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.dto.FormDto; 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.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; @@ -35,8 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.util.Date; @@ -148,37 +149,37 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { log.info(prefix + "mode = " + mode); } - //FIXME -// DataService dataService = getDataService(); - TripSeineDto bean = getBean(); - DataSource source = getDataSource(); boolean create = tripId == null; - //FIXME -// if (create) { -// -// // create mode -// -// if (log.isInfoEnabled()) { -// log.info(prefix + "create a new trip"); -// } -// dataService.preCreate(source, programId, bean, getLoadBinder(), getPreCreateExecutor()); -// } else { -// -// // update mode -// if (log.isInfoEnabled()) { -// log.info(prefix + "using existing trip " + tripId); -// } -// dataService.loadEditEntity(source, tripId, getLoadExecutor()); -// + + FormDto<TripSeineDto> formDto; + if (create) { + + // create mode + if (log.isInfoEnabled()) { + log.info(prefix + "create a new trip"); + } + formDto = getTripSeineService().preCreate(programId); + + } else { + + // update mode + if (log.isInfoEnabled()) { + log.info(prefix + "using existing trip " + tripId); + } + formDto = getTripSeineService().loadToEdit(tripId); + + //FIXME // if (!bean.isRouteEmpty()) { // // // on force le trie des routes // Routes.sort(bean.getRoute()); // } -// -// } + } + + getModel().setFormDto(formDto); + TripSeineDtos.copyTripSeineDto(formDto.getForm(), bean); getUi().getTripSeineTabPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); @@ -334,9 +335,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } - //FIXME protected TripSeineService getTripSeineService() { - return null; + return ObserveSwingApplicationContext.get().newService(TripSeineService.class); } } 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 b560617..628c537 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 @@ -34,6 +34,7 @@ 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.ReferentialDtos; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.DecoratorService; @@ -494,17 +495,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content addInfoMessage(t("observe.message.creating.referentiel")); // creation mode - //FIXME -// try { -// getDataService().preCreate(getDataSource(), -// null, -// bean, -// getLoadBinder(), -// getPreCreateExecutor() -// ); -// } catch (DataSourceException e) { -// ErrorDialogUI.showError(e); -// } + FormDto<E> formDto = getReferentialService().preCreate(getBeanType()); + getModel().setFormDto(formDto); + ReferentialDtos.copyReferentialDto(formDto.getForm(), bean); } else { addInfoMessage(t("observe.message.updating.referentiel")); @@ -866,9 +859,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content return formDto; } - //FIXME protected ReferentialService getReferentialService() { - return null; + return ObserveSwingApplicationContext.get().newService(ReferentialService.class); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.