branch feature/7017 updated (a6d9341 -> 02aea27)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git from a6d9341 do the math for lists-like ui (refs #7017) new 0e5d70b refactor save action for seine new 04bf64e refactor save action for longline new 02aea27 refactor delete action for seine and longline The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 02aea27337d9e4095805f163e0a57d137d7576be Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Apr 28 08:29:47 2015 +0200 refactor delete action for seine and longline commit 04bf64e51b6c8eefdc6c4b110872fb9826f1e5a8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 27 17:15:40 2015 +0200 refactor save action for longline Conflicts: observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java commit 0e5d70b9155016dd137105e892df481ee34480d7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 27 15:40:56 2015 +0200 refactor save action for seine Conflicts: observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java Summary of changes: .../observe/services/AbstractObserveService.java | 43 ++++++++ .../data/longline/ActivityLonglineService.java | 2 +- .../data/longline/ActivityLonglineServiceImpl.java | 42 +++++--- .../services/data/longline/SetLonglineService.java | 8 ++ .../data/longline/SetLonglineServiceImpl.java | 114 +++++++++++++++++++++ .../data/longline/TripLonglineService.java | 2 +- .../data/longline/TripLonglineServiceImpl.java | 62 +++++------ .../services/data/seine/ActivitySeineService.java | 2 +- .../data/seine/ActivitySeineServiceImpl.java | 72 ++++++------- .../services/data/seine/FloatingObjectService.java | 2 +- .../data/seine/FloatingObjectServiceImpl.java | 47 +++------ .../observe/services/data/seine/RouteService.java | 2 +- .../services/data/seine/RouteServiceImpl.java | 110 +++++++++----------- .../services/data/seine/SetSeineService.java | 2 +- .../services/data/seine/SetSeineServiceImpl.java | 51 ++++----- .../services/data/seine/TripSeineService.java | 2 +- .../services/data/seine/TripSeineServiceImpl.java | 8 +- .../impl/longline/SetLonglineUIHandler.java | 45 +------- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 10 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- 24 files changed, 354 insertions(+), 292 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit 0e5d70b9155016dd137105e892df481ee34480d7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 27 15:40:56 2015 +0200 refactor save action for seine Conflicts: observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java --- .../services/data/seine/ActivitySeineService.java | 2 +- .../data/seine/ActivitySeineServiceImpl.java | 60 ++++++-------- .../services/data/seine/FloatingObjectService.java | 2 +- .../data/seine/FloatingObjectServiceImpl.java | 47 ++++------- .../observe/services/data/seine/RouteService.java | 2 +- .../services/data/seine/RouteServiceImpl.java | 92 +++++++++------------- .../services/data/seine/SetSeineService.java | 2 +- .../services/data/seine/SetSeineServiceImpl.java | 51 +++++------- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 10 +-- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- 12 files changed, 109 insertions(+), 171 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java index 113d897..6278b0b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineService.java @@ -31,7 +31,7 @@ public interface ActivitySeineService extends ObserveService { ActivitySeine preCreate(String tripLonglineId); @Commit - ActivitySeine save(String routeId, ActivitySeine toSave); + String save(String routeId, ActivitySeine toSave); @Commit ActivitySeine updateObservedSystem(ActivitySeine toUpdate); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java index 5fe7977..59e4265 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java @@ -159,24 +159,36 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements } + @Override - public ActivitySeine save(String routeId, ActivitySeine toSave) { + public String save(String routeId, ActivitySeine toSave) { + String activitySeineId = doSave(routeId, toSave, new SaveAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { - ActivitySeine saved; + @Override + public ActivitySeine onCreate(Route parent, ActivitySeine toCreate) { - if (toSave.getTopiaId() == null) { + ActivitySeine created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - // create - saved = create(routeId, toSave); + parent.addActivitySeine(created); + return created; + } - } else { + @Override + public ActivitySeine onUpdate(Route parent, ActivitySeine toUpdate, ActivitySeine updated) { + Date d = DateUtil.getDateAndTime(parent.getDate(), toUpdate.getTime(), false, false); - // update - saved = update(routeId, toSave); + toUpdate.setTime(d); - } + getBinderForEdit().copyExcluding(toUpdate, updated, + ActivitySeine.PROPERTY_OBSERVED_SYSTEM, + ActivitySeine.PROPERTY_FLOATING_OBJECT); - return saved; + return updated; + } + }); + + return activitySeineId; } @@ -276,34 +288,6 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements } - protected ActivitySeine create(String routeId, ActivitySeine toCreate) { - - ActivitySeineDAO dao = getDao(); - ActivitySeine created = dao.create(toCreate); - - Route route = findByTopiaId(Route.class, routeId); - route.addActivitySeine(created); - - return created; - - } - - protected ActivitySeine update(String routeId, ActivitySeine toUpdate) { - - Route route = findByTopiaId(Route.class, routeId); - Date d = DateUtil.getDateAndTime(route.getDate(), toUpdate.getTime(), false, false); - - toUpdate.setTime(d); - - ActivitySeineDAO dao = getDao(); - ActivitySeine updated = dao.findByTopiaId(toUpdate.getTopiaId()); - getBinderForEdit().copyExcluding(toUpdate, updated, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - ActivitySeine.PROPERTY_FLOATING_OBJECT); - return updated; - - } - protected ActivitySeineDAO getDao() { return (ActivitySeineDAO) getDao(ActivitySeine.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java index 80e7225..c9dec98 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectService.java @@ -28,7 +28,7 @@ public interface FloatingObjectService extends ObserveService { FloatingObject preCreate(String activitySeineId); @Commit - FloatingObject save(String activitySeineId, FloatingObject toSave); + String save(String activitySeineId, FloatingObject toSave); @Commit FloatingObject updateTransmittingBuoyOperation(FloatingObject toUpdate); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java index ef466ec..f4e9fa4 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java @@ -71,23 +71,30 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } @Override - public FloatingObject save(String activitySeineId, FloatingObject toSave) { + public String save(String activitySeineId, FloatingObject toSave) { - FloatingObject saved; + String floatingObjectId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, FloatingObject>(ActivitySeine.class, FloatingObject.class) { - if (toSave.getTopiaId() == null) { + @Override + public FloatingObject onCreate(ActivitySeine parent, FloatingObject toCreate) { - // create - saved = create(activitySeineId, toSave); + FloatingObject created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - } else { + parent.addFloatingObject(created); - // update - saved = update(toSave); + return created; - } + } + + @Override + public FloatingObject onUpdate(ActivitySeine parent, FloatingObject toUpdate, FloatingObject updated) { + copyForEdit(toUpdate, updated); + return updated; + } + }); - return saved; + return floatingObjectId; } @@ -247,26 +254,6 @@ public class FloatingObjectServiceImpl extends AbstractObserveService implements } - protected FloatingObject create(String activitySeineId, FloatingObject toCreate) { - - FloatingObjectDAO dao = getDao(); - FloatingObject created = dao.create(toCreate); - - ActivitySeine route = findByTopiaId(ActivitySeine.class, activitySeineId); - route.addFloatingObject(created); - - return created; - - } - - protected FloatingObject update(FloatingObject toUpdate) { - - FloatingObject updated = getDao().findByTopiaId(toUpdate.getTopiaId()); - copyForEdit(toUpdate, updated); - return updated; - - } - protected FloatingObjectDAO getDao() { return (FloatingObjectDAO) getDao(FloatingObject.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java index b968807..6dbd6ff 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteService.java @@ -27,7 +27,7 @@ public interface RouteService extends ObserveService { Route preCreate(String tripSeineId); @Commit - Route save(String tripSeineId, Route toSave); + String save(String tripSeineId, Route toSave); @Commit void delete(String tripSeineId, String routeId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java index 0333785..a7f832b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java @@ -97,27 +97,50 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer } @Override - public Route save(String tripSeineId, Route toSave) { + public String save(String tripSeineId, Route toSave) { - Route saved; + String routeId = doSave(tripSeineId, toSave, new SaveAction<TripSeine, Route>(TripSeine.class, Route.class) { - // on sauvegarde toujours en debut de jour - Date date = DateUtil.getDay(toSave.getDate()); - toSave.setDate(date); + @Override + public Route onCreate(TripSeine parent, Route toCreate) { - if (toSave.getTopiaId() == null) { + Route created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - // create - saved = create(tripSeineId, toSave); + parent.addRoute(created); - } else { + // on met a jour si necessaire la date de fin de la maree + parent.updateDateFin(); + + return created; + } - // update - saved = update(tripSeineId, toSave); + @Override + public Route onUpdate(TripSeine parent, Route toUpdate, Route updated) { - } + // on conserve l'ancienne date d'observation + Date oldDate = DateUtil.getDay(toUpdate.getDate()); + + // recopie des propriétés vers le bean a sauver + getBinderForEdit().copyExcluding(toUpdate, updated, Route.PROPERTY_ACTIVITY_SEINE); + + if (!oldDate.equals(toUpdate.getDate())) { + + //FIXME Faire cela avec une requete sql, sinon ca charge trop de données + // le jour a change, il faut mettre à jour les dates des activites et des calees + updated.updateDates(); + + } + + // on met a jour si necessaire la date de fin de la maree + parent.updateDateFin(); - return saved; + return updated; + + } + }); + + return routeId; } @@ -217,49 +240,6 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer } - protected Route create(String tripSeineId, Route toCreate) { - - RouteDAO dao = getDao(); - Route created = dao.create(toCreate); - - TripSeine tripSeine = findByTopiaId(TripSeine.class, tripSeineId); - tripSeine.addRoute(created); - - // on met a jour si necessaire la date de fin de la maree - tripSeine.updateDateFin(); - - return created; - - } - - protected Route update(String tripSeineId, Route toUpdate) { - - RouteDAO dao = getDao(); - Route updated = dao.findByTopiaId(toUpdate.getTopiaId()); - - // on conserve l'ancienne date d'observation - Date oldDate = DateUtil.getDay(toUpdate.getDate()); - - // recopie des propriétés vers le bean a sauver - getBinderForEdit().copyExcluding(toUpdate, updated, Route.PROPERTY_ACTIVITY_SEINE); - - if (!oldDate.equals(toUpdate.getDate())) { - - //FIXME Faire cela avec une requete sql, sinon ca charge trop de données - // le jour a change, il faut mettre à jour les dates des activites et des calees - updated.updateDates(); - - } - - TripSeine tripSeine = findByTopiaId(TripSeine.class, tripSeineId); - - // on met a jour si necessaire la date de fin de la maree - tripSeine.updateDateFin(); - - return updated; - - } - protected RouteDAO getDao() { return (RouteDAO) getDao(Route.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java index b646c2e..9d86f50 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineService.java @@ -25,7 +25,7 @@ public interface SetSeineService extends ObserveService { SetSeine preCreate(String routeId, String activitySeineId); @Commit - SetSeine save(String activitySeineId, SetSeine toSave); + String save(String activitySeineId, SetSeine toSave); @Commit void delete(String activitySeineId, String setSeineId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java index e012079..cc31a3d 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java @@ -93,24 +93,33 @@ public class SetSeineServiceImpl extends AbstractObserveService implements SetSe } @Override - public SetSeine save(String activitySeineId, SetSeine toSave) { + public String save(String activitySeineId, SetSeine toSave) { - SetSeine saved; + String setSeineId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, SetSeine>(ActivitySeine.class, SetSeine.class) { - if (toSave.getTopiaId() == null) { + @Override + public SetSeine onCreate(ActivitySeine parent, SetSeine toCreate) { - // create - saved = create(activitySeineId, toSave); + SetSeine created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - } else { + parent.setSetSeine(created); - // update - saved = update(toSave); + return created; + } - } + @Override + public SetSeine onUpdate(ActivitySeine parent, SetSeine toUpdate, SetSeine updated) { - return saved; + getBinderForEdit().copyExcluding(toUpdate, updated, + SetSeine.PROPERTY_TARGET_SAMPLE, + SetSeine.PROPERTY_NON_TARGET_SAMPLE); + return updated; + } + }); + + return setSeineId; } @@ -181,26 +190,4 @@ public class SetSeineServiceImpl extends AbstractObserveService implements SetSe return (SetSeineDAO) getDao(SetSeine.class); } - protected SetSeine create(String activitySeineId, SetSeine toCreate) { - - SetSeineDAO dao = getDao(); - SetSeine created = dao.create(toCreate); - - ActivitySeine activitySeine = findByTopiaId(ActivitySeine.class, activitySeineId); - activitySeine.setSetSeine(created); - - return created; - - } - - protected SetSeine update(SetSeine toUpdate) { - - SetSeine updated = getDao().findByTopiaId(toUpdate.getTopiaId()); - getBinderForEdit().copyExcluding(toUpdate, updated, - SetSeine.PROPERTY_TARGET_SAMPLE, - SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return updated; - - } - } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 0ef7e26..cec5c6c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -162,8 +162,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObject> { String activityId = getSelectedParentId(); FloatingObjectService service = getService(FloatingObjectService.class); - FloatingObject saved = service.save(activityId, bean); - service.copyForEdit(saved, bean); + String savedId = service.save(activityId, bean); + bean.setTopiaId(savedId); return true; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 4bb3643..904c177 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -242,8 +242,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeine> { String activityId = getSelectedParentId(); SetSeineService service = getService(SetSeineService.class); - SetSeine saved = service.save(activityId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(activityId, bean); + bean.setTopiaId(savedId); return true; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 9641102..10cf6ab 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -218,9 +218,9 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei t("observe.activitySeine.message.creating")); } else { addMessage(ui, - NuitonValidatorScope.INFO, - getEntityLabel(ActivitySeine.class), - t("observe.activitySeine.message.updating")); + NuitonValidatorScope.INFO, + getEntityLabel(ActivitySeine.class), + t("observe.activitySeine.message.updating")); } super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME, @@ -250,8 +250,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei bean.setOpen(true); ActivitySeineService service = getService(ActivitySeineService.class); - ActivitySeine saved = service.save(routeId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(routeId, bean); + bean.setTopiaId(savedId); obtainChildPosition(bean); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 6bbbcc9..5f58080 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -203,8 +203,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<Route> { bean.setOpen(true); RouteService service = getService(RouteService.class); - Route saved = service.save(tripId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(tripId, bean); + bean.setTopiaId(savedId); obtainChildPosition(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 feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit 04bf64e51b6c8eefdc6c4b110872fb9826f1e5a8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 27 17:15:40 2015 +0200 refactor save action for longline Conflicts: observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java --- .../data/longline/ActivityLonglineService.java | 2 +- .../data/longline/ActivityLonglineServiceImpl.java | 29 ++++-- .../services/data/longline/SetLonglineService.java | 8 ++ .../data/longline/SetLonglineServiceImpl.java | 114 +++++++++++++++++++++ .../data/longline/TripLonglineService.java | 2 +- .../data/longline/TripLonglineServiceImpl.java | 56 +++++----- .../impl/longline/SetLonglineUIHandler.java | 45 +------- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- 9 files changed, 174 insertions(+), 90 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineService.java index ed6fbfa..cebe40e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineService.java @@ -27,7 +27,7 @@ public interface ActivityLonglineService extends ObserveService { ActivityLongline preCreate(String tripLonglineId); @Commit - ActivityLongline save(String tripLonglineId, ActivityLongline toSave); + String save(String tripLonglineId, ActivityLongline toSave); @Commit void delete(String tripLonglineId, String activityLonglineId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java index d25a0e2..14a8e39 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java @@ -101,23 +101,32 @@ public class ActivityLonglineServiceImpl extends AbstractObserveService implemen } @Override - public ActivityLongline save(String tripLonglineId, ActivityLongline toSave) { + public String save(String tripLonglineId, ActivityLongline toSave) { - ActivityLongline saved; + String activityLonglineId = doSave(tripLonglineId, toSave, new SaveAction<TripLongline, ActivityLongline>(TripLongline.class, ActivityLongline.class) { - if (toSave.getTopiaId() == null) { + @Override + public ActivityLongline onCreate(TripLongline parent, ActivityLongline toCreate) { - // create - saved = create(tripLonglineId, toSave); + ActivityLongline created = getDao().create(); + getBinderForEdit().copy(toCreate, created); - } else { + parent.addActivityLongline(created); + return created; + } - // update - saved = update(toSave); + @Override + public ActivityLongline onUpdate(TripLongline parent, ActivityLongline toUpdate, ActivityLongline updated) { - } + getBinderForEdit().copyExcluding(toUpdate, updated, + ActivityLongline.PROPERTY_ENCOUNTER, + ActivityLongline.PROPERTY_SENSOR_USED); + + return updated; + } + }); - return saved; + return activityLonglineId; } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineService.java index 6e28f73..38f574b 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineService.java @@ -2,7 +2,9 @@ package fr.ird.observe.services.data.longline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.NoTransaction; import fr.ird.observe.services.ObserveService; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; import java.util.List; @@ -18,4 +20,10 @@ public interface SetLonglineService extends ObserveService { List<Section> getSections(String setLonglineId); + String save(String activityId, SetLongline bean); + + @NoTransaction + TopiaEntityBinder<SetLongline> getBinderForEdit(); + + } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java index c02e1bb..e432560 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java @@ -1,13 +1,19 @@ package fr.ird.observe.services.data.longline; +import fr.ird.observe.BinderService; +import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.SetLonglineDAO; +import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.AbstractObserveService; import org.nuiton.decorator.Decorator; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderModelBuilder; import java.util.List; @@ -64,6 +70,114 @@ public class SetLonglineServiceImpl extends AbstractObserveService implements Se } + @Override + public String save(String activityLonglineId, SetLongline toSave) { + String setLonglineId = doSave(activityLonglineId, toSave, new SaveAction<ActivityLongline, SetLongline>(ActivityLongline.class, SetLongline.class) { + + @Override + public SetLongline onCreate(ActivityLongline parent, SetLongline toCreate) { + + SetLongline created = getDao().create(); + getBinderForEdit().copy(toCreate, created); + + parent.setSetLongline(created); + + return created; + } + + @Override + public SetLongline onUpdate(ActivityLongline parent, SetLongline toUpdate, SetLongline updated) { + + getBinderForEdit().copyExcluding(toUpdate, updated, + SetLongline.PROPERTY_BAITS_COMPOSITION, + SetLongline.PROPERTY_FLOATLINES_COMPOSITION, + SetLongline.PROPERTY_HOOKS_COMPOSITION, + SetLongline.PROPERTY_BRANCHLINES_COMPOSITION, + SetLongline.PROPERTY_SECTION, + SetLongline.PROPERTY_CATCH_LONGLINE, + SetLongline.PROPERTY_MITIGATION_TYPE, + SetLongline.PROPERTY_TDR); + return updated; + + } + }); + + return setLonglineId; + } + + @Override + public TopiaEntityBinder<SetLongline> getBinderForEdit() { + TopiaEntityBinder<SetLongline> r = loadBinder("-forEdit", SetLongline.class, new CreateBinder<SetLongline>() { + + @Override + public BinderModelBuilder<SetLongline, SetLongline> createBinderBuilder(BinderService binderService, String name) { + + BinderModelBuilder<SetLongline, SetLongline> builder = binderService.newBinderBuilder( + SetLongline.class, + SetLongline.PROPERTY_COMMENT, + + // setting tab + SetLongline.PROPERTY_HOME_ID, + SetLongline.PROPERTY_NUMBER, + + SetLongline.PROPERTY_SETTING_START_TIME_STAMP, + SetLongline.PROPERTY_SETTING_START_QUADRANT, + SetLongline.PROPERTY_SETTING_START_LATITUDE, + SetLongline.PROPERTY_SETTING_START_LONGITUDE, + + SetLongline.PROPERTY_SETTING_END_TIME_STAMP, + SetLongline.PROPERTY_SETTING_END_QUADRANT, + SetLongline.PROPERTY_SETTING_END_LATITUDE, + SetLongline.PROPERTY_SETTING_END_LONGITUDE, + + // setting caracteristics tab + SetLongline.PROPERTY_SETTING_SHAPE, + SetLongline.PROPERTY_LINE_TYPE, + SetLongline.PROPERTY_LIGHTSTICKS_TYPE, + SetLongline.PROPERTY_LIGHTSTICKS_COLOR, + SetLongline.PROPERTY_SETTING_VESSEL_SPEED, + SetLongline.PROPERTY_MAX_DEPTH_TARGETED, + SetLongline.PROPERTY_SHOOTER_USED, + SetLongline.PROPERTY_SHOOTER_SPEED, + SetLongline.PROPERTY_WEIGHTED_SWIVEL, + SetLongline.PROPERTY_SWIVEL_WEIGHT, + SetLongline.PROPERTY_WEIGHTED_SNAP, + SetLongline.PROPERTY_SNAP_WEIGHT, + SetLongline.PROPERTY_MONITORED, + SetLongline.PROPERTY_TIME_BETWEEN_HOOKS, + SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLongline.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLongline.PROPERTY_TOTAL_BASKETS_COUNT, + SetLongline.PROPERTY_TOTAL_HOOKS_COUNT, + + // hauling tab + SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + + SetLongline.PROPERTY_HAULING_START_QUADRANT, + SetLongline.PROPERTY_HAULING_START_LATITUDE, + SetLongline.PROPERTY_HAULING_START_LONGITUDE, + SetLongline.PROPERTY_HAULING_START_TIME_STAMP, + + SetLongline.PROPERTY_HAULING_END_QUADRANT, + SetLongline.PROPERTY_HAULING_END_LATITUDE, + SetLongline.PROPERTY_HAULING_END_LONGITUDE, + SetLongline.PROPERTY_HAULING_END_TIME_STAMP, + + SetLongline.PROPERTY_HAULING_BREAKS); + + // on ajoute la recopie de l'association route + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); + + return builder; + } + + }); + + return r; + } + protected SetLonglineDAO getDao() { return (SetLonglineDAO) getDao(SetLongline.class); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineService.java index 28b8255..510b6ac 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineService.java @@ -27,7 +27,7 @@ public interface TripLonglineService extends ObserveService { TripLongline preCreate(String programId); @Commit - TripLongline save(TripLongline toSave); + String save(TripLongline toSave); @Commit void delete(String tripLonglineId); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java index 215c5d8..5a6501d 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java @@ -87,29 +87,36 @@ public class TripLonglineServiceImpl extends AbstractObserveService implements T } @Override - public TripLongline save(TripLongline toSave) { + public String save(TripLongline toSave) { - Date startDate = DateUtil.getDay(toSave.getStartDate()); - toSave.setStartDate(startDate); + String tripLonglineId = doSave(null, toSave, new SaveAction<Program, TripLongline>(Program.class, TripLongline.class) { - // mise a jour de la date de fin - toSave.updateDateFin(); - - TripLongline saved; - - if (toSave.getTopiaId() == null) { + @Override + public void beforeSave(String parentId, TripLongline toSave) { + super.beforeSave(parentId, toSave); + Date startDate = DateUtil.getDay(toSave.getStartDate()); + toSave.setStartDate(startDate); - // create - saved = create(toSave); + // mise a jour de la date de fin + toSave.updateDateFin(); - } else { + } - // update - saved = update(toSave); + @Override + public TripLongline onCreate(Program parent, TripLongline toCreate) { + TripLongline created = getDao().create(); + getBinderForEdit().copy(toCreate, created); + return created; + } - } + @Override + public TripLongline onUpdate(Program parentBean, TripLongline toUpdate, TripLongline updated) { + getBinderForEdit().copyExcluding(toUpdate, updated, TripLongline.PROPERTY_ACTIVITY_LONGLINE); + return updated; + } + }); - return saved; + return tripLonglineId; } @@ -201,23 +208,6 @@ public class TripLonglineServiceImpl extends AbstractObserveService implements T } - protected TripLongline create(TripLongline toCreate) { - - TripLonglineDAO dao = getDao(); - TripLongline created = dao.create(toCreate); - return created; - - } - - protected TripLongline update(TripLongline toUpdate) { - - TripLonglineDAO dao = getDao(); - TripLongline updated = dao.findByTopiaId(toUpdate.getTopiaId()); - getBinderForEdit().copyExcluding(toUpdate, updated, TripLongline.PROPERTY_ACTIVITY_LONGLINE); - return updated; - - } - protected TripLonglineDAO getDao() { return (TripLonglineDAO) getDao(TripLongline.class); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 54f8c65..11414a1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -30,6 +30,7 @@ import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.data.longline.SetLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; @@ -374,48 +375,10 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { String activityId = getSelectedParentId(); - if (bean.getTopiaId() == null) { - - dataService.create(dataSource, activityId, bean, binder, getCreateExecutor()); - - } else { - - dataService.update(dataSource, null, bean, getUpdateExecutor()); - - } - + SetLonglineService service = getService(SetLonglineService.class); + String savedId = service.save(activityId, bean); + bean.setTopiaId(savedId); return true; - - } - - @Override - protected SetLongline onCreate(TopiaContext tx, Object parent, SetLongline editBean) throws TopiaException { - - ActivityLongline parentBean = (ActivityLongline) parent; - SetLongline beanToSave = ObserveDAOHelper.getSetLonglineDAO(tx).create(); - editBean.setTopiaId(beanToSave.getTopiaId()); - parentBean.setSetLongline(beanToSave); - return beanToSave; - - } - - @Override - protected SetLongline onUpdate(TopiaContext tx, - Object parentBean, - SetLongline beanToSave) throws TopiaException { - - getLoadBinder().copyExcluding(getBean(), - beanToSave, - SetLongline.PROPERTY_BAITS_COMPOSITION, - SetLongline.PROPERTY_FLOATLINES_COMPOSITION, - SetLongline.PROPERTY_HOOKS_COMPOSITION, - SetLongline.PROPERTY_BRANCHLINES_COMPOSITION, - SetLongline.PROPERTY_SECTION, - SetLongline.PROPERTY_CATCH_LONGLINE, - SetLongline.PROPERTY_MITIGATION_TYPE, - SetLongline.PROPERTY_TDR); - return beanToSave; - } @Override diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 7938b31..ef7ce2c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -206,8 +206,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity bean.setOpen(true); ActivityLonglineService service = getService(ActivityLonglineService.class); - ActivityLongline saved = service.save(tripId, bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(tripId, bean); + bean.setTopiaId(savedId); obtainChildPosition(bean); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 83985f0..0bbc283 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -229,8 +229,8 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline bean.setOpen(true); TripLonglineService service = getService(TripLonglineService.class); - TripLongline saved = service.save(bean); - bean.setTopiaId(saved.getTopiaId()); + String savedId = service.save(bean); + bean.setTopiaId(savedId); // recuperation de la position de la maree dans le program obtainChildPosition(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 feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit 02aea27337d9e4095805f163e0a57d137d7576be Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Apr 28 08:29:47 2015 +0200 refactor delete action for seine and longline --- .../observe/services/AbstractObserveService.java | 43 ++++++++++++++++++++++ .../data/longline/ActivityLonglineServiceImpl.java | 13 ++++--- .../data/longline/TripLonglineServiceImpl.java | 6 +-- .../data/seine/ActivitySeineServiceImpl.java | 12 +++--- .../services/data/seine/RouteServiceImpl.java | 18 +++++---- .../services/data/seine/TripSeineService.java | 2 +- .../services/data/seine/TripSeineServiceImpl.java | 8 +--- 7 files changed, 71 insertions(+), 31 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java index 7af5a7a..0e6e506 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java @@ -273,6 +273,49 @@ public abstract class AbstractObserveService implements ObserveService { } + public <P extends TopiaEntity, E extends TopiaEntity> void doDelete(String parentId, String idToDelete, DeleteAction<P, E> deleteAction) { + + P parent = null; + + if (parentId != null) { + + parent = findByTopiaId(deleteAction.parentClass, parentId); + + checkNotNullAndExistingEntity(PARENT_BEAN, parent); + } + + E toDelete = findByTopiaId(deleteAction.entityClass, idToDelete); + + checkNotNullAndExistingEntity(BEAN, toDelete); + + deleteAction.onDelete(parent, toDelete); + + if (parentId != null) { + + getDao(deleteAction.parentClass).update(parent); + } + + + } + + protected class DeleteAction<P extends TopiaEntity, E extends TopiaEntity> { + + protected final Class<P> parentClass; + + protected final Class<E> entityClass; + + public DeleteAction(Class<P> parentClass, Class<E> entityClass) { + this.parentClass = parentClass; + this.entityClass = entityClass; + } + + public void onDelete(P parent, E toDelete) { + getDao(entityClass).delete(toDelete); + } + + } + + public <E extends TopiaEntity> void checkNotNullAndNoneExistingEntity(String variableName, E entity) { TopiaEntityHelper.checkNotNullAndNoneExistingEntity(variableName, entity); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java index 14a8e39..8e992bc 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java @@ -132,12 +132,13 @@ public class ActivityLonglineServiceImpl extends AbstractObserveService implemen @Override public void delete(String tripLonglineId, String activityLonglineId) { - - ActivityLonglineDAO dao = getDao(); - ActivityLongline toDelete = dao.findByTopiaId(activityLonglineId); - - TripLongline tripLongline = findByTopiaId(TripLongline.class, tripLonglineId); - tripLongline.removeActivityLongline(toDelete); + doDelete(tripLonglineId, activityLonglineId, new DeleteAction<TripLongline, ActivityLongline>(TripLongline.class, ActivityLongline.class) { + @Override + public void onDelete(TripLongline parent, ActivityLongline toDelete) { + super.onDelete(parent, toDelete); + parent.removeActivityLongline(toDelete); + } + }); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java index 5a6501d..d832799 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java @@ -122,11 +122,7 @@ public class TripLonglineServiceImpl extends AbstractObserveService implements T @Override public void delete(String tripLonglineId) { - - TripLonglineDAO dao = getDao(); - TripLongline toDelete = dao.findByTopiaId(tripLonglineId); - dao.delete(toDelete); - + doDelete(null, tripLonglineId, new DeleteAction<Program, TripLongline>(Program.class, TripLongline.class)); } @Override diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java index 59e4265..2dea317 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java @@ -194,12 +194,14 @@ public class ActivitySeineServiceImpl extends AbstractObserveService implements @Override public void delete(String routeId, String activitySeineId) { + doDelete(routeId, activitySeineId, new DeleteAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { + @Override + public void onDelete(Route parent, ActivitySeine toDelete) { + super.onDelete(parent, toDelete); + parent.removeActivitySeine(toDelete); - ActivitySeineDAO dao = getDao(); - ActivitySeine toDelete = dao.findByTopiaId(activitySeineId); - - Route route = findByTopiaId(Route.class, routeId); - route.removeActivitySeine(toDelete); + } + }); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java index a7f832b..7fde18e 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/RouteServiceImpl.java @@ -146,16 +146,18 @@ public class RouteServiceImpl extends AbstractObserveService implements RouteSer @Override public void delete(String tripSeineId, String routeId) { + doDelete(tripSeineId, routeId, new DeleteAction<TripSeine, Route>(TripSeine.class, Route.class) { + @Override + public void onDelete(TripSeine parent, Route toDelete) { + super.onDelete(parent, toDelete); - RouteDAO dao = getDao(); - Route toDelete = dao.findByTopiaId(routeId); - - TripSeine tripSeine = findByTopiaId(TripSeine.class, tripSeineId); - tripSeine.removeRoute(toDelete); - tripSeine.updateDateFin(); - - dao.delete(toDelete); + // suppression de la route + parent.removeRoute(toDelete); + // mise à jour de la date de fin de marée + parent.updateDateFin(); + } + }); } @Override diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineService.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineService.java index bbc6fd1..4ba8a05 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineService.java @@ -30,7 +30,7 @@ public interface TripSeineService extends ObserveService { String save(TripSeine toSave); @Commit - void delete(String tripSeineId); + void delete(String idToDelete); @NoTransaction TopiaEntityBinder<TripSeine> getBinderForEdit(); diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java index 985bd35..b092415 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java @@ -124,12 +124,8 @@ public class TripSeineServiceImpl extends AbstractObserveService implements Trip } @Override - public void delete(String tripSeineId) { - - TripSeineDAO dao = getDao(); - TripSeine toDelete = dao.findByTopiaId(tripSeineId); - dao.delete(toDelete); - + public void delete(String idtoDelete) { + doDelete(null, idtoDelete, new DeleteAction<Program, TripSeine>(Program.class, TripSeine.class)); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm