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 db88c2de4cc88be07db5c5dbd47456257d108bae Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 15:45:48 2015 +0100 affichage des boutons dans les écrans de liste de routes et d'activités --- .../java/fr/ird/observe/ObserveOpenDataManager.java | 19 +++++++++++++++++++ .../list/impl/seine/ActivitySeinesUIHandler.java | 8 +++----- .../ui/content/list/impl/seine/CommonListUI.css | 12 ++++++------ .../ui/content/list/impl/seine/RoutesUIHandler.java | 8 +++----- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java index d146008..29822ed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java @@ -13,6 +13,8 @@ import java.io.Closeable; */ public class ObserveOpenDataManager implements Closeable { + protected String openProgramId; + protected String openTripSeineId; protected String openRouteId; @@ -35,6 +37,10 @@ public class ObserveOpenDataManager implements Closeable { openTripSeineId = tripSeineId; } + public boolean isOpenTripSeine() { + return openTripSeineId != null; + } + public boolean isOpenTripSeine(String tripSeineId) { Preconditions.checkNotNull(tripSeineId, "id cant be null"); return tripSeineId.equals(openTripSeineId); @@ -59,6 +65,10 @@ public class ObserveOpenDataManager implements Closeable { openRouteId = routeId; } + public boolean isOpenRoute() { + return openRouteId != null; + } + public boolean isOpenRoute(String routeId) { Preconditions.checkNotNull(routeId, "id cant be null"); return routeId.equals(openRouteId); @@ -148,11 +158,19 @@ public class ObserveOpenDataManager implements Closeable { || isOpenActivityLongline(openableId); } + public boolean isOpenActivity() { + return openActivityLonglineId != null || openActivitySeineId != null; + } + public boolean isOpenActivity(String activityId) { return isOpenActivitySeine(activityId) || isOpenActivityLongline(activityId); } + public boolean isOpenTrip() { + return openTripLonglineId != null || openTripSeineId != null; + } + @Override public void close() { openTripSeineId = null; @@ -161,4 +179,5 @@ public class ObserveOpenDataManager implements Closeable { openTripLonglineId = null; openActivityLonglineId = null; } + } 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 cb32499..e38cfcf 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 @@ -58,9 +58,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected ContentMode getContentMode(DataContext dataContext) { - String openRouteId = dataContext.getOpenRouteId(); - - if (openRouteId == null) { + if (!getOpenDataManager().isOpenRoute()) { // pas de route ouverte, donc on ne peut pas ouvrir une activité addInfoMessage(n("observe.route.message.no.active.found")); @@ -71,10 +69,10 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti // il existe une route ouverte // - boolean openActivity = dataContext.isOpenActivity(); + boolean openActivity = getOpenDataManager().isOpenActivity(); - if (dataContext.isSelectedOpen(RouteDto.class)) { + if (getOpenDataManager().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/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css index 8633b3b..f24d43c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css @@ -25,7 +25,7 @@ } .gotoOpenTrip { - visible:{model.isUpdatingMode() && dataContext.isOpenTrip()}; + visible:{model.isUpdatingMode() && openDataManager.isOpenTrip()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{TripSeineDto.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:{TripSeineDto.class}; _actionIcon:{"go-jump"}; @@ -42,7 +42,7 @@ } .gotoOpenRoute { - visible:{model.isUpdatingMode() && dataContext.isOpenRoute()}; + visible:{model.isUpdatingMode() && openDataManager.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{RouteDto.class}; _text:{t("observe.action.goto.open.route")}; @@ -50,7 +50,7 @@ } .gotoOpenRoute2 { - visible:{model.isReadingMode() && dataContext.isOpenRoute()}; + visible:{model.isReadingMode() && openDataManager.isOpenRoute()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{RouteDto.class}; _actionIcon:{"go-jump"}; @@ -59,7 +59,7 @@ } .gotoOpenActivity { - visible:{model.isUpdatingMode() && dataContext.isOpenActivity()}; + visible:{model.isUpdatingMode() && openDataManager.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{ActivitySeineDto.class}; _text:{t("observe.action.goto.open.activity")}; @@ -67,7 +67,7 @@ } .gotoOpenActivity2 { - visible:{model.isReadingMode() && dataContext.isOpenActivity()}; + visible:{model.isReadingMode() && openDataManager.isOpenActivity()}; _observeAction:{SelectOpenNodeUIAction.ACTION_NAME}; _type:{ActivitySeineDto.class}; _actionIcon:{"go-jump"}; 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 07833df..d670aac 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 @@ -60,9 +60,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto // autorisé à écrire - String openTripId = dataContext.getOpenTripId(); - - if (openTripId == null) { + if (!getOpenDataManager().isOpenTrip()) { // pas de marée d'ouverte, donc on ne peut pas ouvrir une route addInfoMessage(n("observe.tripSeine.message.no.active.found")); @@ -73,9 +71,9 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto // il existe une marée ouverte // - boolean openRoute = dataContext.isOpenRoute(); + boolean openRoute = getOpenDataManager().isOpenRoute(); - if (dataContext.isSelectedOpen(TripSeineDto.class)) { + if (getOpenDataManager().isOpenTripSeine(dataContext.getSelectedTripSeineId())) { // la marée courante est ouverte -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.