This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9d54b0b11cfacbad2b48b6d5235e247abe1001c9 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 15:35:26 2015 +0100 correction du déplacement des routes (fixes #7622) --- .../observe/ui/actions/shared/MoveRoutesUIAction.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java index d53b4c3..1077cec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java @@ -97,15 +97,15 @@ public class MoveRoutesUIAction extends AbstractUIAction { throw new IllegalStateException("Can not come here!"); } - // get current program id + // get current tripseine id ObserveTreeHelper treeHelper = getMainUI().getTreeHelper(); ObserveNode oldRoutesNode = treeHelper.getSelectedNode(); String oldTripSeineId = oldRoutesNode.getParent().getId(); - // choose the new program + // choose the new tripseine String tripSeineId = chooseNewTripSeine(ui, oldTripSeineId); - // change the program of the selected trips + // change the tripseine of the selected routes List<ReferenceDto> selectedDatas = ((ContentListUIModel) ui.getModel()).getSelectedDatas(); List<String> routeIds = Lists.transform(selectedDatas, ReferenceDtos.getIdFunction()); RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); @@ -131,7 +131,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { Decorator<ReferenceDto> decorator = applicationContext.getDecorator(ReferenceDto.class, TripSeineDto.class.getSimpleName()); - //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel + //on crée un tableau avec un tripseine en moins car on ne propose pas le tripseine actuel DecoratedTripSeine[] decoratedTripSeines = new DecoratedTripSeine[tripSeines.size() - 1]; int j = 0; @@ -169,6 +169,8 @@ public class MoveRoutesUIAction extends AbstractUIAction { TripSeineDto.PROPERTY_ROUTE); ObserveNode newRoutesNode = treeHelper.getChild(newTripSeineNode, routesNodeId); + treeHelper.selectNode(newRoutesNode); + for (int i = 0, s = positions.size(); i < s; i++) { String routeId = routeIds.get(i); @@ -181,7 +183,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { openDataManager.openTripSeine(programNode.getId(), tripSeineId); } - ObserveNode newRouteNode = treeHelper.getChild(newTripSeineNode, routeId); + ObserveNode newRouteNode = treeHelper.getChild(newRoutesNode, routeId); if (newRouteNode == null) { @@ -189,16 +191,17 @@ public class MoveRoutesUIAction extends AbstractUIAction { if (log.isInfoEnabled()) { log.info("Insert route node: "); } - treeHelper.insertNode(newRoutesNode, newRouteNode, positions.get(i)); + treeHelper.insertNode(newRoutesNode, routeNode, positions.get(i)); } } + + treeHelper.reloadNode(programNode, true); + ContentListUIModel model = (ContentListUIModel) ui.getModel(); List<ReferenceDto> data = new ArrayList<>(model.getData()); data.removeAll(model.getSelectedDatas()); model.setData(data); - treeHelper.reloadNode(programNode, true); - treeHelper.selectNode(newTripSeineNode); } public static class DecoratedTripSeine { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.