This is an automated email from the git hooks/post-receive script. New commit to branch feature/7591_Correction_migration_entites_d_un_parent_a_un_autre in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 41544704ec1a1e099e10504fe78552002f349eb5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 2 17:26:49 2016 +0200 Fix specific trip move from a program to another (need to close previous program and open the targeted one) refs #7591 --- .../ui/tree/actions/ChangeActivityRouteActionListener.java | 2 +- .../observe/ui/tree/actions/ChangeActivityTripActionListener.java | 2 +- .../observe/ui/tree/actions/ChangeRouteTripActionListener.java | 2 +- .../observe/ui/tree/actions/ChangeTripProgramActionListener.java | 8 ++++++-- .../fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java index 6889fb8..add3a23 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -72,7 +72,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener } @Override - protected int moveNodeToParent(String nodeId, String parentNodeId) { + protected int moveNodeToParent(String nodeId, String parentNodeId, String oldParentNodeId) { int position; ActivitySeineService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivitySeineService(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java index 53ae318..b077769 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java @@ -72,7 +72,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener { } @Override - protected int moveNodeToParent(String nodeId, String parentNodeId) { + protected int moveNodeToParent(String nodeId, String parentNodeId, String oldParentNodeId) { int position; ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java index 5d482db..51cbfc7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java @@ -72,7 +72,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener { } @Override - protected int moveNodeToParent(String nodeId, String parentNodeId) { + protected int moveNodeToParent(String nodeId, String parentNodeId, String oldParentNodeId) { int position; RouteService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService(); 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 f46c491..46011d9 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 @@ -54,7 +54,7 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { @Override protected void closeNode(String tripId) { - // Don't do anything : trip should stay open when being transfered + // Don't do anything : trip should stay open when being transferred } @Override @@ -68,7 +68,7 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { } @Override - protected int moveNodeToParent(String nodeId, String parentNodeId) { + protected int moveNodeToParent(String nodeId, String parentNodeId, String oldParentNodeId) { int position; ObserveServicesProvider servicesProvider = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider(); @@ -81,6 +81,10 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { position = service.moveTripSeineToProgram(nodeId, parentNodeId); } + // Close old program and open new program + applicationContext.getOpenDataManager().closeProgram(oldParentNodeId); + applicationContext.getOpenDataManager().openProgram(parentNodeId); + return position; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java index 188e6f5..fd6ce8c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java @@ -71,7 +71,7 @@ public abstract class NodeChangeActionListener implements ActionListener { closeNode(node.getId()); - int position = moveNodeToParent(nodeId, parentNodeId); + int position = moveNodeToParent(nodeId, parentNodeId, oldParentNode.getId()); treeHelper.selectNode(newParentNode); @@ -103,5 +103,5 @@ public abstract class NodeChangeActionListener implements ActionListener { protected abstract ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId); - protected abstract int moveNodeToParent(String nodeId, String parentNodeId); + protected abstract int moveNodeToParent(String nodeId, String parentNodeId, String oldParentNodeId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.