branch feature/7621 updated (a0880a9 -> de3f941)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7621 in repository observe. See http://git.codelutin.com/observe.git from a0880a9 ajout des menus contextuels new 888e819 ajout des actions sur les nouveaux menus (refs #7621) new a615364 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme new fe44b06 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert new de3f941 réactivation de l'action pour changer une marée de programme The 4 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 de3f941a5072922ebc139ca534ca8f2a73ef2686 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:41:45 2015 +0100 réactivation de l'action pour changer une marée de programme commit fe44b0685d4171f6b74dc4d3e996460d06cb56d7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:40:09 2015 +0100 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert commit a6153644d7a3a1dd9fb551d8a9c4dd0a1ea2b062 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:39:24 2015 +0100 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme commit 888e8196af04c429f255651aa2d00b7fd1f7f18c Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 11:02:54 2015 +0100 ajout des actions sur les nouveaux menus (refs #7621) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 3 + .../fr/ird/observe/business/db/DataContext.java | 6 ++ .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 3 + .../tree/ObserveNavigationTreeShowPopupAction.java | 91 +++++++++++++--------- .../actions/ChangeTripProgramActionListener.java | 52 ++++++------- .../ActivityLonglineServiceController.java | 10 +-- .../v1/longline/SetLonglineServiceController.java | 13 ++-- .../v1/longline/TripLonglineServiceController.java | 9 ++- .../v1/seine/ActivitySeineServiceController.java | 9 ++- .../v1/seine/FloatingObjectServiceController.java | 13 ++-- .../v1/seine/RouteServiceController.java | 13 ++-- .../v1/seine/SetSeineServiceController.java | 13 ++-- .../v1/seine/TripSeineServiceController.java | 9 ++- .../observe/ObserveTopiaPersistenceContext.java | 4 + .../service/longline/ActivityLonglineService.java | 5 +- .../service/longline/SetLonglineService.java | 7 +- .../service/longline/TripLonglineService.java | 12 ++- .../service/seine/ActivitySeineService.java | 5 +- .../service/seine/FloatingObjectService.java | 7 +- .../services/service/seine/RouteService.java | 7 +- .../services/service/seine/SetSeineService.java | 7 +- .../services/service/seine/TripSeineService.java | 9 ++- .../longline/ActivityLonglineServiceTopia.java | 9 ++- .../service/longline/SetLonglineServiceTopia.java | 10 ++- .../service/longline/TripLonglineServiceTopia.java | 19 ++++- .../service/seine/ActivitySeineServiceTopia.java | 9 ++- .../service/seine/FloatingObjectServiceTopia.java | 9 ++- .../services/service/seine/RouteServiceTopia.java | 9 ++- .../service/seine/SetSeineServiceTopia.java | 9 ++- .../service/seine/TripSeineServiceTopia.java | 13 +++- 30 files changed, 244 insertions(+), 150 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/7621 in repository observe. See http://git.codelutin.com/observe.git commit 888e8196af04c429f255651aa2d00b7fd1f7f18c Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 11:02:54 2015 +0100 ajout des actions sur les nouveaux menus (refs #7621) --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 3 +++ .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 3 +++ .../observe/ui/tree/ObserveNavigationTreeShowPopupAction.java | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) 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 5451514..553a19d 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 @@ -960,6 +960,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im exists = newService(SetLonglineService.class).exists(id); + } else { + + exists = false; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css index 023515c..5ba212f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css @@ -56,16 +56,19 @@ JSplitPane { text: "observe.navigationMenu.openTripAction"; toolTipText: "observe.navigationMenu.openTripAction"; enabled: {!dataContext.isOpenTrip()}; + action: {new fr.ird.observe.ui.actions.shared.ReOpenUIAction(this)}; } #navigationCloseTripAction { text: "observe.navigationMenu.closeTripAction"; toolTipText: "observe.navigationMenu.closeTripAction"; + action: {new fr.ird.observe.ui.actions.shared.CloseOpenUIAction(this)}; } #navigationDeleteTripAction { text: "observe.navigationMenu.deleteTripAction"; toolTipText: "observe.navigationMenu.deleteTripAction"; + action: {new fr.ird.observe.ui.actions.shared.DeleteDataUIAction(this)}; } #menuFile { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 51b8641..5c88f99 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree; */ import com.google.common.base.Preconditions; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.referential.ProgramDto; import org.apache.commons.logging.Log; @@ -224,6 +225,8 @@ public class ObserveNavigationTreeShowPopupAction { } if (selectedNode.isOpen()) { + + closeTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); popup.add(closeTripAction); popup.add(moveTripPopup); @@ -271,11 +274,15 @@ public class ObserveNavigationTreeShowPopupAction { // } } else { + + openTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); popup.add(openTripAction); + } - popup.add(deleteTripAction); + deleteTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); deleteTripAction.setEnabled(selectedNode.isOpen()); + popup.add(deleteTripAction); } else { -- 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/7621 in repository observe. See http://git.codelutin.com/observe.git commit a6153644d7a3a1dd9fb551d8a9c4dd0a1ea2b062 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:39:24 2015 +0100 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme --- .../longline/ActivityLonglineServiceController.java | 10 +++++----- .../v1/longline/SetLonglineServiceController.java | 13 +++++++------ .../v1/longline/TripLonglineServiceController.java | 9 +++++++-- .../v1/seine/ActivitySeineServiceController.java | 9 +++++---- .../v1/seine/FloatingObjectServiceController.java | 13 +++++++------ .../controller/v1/seine/RouteServiceController.java | 13 +++++++------ .../v1/seine/SetSeineServiceController.java | 13 +++++++------ .../v1/seine/TripSeineServiceController.java | 9 +++++++-- .../ird/observe/ObserveTopiaPersistenceContext.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 5 +++-- .../services/service/longline/SetLonglineService.java | 7 ++++--- .../service/longline/TripLonglineService.java | 12 +++++++++--- .../services/service/seine/ActivitySeineService.java | 5 +++-- .../services/service/seine/FloatingObjectService.java | 7 ++++--- .../observe/services/service/seine/RouteService.java | 7 ++++--- .../services/service/seine/SetSeineService.java | 7 ++++--- .../services/service/seine/TripSeineService.java | 9 +++++++-- .../longline/ActivityLonglineServiceTopia.java | 9 +++++---- .../service/longline/SetLonglineServiceTopia.java | 10 ++++++---- .../service/longline/TripLonglineServiceTopia.java | 19 +++++++++++++++++-- .../service/seine/ActivitySeineServiceTopia.java | 9 +++++---- .../service/seine/FloatingObjectServiceTopia.java | 9 +++++---- .../services/service/seine/RouteServiceTopia.java | 9 +++++---- .../services/service/seine/SetSeineServiceTopia.java | 9 +++++---- .../services/service/seine/TripSeineServiceTopia.java | 13 +++++++++++-- 25 files changed, 153 insertions(+), 86 deletions(-) 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 92702da..2947407 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 @@ -60,6 +60,11 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override + public boolean exists(String activityLonglineId) { + return service.exists(activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { return service.loadToEdit(activityLonglineId); } @@ -78,9 +83,4 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi public boolean delete(String tripLonglineId, String activityLonglineId) { return service.delete(tripLonglineId, activityLonglineId); } - - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 3dc91d1..ebac706 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -44,8 +44,13 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public ReferenceDto<SetLonglineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + return service.loadReferenceToRead(setLonglineId); + } + + @Override + public boolean exists(String setLonglineId) { + return service.exists(setLonglineId); } @Override @@ -68,8 +73,4 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon service.delete(activityLonglineId, setLonglineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } 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 ac7bfa6..5f9c14e 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 @@ -71,6 +71,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public boolean exists(String tripLonglineId) { + return service.exists(tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { return service.loadToEdit(tripLonglineId); } @@ -91,7 +96,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + return service.moveTripLonglineToProgram(tripLonglineId, 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 a9a0160..fdc4ccf 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,6 +60,11 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override + public boolean exists(String activitySeineId) { + return service.exists(activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } @@ -79,8 +84,4 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC service.delete(routeId, activitySeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } 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 39929f8..88b9ada 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 @@ -49,8 +49,13 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + return service.loadReferenceToRead(floatingObjectId); + } + + @Override + public boolean exists(String floatingObjectId) { + return service.exists(floatingObjectId); } @Override @@ -73,8 +78,4 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService service.delete(activitySeineId, floatingObjectId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } 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 f1e917a..5845f7b 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 @@ -55,8 +55,13 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceDto<RouteDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + return service.loadReferenceToRead(routeId); + } + + @Override + public boolean exists(String routeId) { + return service.exists(routeId); } @Override @@ -79,8 +84,4 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle return service.delete(tripSeineId, routeId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java index e0ea4d8..21716c7 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -43,8 +43,13 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public ReferenceDto<SetSeineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + return service.loadReferenceToRead(setSeineId); + } + + @Override + public boolean exists(String setSeineId) { + return service.exists(setSeineId); } @Override @@ -67,8 +72,4 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro service.delete(activitySeineId, setSeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } 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 f92c748..0fb821a 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 @@ -66,6 +66,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public boolean exists(String tripSeineId) { + return service.exists(tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { return service.loadToEdit(tripSeineId); } @@ -91,7 +96,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + return service.moveTripSeineToProgram(tripSeineId, programId); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index 30db7d1..5b87f16 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -30,4 +30,8 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste super(parameter); } + public void flush() { + getHibernateSupport().getHibernateSession().flush(); + } + } 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 683bc15..38453b0 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 @@ -51,6 +51,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); + @ReadDataPermission + boolean exists(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); @@ -70,6 +73,4 @@ public interface ActivityLonglineService extends ObserveService { */ boolean delete(String tripLonglineId, String activityLonglineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index f64e5d3..d9eb5b3 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -42,7 +42,10 @@ public interface SetLonglineService extends ObserveService { FormDto<SetLonglineDto> loadToRead(String setLonglineId); @ReadDataPermission - ReferenceDto<SetLonglineDto> loadReferenceToRead(String id); + ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId); + + @ReadDataPermission + boolean exists(String setLonglineId); @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); @@ -60,6 +63,4 @@ public interface SetLonglineService extends ObserveService { @DeleteRequest void delete(String activityLonglineId, String setLonglineId); - @ReadDataPermission - boolean exists(String id); } 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 c5209d3..d83ea5c 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 @@ -56,7 +56,10 @@ public interface TripLonglineService extends ObserveService { FormDto<TripLonglineDto> loadToRead(String tripLonglineId); @ReadDataPermission - ReferenceDto<TripLonglineDto> loadReferenceToRead(String id); + ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); + + @ReadDataPermission + boolean exists(String tripLonglineId); @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); @@ -74,6 +77,9 @@ public interface TripLonglineService extends ObserveService { @DeleteRequest void delete(String tripLonglineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripLonglineToProgram(String tripLonglineId, String programId); + } \ No newline at end of file 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 95bdf94..d4882d7 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 @@ -51,6 +51,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); + @ReadDataPermission + boolean exists(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -67,6 +70,4 @@ public interface ActivitySeineService extends ObserveService { @DeleteRequest void delete(String routeId, String activitySeineId); - @ReadDataPermission - boolean exists(String id); } 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 a01ddf2..ccb1ef4 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 @@ -45,7 +45,10 @@ public interface FloatingObjectService extends ObserveService { FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); @ReadDataPermission - ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id); + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId); + + @ReadDataPermission + boolean exists(String floatingObjectId); @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); @@ -63,6 +66,4 @@ public interface FloatingObjectService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String floatingObjectId); - @ReadDataPermission - boolean exists(String id); } 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 dbf9c25..9f43d11 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 @@ -49,7 +49,10 @@ public interface RouteService extends ObserveService { FormDto<RouteDto> loadToRead(String routeId); @ReadDataPermission - ReferenceDto<RouteDto> loadReferenceToRead(String id); + ReferenceDto<RouteDto> loadReferenceToRead(String routeId); + + @ReadDataPermission + boolean exists(String routeId); @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); @@ -67,6 +70,4 @@ public interface RouteService extends ObserveService { @DeleteRequest boolean delete(String tripSeineId, String routeId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index 4d50fef..173259d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -41,7 +41,10 @@ public interface SetSeineService extends ObserveService { FormDto<SetSeineDto> loadToRead(String setSeineId); @ReadDataPermission - ReferenceDto<SetSeineDto> loadReferenceToRead(String id); + ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId); + + @ReadDataPermission + boolean exists(String setSeineId); @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); @@ -59,6 +62,4 @@ public interface SetSeineService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String setSeineId); - @ReadDataPermission - boolean exists(String id); } 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 ae26efa..e20de8f 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 @@ -57,6 +57,9 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); + @ReadDataPermission + boolean exists(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); @@ -73,6 +76,8 @@ public interface TripSeineService extends ObserveService { @DeleteRequest void delete(String tripSeineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripSeineToProgram(String tripSeineId, String programId); } \ No newline at end of file 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 3e96ac0..4fe79b7 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 @@ -116,6 +116,11 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override + public boolean exists(String activityLonglineId) { + return existsEntity(ActivityLongline.class, activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -225,8 +230,4 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements return wasEndDateUpdated; } - @Override - public boolean exists(String id) { - return existsEntity(ActivityLongline.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 0335193..9228476 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -63,6 +63,11 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override + public boolean exists(String setLonglineId) { + return existsEntity(SetLongline.class, setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); @@ -142,8 +147,5 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - @Override - public boolean exists(String id) { - return existsEntity(SetLongline.class, id); - } + } 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 6cdca19..c203954 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Sets; +import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; @@ -145,6 +146,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public boolean exists(String tripLonglineId) { + return existsEntity(TripLongline.class, tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -200,7 +206,16 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public boolean exists(String id) { - return existsEntity(TripLongline.class, id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + + tripLongline.setProgram(program); + saveEntity(TripLongline.class, tripLongline); + + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + persistenceContext.flush(); + + return getTripLonglinePositionInProgram(programId, tripLonglineId); } } 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 e262c85..9087f85 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 @@ -122,6 +122,11 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override + public boolean exists(String activitySeineId) { + return existsEntity(ActivitySeine.class, activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -223,8 +228,4 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } - @Override - public boolean exists(String id) { - return existsEntity(ActivitySeine.class, id); - } } 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 02243d5..c4210a9 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 @@ -94,6 +94,11 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public boolean exists(String floatingObjectId) { + return existsEntity(FloatingObject.class, floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); @@ -148,8 +153,4 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } - @Override - public boolean exists(String id) { - return existsEntity(FloatingObject.class, id); - } } 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 9985d38..231b186 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 @@ -138,6 +138,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override + public boolean exists(String routeId) { + return existsEntity(Route.class, routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -244,8 +249,4 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } - @Override - public boolean exists(String id) { - return existsEntity(Route.class, id); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 4b1a163..eed2aa1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -63,6 +63,11 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override + public boolean exists(String setSeineId) { + return existsEntity(SetSeine.class, setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -146,8 +151,4 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein //FIXME kmorin : faudrait pas sauver quelquechose là ? parcequ'on n'a rien supprimé... } - @Override - public boolean exists(String id) { - return existsEntity(SetSeine.class, id); - } } 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 e4dbe6f..1860fd1 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 @@ -139,6 +139,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public boolean exists(String tripSeineId) { + return existsEntity(TripSeine.class, tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); @@ -196,7 +201,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public boolean exists(String id) { - return existsEntity(TripSeine.class, id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + tripSeine.setProgram(program); + saveEntity(TripSeine.class, tripSeine); + return getTripSeinePositionInProgram(programId, tripSeineId); } } -- 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/7621 in repository observe. See http://git.codelutin.com/observe.git commit fe44b0685d4171f6b74dc4d3e996460d06cb56d7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:40:09 2015 +0100 suppression de l'ouverture du programme s'il n'y a que lui d'ouvert --- .../src/main/java/fr/ird/observe/business/db/DataContext.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java index 0eda1ae..1e7d9e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java @@ -688,6 +688,12 @@ public class DataContext extends AbstractSerializableBean { } } + // if only the program is open, remove it + if (realSelection.size() == 1) { + setOpenProgramId(null); + realSelection.clear(); + } + if (oldSelection.equals(realSelection)) { // rien a change -- 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/7621 in repository observe. See http://git.codelutin.com/observe.git commit de3f941a5072922ebc139ca534ca8f2a73ef2686 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:41:45 2015 +0100 réactivation de l'action pour changer une marée de programme --- .../tree/ObserveNavigationTreeShowPopupAction.java | 88 ++++++++++++---------- .../actions/ChangeTripProgramActionListener.java | 52 ++++++------- 2 files changed, 74 insertions(+), 66 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index 5c88f99..3712097 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -23,11 +23,20 @@ package fr.ird.observe.ui.tree; */ import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; @@ -42,6 +51,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.LinkedHashSet; import java.util.List; /** @@ -224,63 +234,63 @@ public class ObserveNavigationTreeShowPopupAction { log.info("Will load popup for trip node."); } + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + if (selectedNode.isOpen()) { - closeTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + closeTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); popup.add(closeTripAction); popup.add(moveTripPopup); moveTripPopup.removeAll(); - // DataService dataService = treeHelper.getDataService(); - ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); + // get the available program for the trip String tripId = selectedNode.getId(); + GearType gearType = IdDtos.isLonglineId(tripId) ? GearType.longline : GearType.seine; + + ObserveSwingDataSource dataSource = treeHelper.getDataProvider().getDataSource(); + + LinkedHashSet<ReferenceDto> allPrograms = applicationContext.newService(ReferentialService.class) + .getReferentialReferenceSet(ProgramDto.class) + .getReference(); + List<ReferenceDto> programs = + Lists.newArrayList(Iterables.filter(allPrograms, + ReferenceDtos.newLabelValuePredicate(ProgramDto.PROPERTY_GEAR_TYPE, + gearType))); + + String openProgramId = applicationContext.getDataContext().getOpenProgramId(); + + Decorator<ReferenceDto> programDecorator = applicationContext.getDecorator(ReferenceDto.class, + ProgramDto.class.getSimpleName()); + for (ReferenceDto program : programs) { - List<ProgramDto> programs; - - //FIXME - // try { - // - // programs = dataService.getPossibleProgramsForTrip(dataSource, tripId); - // ProgramDtos.sort(programs); - // - // } catch (DataSourceException e) { - // throw new ObserveTechnicalException("Can't get possible programs for trip " + tripId, e); - // } - // - // String openProgramId = dataService.getDataContext().getOpenProgramId(); - // - // Decorator<Program> programDecorator = dataService.getDecoratorService().getDecoratorByType(Program.class); - // for (Program program : programs) { - // - // String programId = program.getTopiaId(); - // - // if (!programId.equals(openProgramId)) { - // - // JMenuItem item = new JMenuItem(programDecorator.toString(program)); - // item.setName(programId); - // item.addActionListener(new ChangeTripProgramActionListener(treeHelper, - // dataService, - // dataSource, - // tripId, - // programId)); - // - // moveTripPopup.add(item); - // - // } - // - // } + String programId = program.getId(); + + if (!programId.equals(openProgramId)) { + + JMenuItem item = new JMenuItem(programDecorator.toString(program)); + item.setName(programId); + item.addActionListener(new ChangeTripProgramActionListener(treeHelper, + dataSource, + tripId, + programId)); + + moveTripPopup.add(item); + + } + + } } else { - openTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + openTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); popup.add(openTripAction); } - deleteTripAction.putClientProperty("ui", ObserveSwingApplicationContext.get().getSelectedContentUI()); + deleteTripAction.putClientProperty("ui", applicationContext.getSelectedContentUI()); deleteTripAction.setEnabled(selectedNode.isOpen()); popup.add(deleteTripAction); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java index 8e8754a..02d2f6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java @@ -23,7 +23,11 @@ package fr.ird.observe.ui.tree.actions; */ +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -49,23 +53,15 @@ public class ChangeTripProgramActionListener implements ActionListener { private final ObserveTreeHelper treeHelper; - //FIXME -// private final DataService dataService; - private final ObserveSwingDataSource dataSource; public ChangeTripProgramActionListener(ObserveTreeHelper treeHelper, - //FIXME -// DataService dataService, - Object dataService, ObserveSwingDataSource dataSource, String tripId, String programId) { this.tripId = tripId; this.programId = programId; this.treeHelper = treeHelper; - //FIXME -// this.dataService = dataService; this.dataSource = dataSource; } @@ -75,25 +71,24 @@ public class ChangeTripProgramActionListener implements ActionListener { ObserveNode tripNode = treeHelper.getSelectedNode(); ObserveNode rootNode = treeHelper.getRootNode(); ObserveNode newProgramNode = treeHelper.getChild(rootNode, programId); - ObserveNode oldProgramNode = treeHelper.getChild(rootNode, tripNode.getParent().getId()); - - //FIXME -// try { -// dataService.moveTripToProgram(dataSource, tripId, programId); -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Can't change trip " + tripId + " to program " + programId, e); -// } - - //FIXME -// int position; - int position = -1; - - //FIXME -// try { -// position = dataService.getOpenablePosition(dataSource, programId, tripId); -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Can't get trip " + tripId + " position for program " + programId, e); -// } + String oldProgramId = tripNode.getParent().getId(); + ObserveNode oldProgramNode = treeHelper.getChild(rootNode, oldProgramId); + + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + + applicationContext.getOpenDataManager().closeProgram(oldProgramId); + + int position; + + + if (IdDtos.isTripLonglineId(tripId)) { + TripLonglineService service = applicationContext.newService(TripLonglineService.class); + position = service.moveTripLonglineToProgram(tripId, programId); + + } else { + TripSeineService service = applicationContext.newService(TripSeineService.class); + position = service.moveTripSeineToProgram(tripId, programId); + } treeHelper.removeNode(tripNode); @@ -108,6 +103,9 @@ public class ChangeTripProgramActionListener implements ActionListener { treeHelper.insertNode(newProgramNode, tripNode, position); newTripNode = tripNode; } + + applicationContext.getOpenDataManager().openProgram(programId); + treeHelper.reloadNode(oldProgramNode, true); treeHelper.reloadNode(newProgramNode, true); // treeHelper.refreshNode(oldProgramNode, true); -- 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