branch develop updated (73833f1 -> 7493101)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 73833f1 Merge branch 'feature/8383_importer_une_sauvegarde_apres_fermeture_connexion' into develop new 7493101 Appy git pur --prune The 1 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 74931010920a46d9def703c842136d3171d508c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 18:21:06 2016 +0200 Appy git pur --prune Summary of changes: .../ui/tree/ObserveNavigationTreeShowPopupAction.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 74931010920a46d9def703c842136d3171d508c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 18:21:06 2016 +0200 Appy git pur --prune --- .../ui/tree/ObserveNavigationTreeShowPopupAction.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 c831984..e102fca 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 @@ -24,6 +24,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; @@ -253,6 +254,7 @@ public class ObserveNavigationTreeShowPopupAction { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); DataContext dataContext = applicationContext.getDataContext(); ContentUI<?> selectedContentUI = applicationContext.getContentUIManager().getSelectedContentUI(); + ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); boolean closeActionEnabled = false; @@ -272,21 +274,21 @@ public class ObserveNavigationTreeShowPopupAction { beforeOpenMenu(selectedNode, ROUTE_MENU_ITEMS); - openAction.setEnabled(!dataContext.isOpenRoute()); + openAction.setEnabled(openDataManager.canOpenRoute(dataContext.getSelectedTripSeineId())); closeAction.setEnabled(closeActionEnabled); } else if (selectedNode.isActivitySeineNode()) { beforeOpenMenu(selectedNode, ACTIVITY_SEINE_MENU_ITEMS); - openAction.setEnabled(!dataContext.isOpenActivitySeine()); + openAction.setEnabled(openDataManager.canOpenActivitySeine(dataContext.getSelectedRouteId())); closeAction.setEnabled(closeActionEnabled); } else if (selectedNode.isActivityLonglineNode()) { beforeOpenMenu(selectedNode, ACTIVITY_LONGLINE_MENU_ITEMS); - openAction.setEnabled(!dataContext.isOpenActivityLongline()); + openAction.setEnabled(openDataManager.canOpenActivityLongline(dataContext.getSelectedTripLonglineId())); closeAction.setEnabled(closeActionEnabled); } else { @@ -340,9 +342,9 @@ public class ObserveNavigationTreeShowPopupAction { item.addActionListener(moveNodeData.createChangeActionListener(treeHelper, - dataSource, - id, - possibleParentId)); + dataSource, + id, + possibleParentId)); moveAction.add(item); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm