Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java
    ... ... @@ -24,7 +24,10 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete;
    24 24
    25 25 
     import fr.ird.observe.client.ui.ObserveMainUI;
    26 26 
     import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport;
    27 
    +import fr.ird.observe.client.ui.content.data.ll.logbook.ActivityLonglineLogbookUI;
    27 28 
     import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI;
    29 
    +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto;
    30 
    +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference;
    28 31 
     import fr.ird.observe.dto.data.ps.common.TripSeineDto;
    29 32 
     import fr.ird.observe.dto.data.ps.common.TripSeineReference;
    30 33 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    ... ... @@ -38,7 +41,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    38 41 
      *
    39 42 
      * @author Tony Chemit - dev@tchemit.fr
    40 43 
      */
    41 
    -public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> {
    44 
    +public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> {
    42 45
    43 46 
         public static final String ACTION_NAME = DeleteActivityLonglineLogbookUIAction.class.getName();
    44 47 
         private static final Logger log = LogManager.getLogger(DeleteActivityLonglineLogbookUIAction.class);
    ... ... @@ -48,7 +51,7 @@ public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActio
    48 51 
         }
    49 52
    50 53 
         @Override
    51 
    -    protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) {
    54 
    +    protected void doDelete(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode) {
    52 55 
             log.info("Will delete Activity " + bean.getId());
    53 56 
             String tripId = editNode.getParent().getId();
    54 57 
             getServicesProvider().getActivityLonglineLogbookService().delete(bean.getId());

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java
    ... ... @@ -24,7 +24,11 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete;
    24 24
    25 25 
     import fr.ird.observe.client.ui.ObserveMainUI;
    26 26 
     import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport;
    27 
    +import fr.ird.observe.client.ui.content.data.ll.observation.ActivityLonglineObsUI;
    27 28 
     import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI;
    29 
    +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto;
    30 
    +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsDto;
    31 
    +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference;
    28 32 
     import fr.ird.observe.dto.data.ps.common.TripSeineDto;
    29 33 
     import fr.ird.observe.dto.data.ps.common.TripSeineReference;
    30 34 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    ... ... @@ -38,7 +42,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    38 42 
      *
    39 43 
      * @author Tony Chemit - dev@tchemit.fr
    40 44 
      */
    41 
    -public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> {
    45 
    +public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineObsDto, ActivityLonglineObsReference, ActivityLonglineObsUI> {
    42 46
    43 47 
         public static final String ACTION_NAME = DeleteActivityLonglineObsUIAction.class.getName();
    44 48 
         private static final Logger log = LogManager.getLogger(DeleteActivityLonglineObsUIAction.class);
    ... ... @@ -48,7 +52,7 @@ public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSup
    48 52 
         }
    49 53
    50 54 
         @Override
    51 
    -    protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) {
    55 
    +    protected void doDelete(ActivityLonglineObsUI ui, ActivityLonglineObsDto bean, ObserveEditNode<ActivityLonglineObsDto> editNode) {
    52 56 
             log.info("Will delete Activity " + bean.getId());
    53 57 
             String tripId = editNode.getParent().getId();
    54 58 
             getServicesProvider().getActivityLonglineObsService().delete(bean.getId());

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.