This is an automated email from the git hooks/post-receive script. New commit to branch feature/list_screen_buttons in repository observe. See http://git.codelutin.com/observe.git commit 0341c7d097f2d2e7d54f58e705f22365ab0db68c Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 15:44:59 2015 +0100 openDataManager dans l'ui pour pouvoir l'appeler dans les ui --- .../src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx | 3 +++ .../src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx index 6156c05..74f2a1c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx @@ -38,6 +38,7 @@ fr.ird.observe.db.ObserveSwingDataSource fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ObserveSwingApplicationContext + fr.ird.observe.ObserveOpenDataManager fr.ird.observe.ui.actions.shared.GoUpUIAction fr.ird.observe.ui.actions.shared.GoDownUIAction fr.ird.observe.ui.tree.ObserveTreeHelper @@ -66,6 +67,8 @@ <DataContext id='dataContext' javaBean='getContextValue(DataContext.class)'/> + <ObserveOpenDataManager id='openDataManager' javaBean='getContextValue(ObserveOpenDataManager.class)'/> + <ObserveTreeHelper id='treeHelper' initializer='getContextValue(ObserveTreeHelper.class)'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 1080e32..6c63784 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -310,7 +310,7 @@ public abstract class ContentUIHandler<E extends IdDto> { } protected ObserveOpenDataManager getOpenDataManager() { - ObserveOpenDataManager openDataManager = ObserveSwingApplicationContext.get().getOpenDataManager(); + ObserveOpenDataManager openDataManager = ui.getOpenDataManager(); return openDataManager; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index 9f5586e..dc2c37f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content; * #L% */ +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.business.db.DataContext; - import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.JAXXObject; @@ -51,6 +51,8 @@ public interface ObserveContentUI<E extends IdDto> extends JAXXObject { DataContext getDataContext(); + ObserveOpenDataManager getOpenDataManager(); + ObserveSwingDataSource getDataSource(); SwingValidatorMessageTableModel getErrorTableModel(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.