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 9b2e93a8dffe7ca0096ad5025e70ef485bc85cbc Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 10:43:07 2015 +0100 affichage des boutons sur les programmes, marées et activités longline --- .../content/list/impl/longline/ActivityLonglinesUIHandler.java | 9 +++++---- .../ird/observe/ui/content/list/impl/longline/CommonListUI.css | 8 ++++---- .../ui/content/list/impl/longline/TripLonglinesUIHandler.java | 7 ++++--- .../ui/content/list/impl/seine/ActivitySeinesUIHandler.java | 9 ++++++--- .../observe/ui/content/list/impl/seine/RoutesUIHandler.java | 10 ++++++---- .../ui/content/list/impl/seine/TripSeinesUIHandler.java | 7 +++++-- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 5d1c6e8..ab872e6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; @@ -61,9 +62,9 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected ContentMode getContentMode(DataContext dataContext) { - String openTripLonglineId = dataContext.getOpenTripId(); + ObserveOpenDataManager openDataManager = getOpenDataManager(); - if (openTripLonglineId == null) { + if (!openDataManager.isOpenTrip()) { // pas de marée ouverte, donc on ne peut pas ouvrir une activité addInfoMessage(n("observe.tripLongline.message.no.active.found")); @@ -74,9 +75,9 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin // il existe une marée ouverte // - boolean openActivity = dataContext.isOpenActivity(); + boolean openActivity = openDataManager.isOpenActivity(); - if (dataContext.isSelectedOpen(TripLonglineDto.class)) { + if (openDataManager.isOpenTripLongline(dataContext.getSelectedTripLonglineId())) { // // la marée courante est ouverte diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css index 517aed0..0c3f385 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css @@ -25,7 +25,7 @@ } .gotoOpenTrip { - visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; + visible:{model.isUpdatingMode() && openDataManager.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{TripLonglineDto.class}; _text:{t("observe.action.goto.open.maree")}; @@ -33,7 +33,7 @@ } .gotoOpenTrip2 { - visible:{model.isReadingMode() && dataContext.isOpenTrip()}; + visible:{model.isReadingMode() && openDataManager.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{TripLonglineDto.class}; _actionIcon:{"go-jump"}; @@ -42,7 +42,7 @@ } .gotoOpenActivity { - visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; + visible:{model.isUpdatingMode() && openDataManager.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{ActivityLonglineDto.class}; _text:{t("observe.action.goto.open.activity")}; @@ -50,7 +50,7 @@ } .gotoOpenActivity2 { - visible:{model.isReadingMode() && dataContext.isOpenActivity()}; + visible:{model.isReadingMode() && openDataManager.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{ActivityLonglineDto.class}; _actionIcon:{"go-jump"}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 937e623..c46ef52 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; @@ -61,9 +62,9 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected ContentMode getContentMode(DataContext dataContext) { - String openProgramId = dataContext.getOpenProgramId(); + ObserveOpenDataManager openDataManager = getOpenDataManager(); - if (openProgramId == null) { + if (!openDataManager.isOpenProgram()) { // pas de program ouvert (donc pas de maree ouverte) // on peut reouvrir une maree @@ -75,7 +76,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri // il existe un maree ouverte // - if (dataContext.isSelectedOpen(ProgramDto.class)) { + if (openDataManager.isOpenProgram(dataContext.getSelectedProgramId())) { // le programme courant a une maree ouverte addInfoMessage(n("observe.tripLongline.message.active.found")); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index e38cfcf..5c7e7bb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; @@ -58,7 +59,9 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected ContentMode getContentMode(DataContext dataContext) { - if (!getOpenDataManager().isOpenRoute()) { + ObserveOpenDataManager openDataManager = getOpenDataManager(); + + if (!openDataManager.isOpenRoute()) { // pas de route ouverte, donc on ne peut pas ouvrir une activité addInfoMessage(n("observe.route.message.no.active.found")); @@ -69,10 +72,10 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti // il existe une route ouverte // - boolean openActivity = getOpenDataManager().isOpenActivity(); + boolean openActivity = openDataManager.isOpenActivity(); - if (getOpenDataManager().isOpenRoute(dataContext.getSelectedRouteId())) { + if (openDataManager.isOpenRoute(dataContext.getSelectedRouteId())) { // // la route courante est ouverte diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index d670aac..98b8120 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; @@ -58,9 +59,10 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected ContentMode getContentMode(DataContext dataContext) { - // autorisé à écrire + ObserveOpenDataManager openDataManager = getOpenDataManager(); - if (!getOpenDataManager().isOpenTrip()) { + // autorisé à écrire + if (!openDataManager.isOpenTrip()) { // pas de marée d'ouverte, donc on ne peut pas ouvrir une route addInfoMessage(n("observe.tripSeine.message.no.active.found")); @@ -71,9 +73,9 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto // il existe une marée ouverte // - boolean openRoute = getOpenDataManager().isOpenRoute(); + boolean openRoute = openDataManager.isOpenRoute(); - if (getOpenDataManager().isOpenTripSeine(dataContext.getSelectedTripSeineId())) { + if (openDataManager.isOpenTripSeine(dataContext.getSelectedTripSeineId())) { // la marée courante est ouverte diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 51fec20..f20cafb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; @@ -58,7 +59,9 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected ContentMode getContentMode(DataContext dataContext) { - if (!getOpenDataManager().isOpenProgram()) { + ObserveOpenDataManager openDataManager = getOpenDataManager(); + + if (!openDataManager.isOpenProgram()) { // pas de program ouvert (donc pas de maree ouverte) // on peut reouvrir une maree @@ -70,7 +73,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe // il existe un maree ouverte // - if (getOpenDataManager().isOpenProgram(dataContext.getSelectedProgramId())) { + if (openDataManager.isOpenProgram(dataContext.getSelectedProgramId())) { // le program courant a une maree ouverte addInfoMessage(n("observe.tripSeine.message.active.found")); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.