branch feature/7622 updated (4990580 -> 853af50)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git from 4990580 correction de l'action de déplacement des routes depuis la liste (refs #7622) new b88ea5c meilleur gestion de l'activation du menu de fermeture des neouds (refs #7622) new e9a78f7 fix decorateur (refs #7622) new 853af50 correction du déplacement des routes (fixes #7622) 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 853af5047b88c0a45cf614a8b119875f2e75c2ec Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 15:35:26 2015 +0100 correction du déplacement des routes (fixes #7622) commit e9a78f780c930d12cceb4dbbf669a9ef15cf452f Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 14:49:44 2015 +0100 fix decorateur (refs #7622) commit b88ea5c6620fe796c2063363289b72674ce3bff0 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 14:29:31 2015 +0100 meilleur gestion de l'activation du menu de fermeture des neouds (refs #7622) Summary of changes: .../ui/actions/shared/MoveRoutesUIAction.java | 22 ++++++++++++---------- .../tree/ObserveNavigationTreeShowPopupAction.java | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 12 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/7622 in repository observe. See http://git.codelutin.com/observe.git commit b88ea5c6620fe796c2063363289b72674ce3bff0 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 14:29:31 2015 +0100 meilleur gestion de l'activation du menu de fermeture des neouds (refs #7622) --- .../ui/tree/ObserveNavigationTreeShowPopupAction.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 87718a4..90f6379 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 @@ -37,6 +37,8 @@ import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.ui.content.ContentUI; +import fr.ird.observe.ui.content.open.ContentOpenableUI; import fr.ird.observe.ui.tree.actions.ChangeRouteTripActionListener; import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import fr.ird.observe.ui.tree.actions.NodeChangeActionListener; @@ -45,6 +47,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; @@ -291,20 +294,28 @@ public class ObserveNavigationTreeShowPopupAction { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); DataContext dataContext = applicationContext.getDataContext(); + ContentUI<?> selectedContentUI = applicationContext.getSelectedContentUI(); + + boolean closeActionEnabled = false; + + if (selectedContentUI instanceof ContentOpenableUI) { + JButton closeButton = ((ContentOpenableUI) selectedContentUI).getClose(); + closeActionEnabled = closeButton.isEnabled(); + } if (selectedNode.isTripNode()) { beforeOpenMenu(selectedNode, TRIP_MENU_ITEMS); openAction.setEnabled(!dataContext.isOpenTrip()); - closeAction.setEnabled(!dataContext.isOpenRoute() && !dataContext.isOpenActivity()); + closeAction.setEnabled(closeActionEnabled); } else if (selectedNode.isRouteNode()) { beforeOpenMenu(selectedNode, ROUTE_MENU_ITEMS); openAction.setEnabled(!dataContext.isOpenRoute()); - closeAction.setEnabled(!dataContext.isOpenActivity()); + closeAction.setEnabled(closeActionEnabled); } 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/7622 in repository observe. See http://git.codelutin.com/observe.git commit e9a78f780c930d12cceb4dbbf669a9ef15cf452f Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 17 14:49:44 2015 +0100 fix decorateur (refs #7622) --- .../main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 8bbc322..d53b4c3 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 @@ -26,7 +26,6 @@ import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; -import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.TripSeineService; @@ -130,7 +129,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { List<ReferenceDto<TripSeineDto>> tripSeines = new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(allTripSeines)); Decorator<ReferenceDto> decorator = applicationContext.getDecorator(ReferenceDto.class, - ProgramDto.class.getSimpleName()); + TripSeineDto.class.getSimpleName()); //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel DecoratedTripSeine[] decoratedTripSeines = new DecoratedTripSeine[tripSeines.size() - 1]; -- 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/7622 in repository observe. See http://git.codelutin.com/observe.git commit 853af5047b88c0a45cf614a8b119875f2e75c2ec 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>.
participants (1)
-
codelutin.com scm