branch feature/list_screen_buttons updated (6101ffb -> 6dce6df)
This is an automated email from the git hooks/post-receive script. New change to branch feature/list_screen_buttons in repository observe. See http://git.codelutin.com/observe.git discards 6101ffb affichage des boutons dans la liste des marées discards 09f22ff accès aux routes et activités ouvertes depuis les niveaux supérieurs discards 086290f ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager discards b0bfc40 affichage des boutons dans les écrans de liste de routes et d'activités discards 0341c7d openDataManager dans l'ui pour pouvoir l'appeler dans les ui adds 32a4697 Moving to version 5.0-SNAPSHOT adds 85c8361 Suppresion du champs TripSeine#datearriveeport (termine #7697). new 2b1fd12 openDataManager dans l'ui pour pouvoir l'appeler dans les ui new db88c2d affichage des boutons dans les écrans de liste de routes et d'activités new 615b068 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager new 2d3546d accès aux routes et activités ouvertes depuis les niveaux supérieurs new ce46bcf affichage des boutons dans la liste des marées new 8753453 Ajout fix me kmorin new 6dce6df Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6101ffb) \ N -- N -- N refs/heads/feature/list_screen_buttons (6dce6df) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6dce6df125dab9aec881986e65d70764c967af9d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:43:01 2015 +0100 Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) commit 875345337279a6beff0072332ccb7ef2fcfe7016 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:03:31 2015 +0100 Ajout fix me kmorin commit ce46bcfdd01b5ce4e7f7849ec70855d6d22f404f Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 18:37:30 2015 +0100 affichage des boutons dans la liste des marées commit 2d3546dc849a82401291e4032ce30d828c00bde6 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 commit 615b0688356ffbefc3f5863081dd9e5e434d364d Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 15:48:51 2015 +0100 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager 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 commit 2b1fd1215042ae2b9e6854c28e0cb5e63a70e542 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 Summary of changes: observe-application-swing/pom.xml | 2 +- observe-application-web/pom.xml | 2 +- observe-entities-validation/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 84597 -> 84457 bytes observe-services-api/pom.xml | 2 +- observe-services-configuration-api/pom.xml | 2 +- observe-services-configuration-rest/pom.xml | 2 +- observe-services-configuration-topia/pom.xml | 2 +- observe-services-model/pom.xml | 2 +- .../services/dto/longline/ActivityLonglineDtos.java | 10 ++++++++++ .../services/dto/longline/TripLonglineDtos.java | 10 ++++++++++ .../services/dto/referential/ProgramDtos.java | 1 + .../services/dto/seine/ActivitySeineDtos.java | 10 ++++++++++ .../ird/observe/services/dto/seine/RouteDtos.java | 10 ++++++++++ .../observe/services/dto/seine/TripSeineDtos.java | 6 ++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61995 -> 61923 bytes observe-services-rest/pom.xml | 2 +- observe-services-runner/pom.xml | 2 +- observe-services-topia/pom.xml | 2 +- .../services/dto/ObserveDtosInitializer.java | 1 - observe-test-data/pom.xml | 2 +- pom.xml | 2 +- 23 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java -- 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 2b1fd1215042ae2b9e6854c28e0cb5e63a70e542 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>.
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>.
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 615b0688356ffbefc3f5863081dd9e5e434d364d Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 15:48:51 2015 +0100 ajout de la gestion d'ouverture et fermeture du programme dans l'observeDataManager --- .../fr/ird/observe/ObserveOpenDataManager.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) 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 29822ed..c96d9d0 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 @@ -26,6 +26,33 @@ public class ObserveOpenDataManager implements Closeable { protected String openActivityLonglineId; + //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() { + 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; + } + // Trip Seine public boolean canOpenTripSeine() { return openTripSeineId == null && openTripLonglineId == null; -- 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 2d3546dc849a82401291e4032ce30d828c00bde6 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 7a10106..e2cd202 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; @@ -274,9 +275,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 ce46bcfdd01b5ce4e7f7849ec70855d6d22f404f Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 18:37:30 2015 +0100 affichage des boutons dans la liste des marées --- .../fr/ird/observe/ObserveOpenDataManager.java | 33 ++++++++++++++++++++-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 3 ++ .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 ++-- .../open/impl/longline/TripLonglineUIHandler.java | 2 ++ .../open/impl/seine/TripSeineUIHandler.java | 2 ++ 6 files changed, 41 insertions(+), 7 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 46055b9..b809275 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 @@ -5,6 +5,7 @@ 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 org.jdesktop.beans.AbstractSerializableBean; import java.io.Closeable; import java.util.ArrayList; @@ -17,7 +18,16 @@ import java.util.List; * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ObserveOpenDataManager implements Closeable { +public class ObserveOpenDataManager extends AbstractSerializableBean implements Closeable { + + public static final String PROPERTY_OPEN_PROGRAM = "openProgram"; + public static final String PROPERTY_OPEN_TRIP_SEINE = "openTripSeine"; + public static final String PROPERTY_OPEN_TRIP_LONGLINE = "openTripLongline"; + public static final String PROPERTY_OPEN_TRIP = "openTrip"; + public static final String PROPERTY_OPEN_ROUTE = "openRoute"; + public static final String PROPERTY_OPEN_ACTIVITY_SEINE = "openActivitySeine"; + public static final String PROPERTY_OPEN_ACTIVITY_LONGLINE = "openActivity"; + public static final String PROPERTY_OPEN_ACTIVITY = "openActivity"; protected String openProgramId; @@ -31,7 +41,6 @@ public class ObserveOpenDataManager implements Closeable { protected String openActivityLonglineId; - //Program public boolean canOpenProgram() { @@ -42,6 +51,7 @@ public class ObserveOpenDataManager implements Closeable { 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() { @@ -57,6 +67,7 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(programId, "id cant be null"); Preconditions.checkState(isOpenProgram(programId), "this program is not opened"); openProgramId = null; + firePropertyChange(PROPERTY_OPEN_PROGRAM, true, false); } // Trip Seine @@ -68,6 +79,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(tripSeineId, "id cant be null"); Preconditions.checkState(canOpenTripSeine(), "a trip is already opened"); openTripSeineId = tripSeineId; + firePropertyChange(PROPERTY_OPEN_TRIP_SEINE, false, true); + firePropertyChange(PROPERTY_OPEN_TRIP, false, true); } public boolean isOpenTripSeine() { @@ -83,6 +96,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(tripSeineId, "id cant be null"); Preconditions.checkState(isOpenTripSeine(tripSeineId), "this trip is not opened"); openTripSeineId = null; + firePropertyChange(PROPERTY_OPEN_TRIP_SEINE, true, false); + firePropertyChange(PROPERTY_OPEN_TRIP, true, false); } // Route @@ -96,6 +111,7 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(routeId, "id cant be null"); Preconditions.checkState(canOpenRoute(parentTripSeineId), "the trip is not opened or another route already opened"); openRouteId = routeId; + firePropertyChange(PROPERTY_OPEN_ROUTE, false, true); } public boolean isOpenRoute() { @@ -111,6 +127,7 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(routeId, "id cant be null"); Preconditions.checkState(isOpenRoute(routeId), "this route is not opened"); openRouteId = null; + firePropertyChange(PROPERTY_OPEN_ROUTE, true, false); } // Activity Seine @@ -124,6 +141,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(activitySeineId, "id cant be null"); Preconditions.checkState(canOpenActivitySeine(parentRouteId), "the route is not opened or another activity is already opened"); openActivitySeineId = activitySeineId; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_SEINE, false, true); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, false, true); } public boolean isOpenActivitySeine() { @@ -139,6 +158,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(activitySeineId, "id cant be null"); Preconditions.checkState(isOpenActivitySeine(activitySeineId), "this activity is not opened"); openActivitySeineId = null; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_SEINE, true, false); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, true, false); } // Trip Longline @@ -150,6 +171,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); Preconditions.checkState(canOpenTripLongline(), "a trip is already opened"); openTripLonglineId = tripLongLineId; + firePropertyChange(PROPERTY_OPEN_TRIP_LONGLINE, false, true); + firePropertyChange(PROPERTY_OPEN_TRIP, false, true); } public boolean isOpenTripLongline() { @@ -165,6 +188,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); Preconditions.checkState(isOpenTripLongline(tripLongLineId), "this trip is not opened"); openTripLonglineId = null; + firePropertyChange(PROPERTY_OPEN_TRIP_LONGLINE, true, false); + firePropertyChange(PROPERTY_OPEN_TRIP, true, false); } // Activity Longline @@ -178,6 +203,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); Preconditions.checkState(canOpenActivityLongline(parentTripLonglineId), "the trip is not opened or another activity is already opened"); openActivityLonglineId = activityLonglineId; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_SEINE, false, true); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, false, true); } public boolean isOpenActivityLongline() { @@ -193,6 +220,8 @@ public class ObserveOpenDataManager implements Closeable { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); Preconditions.checkState(isOpenActivityLongline(activityLonglineId), "this activity is not opened"); openActivityLonglineId = null; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_LONGLINE, true, false); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, true, false); } public boolean isOpen(String openableId) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 25cc31b..0bdc6a9 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -222,6 +223,8 @@ public class ObserveMainUIHandler { ObserveTreeHelper treeHelper = new ObserveTreeHelper(); ObserveSwingDataSource source = context.getDataSource(); + // get it for it to be set in the context + ObserveOpenDataManager openDataManager = context.getOpenDataManager(); boolean open = context.getDataContext().getEnabled(); if (open) { 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 74f2a1c..3894215 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' javaBean='getContextValue(ObserveOpenDataManager.class)'/> + <ObserveOpenDataManager id='openDataManager' initializer='getContextValue(ObserveOpenDataManager.class)'/> <ObserveTreeHelper id='treeHelper' initializer='getContextValue(ObserveTreeHelper.class)'/> 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 062b87e..51fec20 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 @@ -58,9 +58,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected ContentMode getContentMode(DataContext dataContext) { - String openProgramId = dataContext.getOpenProgramId(); - - if (openProgramId == null) { + if (!getOpenDataManager().isOpenProgram()) { // pas de program ouvert (donc pas de maree ouverte) // on peut reouvrir une maree @@ -72,7 +70,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe // il existe un maree ouverte // - if (dataContext.isSelectedOpen(ProgramDto.class)) { + if (getOpenDataManager().isOpenProgram(dataContext.getSelectedProgramId())) { // le program courant a une maree ouverte addInfoMessage(n("observe.tripSeine.message.active.found")); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 2b0eced..e0d7b45 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -78,6 +78,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline protected boolean doOpenData() { boolean result = getOpenDataManager().canOpenTripLongline(); if (result) { + getOpenDataManager().openProgram(getSelectedParentId()); getOpenDataManager().openTripLongline(getSelectedId()); } return result; @@ -88,6 +89,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline boolean result = getOpenDataManager().isOpenTripLongline(getSelectedId()); if (result) { getOpenDataManager().closeTripLongline(getSelectedId()); + getOpenDataManager().closeProgram(getSelectedParentId()); } return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index faa8f50..9333155 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -77,6 +77,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { protected boolean doOpenData() { boolean result = getOpenDataManager().canOpenTripSeine(); if (result) { + getOpenDataManager().openProgram(getSelectedParentId()); getOpenDataManager().openTripSeine(getSelectedId()); } return result; @@ -87,6 +88,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { boolean result = getOpenDataManager().isOpenTripSeine(getSelectedId()); if (result) { getOpenDataManager().closeTripSeine(getSelectedId()); + getOpenDataManager().closeProgram(getSelectedParentId()); } return result; } -- 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 875345337279a6beff0072332ccb7ef2fcfe7016 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 6dce6df125dab9aec881986e65d70764c967af9d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:43:01 2015 +0100 Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) --- .../observe/services/dto/longline/ActivityLonglineDtos.java | 10 ++++++++++ .../fr/ird/observe/services/dto/longline/TripLonglineDtos.java | 10 ++++++++++ .../fr/ird/observe/services/dto/seine/ActivitySeineDtos.java | 10 ++++++++++ .../main/java/fr/ird/observe/services/dto/seine/RouteDtos.java | 10 ++++++++++ .../java/fr/ird/observe/services/dto/seine/TripSeineDtos.java | 6 ++++++ 5 files changed, 46 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java new file mode 100644 index 0000000..9abbbb5 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.longline; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class ActivityLonglineDtos extends AbstractActivityLonglineDtos { + + public static ReferenceDto<ActivityLonglineDto> newReferenceDto(ActivityLonglineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java new file mode 100644 index 0000000..4673c7c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.longline; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class TripLonglineDtos extends AbstractTripLonglineDtos { + + public static ReferenceDto<TripLonglineDto> newReferenceDto(TripLonglineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java new file mode 100644 index 0000000..d197fa8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.seine; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class ActivitySeineDtos extends AbstractActivitySeineDtos { + + public static ReferenceDto<ActivitySeineDto> newReferenceDto(ActivitySeineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java new file mode 100644 index 0000000..cea29b3 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.seine; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class RouteDtos extends AbstractRouteDtos { + + public static ReferenceDto<RouteDto> newReferenceDto(RouteDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java new file mode 100644 index 0000000..ef89845 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java @@ -0,0 +1,6 @@ +package fr.ird.observe.services.dto.seine; + +public class TripSeineDtos extends AbstractTripSeineDtos { + + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm