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 01661cca7cc4ff30fd399675b908e5766b1e5727 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 ef07bae..7cdd000 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 @@ -1001,6 +1001,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>.