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 eafdafa7a1abd112ab36d9226fffcc61d30363c1 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>.

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 fa79254ad5364da9e4dd4dc6258af4551034dd60 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 16:17:37 2015 +0100 accès aux routes et activités ouvertes depuis les niveaux supérieurs --- .../fr/ird/observe/ObserveOpenDataManager.java | 54 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 5 +- 2 files changed, 57 insertions(+), 2 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 c96d9d0..46055b9 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 @@ -1,8 +1,14 @@ package fr.ird.observe; import com.google.common.base.Preconditions; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import java.io.Closeable; +import java.util.ArrayList; +import java.util.List; /** * Pour gérer les données ouvertes sur une source de données dans l'application. @@ -120,6 +126,10 @@ public class ObserveOpenDataManager implements Closeable { openActivitySeineId = activitySeineId; } + public boolean isOpenActivitySeine() { + return openActivitySeineId != null; + } + public boolean isOpenActivitySeine(String activitySeineId) { Preconditions.checkNotNull(activitySeineId, "id cant be null"); return activitySeineId.equals(openActivitySeineId); @@ -142,6 +152,10 @@ public class ObserveOpenDataManager implements Closeable { openTripLonglineId = tripLongLineId; } + public boolean isOpenTripLongline() { + return openTripLonglineId != null; + } + public boolean isOpenTripLongline(String tripLongLineId) { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); return tripLongLineId.equals(openTripLonglineId); @@ -166,6 +180,10 @@ public class ObserveOpenDataManager implements Closeable { openActivityLonglineId = activityLonglineId; } + public boolean isOpenActivityLongline() { + return openActivityLonglineId != null; + } + public boolean isOpenActivityLongline(String activityLonglineId) { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); return activityLonglineId.equals(openActivityLonglineId); @@ -207,4 +225,40 @@ public class ObserveOpenDataManager implements Closeable { openActivityLonglineId = null; } + public String[] getOpenIds() { + return getOpenIds(null); + } + + public String[] getOpenIds(Class<?> type) { + + List<String> ids = new ArrayList<String>(); + + if (isOpenProgram()) { + ids.add(openProgramId); + + if (!ProgramDto.class.equals(type)) { + + if (isOpenTripSeine()) { + ids.add(openTripSeineId); + + if (!TripSeineDto.class.equals(type) && isOpenRoute()) { + ids.add(openRouteId); + + if (!RouteDto.class.equals(type) && isOpenActivitySeine()) { + ids.add(openActivitySeineId); + } + } + + } else if (isOpenTripLongline()) { + ids.add(openTripLonglineId); + + if (!TripLonglineDto.class.equals(type) && isOpenActivityLongline()) { + ids.add(openActivityLonglineId); + } + } + } + } + + return ids.toArray(new String[ids.size()]); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index a359417..e178bed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; @@ -279,9 +280,9 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public void selectOpenNode(JAXXContext ui, Class<?> type) { - DataContext context = ui.getContextValue(DataContext.class); + ObserveOpenDataManager openDataManager = ui.getContextValue(ObserveOpenDataManager.class); - String[] ids = context.getOpenIds(type); + String[] ids = openDataManager.getOpenIds(type); if (log.isDebugEnabled()) { log.debug("using open ids = " + Arrays.toString(ids)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

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 92de5a35fa1803299a6129d63cad8dd367dba131 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3894215..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 @@ -67,7 +67,7 @@ <DataContext id='dataContext' javaBean='getContextValue(DataContext.class)'/> - <ObserveOpenDataManager id='openDataManager' initializer='getContextValue(ObserveOpenDataManager.class)'/> + <ObserveOpenDataManager id='openDataManager' javaBean='getContextValue(ObserveOpenDataManager.class)'/> <ObserveTreeHelper id='treeHelper' initializer='getContextValue(ObserveTreeHelper.class)'/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

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 069a95691a0c206dae2641d69b9bdc8a4d0d089e Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 16:17:37 2015 +0100 accès aux routes et activités ouvertes depuis les niveaux supérieurs --- .../fr/ird/observe/ObserveOpenDataManager.java | 29 ---------------------- 1 file changed, 29 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 ec04ae0..9424ef5 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 @@ -51,35 +51,6 @@ public class ObserveOpenDataManager extends AbstractSerializableBean implements Preconditions.checkNotNull(programId, "id cant be null"); Preconditions.checkState(canOpenProgram(), "a trip is already opened"); openProgramId = programId; - firePropertyChange(PROPERTY_OPEN_PROGRAM, false, true); - } - - public boolean isOpenProgram() { - return openProgramId != null; - } - - public boolean isOpenProgram(String programId) { - Preconditions.checkNotNull(programId, "id cant be null"); - return programId.equals(openProgramId); - } - - public void closeProgram(String programId) { - Preconditions.checkNotNull(programId, "id cant be null"); - Preconditions.checkState(isOpenProgram(programId), "this program is not opened"); - openProgramId = null; - firePropertyChange(PROPERTY_OPEN_PROGRAM, true, false); - } - - //Program - - public boolean canOpenProgram() { - return openProgramId == null; - } - - public void openProgram(String programId) { - Preconditions.checkNotNull(programId, "id cant be null"); - Preconditions.checkState(canOpenProgram(), "a trip is already opened"); - openProgramId = programId; } public boolean isOpenProgram() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

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 9a5bcef39b4cbf5c92fa9c470663beb05dca97ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:03:31 2015 +0100 Ajout fix me kmorin --- .../main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java index 70a4640..f7854b6 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java @@ -46,6 +46,7 @@ public class ProgramDtos extends AbstractProgramDtos { return result; } + //FIXME kmorin : une referenceDto sert juste pour l'affichage, donc ne mettre que les propriétés utiles pour cela. public static ReferenceDto<ProgramDto> newReferenceDto(ProgramDto programDto) { ArrayList<String> propertyNames = Lists.newArrayList(ProgramDto.PROPERTY_CODE, ProgramDto.PROPERTY_URI, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

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>.