branch develop updated (3ba428e -> f9f19a0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3ba428e Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop new 0c38504 ajout d'un gestionnaire pour les données ouvertes (refs #7469) new bc06d62 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) new 6132465 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) new 859931b utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) new 3d6dad9 Mettre les méthodes ensembles new a5c07a2 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide new f9f19a0 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop 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 f9f19a03f98851c3a9509f9e1b3329e2a2dc90b1 Merge: 3ba428e a5c07a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:02:40 2015 +0200 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop commit a5c07a2f30ad85732c7aadc722fc5cfbe7bdd848 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:02:31 2015 +0200 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide commit 3d6dad9d119b58f465a12aac2dcafb5b74f4c4b9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 14:45:37 2015 +0200 Mettre les méthodes ensembles commit 859931bed664e479974ec667e174c3e90327a6ac Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 13:41:23 2015 +0200 utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) commit 613246597f7fe9157a3fc59a48a597d419d3abac Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 12:00:47 2015 +0200 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) commit bc06d62314e41eea22d161a85c9d60f8efc21b2b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 11:27:20 2015 +0200 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) commit 0c3850490182189f90cecc9cce0b6ed6b5f6b3ea Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 11:11:08 2015 +0200 ajout d'un gestionnaire pour les données ouvertes (refs #7469) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 152 +++++++++++++++++++++ .../observe/ObserveSwingApplicationContext.java | 15 ++ .../ui/content/open/ContentOpenableUIHandler.java | 17 ++- .../impl/longline/ActivityLonglineUIHandler.java | 18 +++ .../open/impl/longline/TripLonglineUIHandler.java | 18 +++ .../open/impl/seine/ActivitySeineUIHandler.java | 18 +++ .../ui/content/open/impl/seine/RouteUIHandler.java | 17 ++- .../open/impl/seine/TripSeineUIHandler.java | 18 +++ 8 files changed, 264 insertions(+), 9 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.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 develop in repository observe. See http://git.codelutin.com/observe.git commit 0c3850490182189f90cecc9cce0b6ed6b5f6b3ea Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 11:11:08 2015 +0200 ajout d'un gestionnaire pour les données ouvertes (refs #7469) --- .../fr/ird/observe/ObserveOpenDataManager.java | 116 +++++++++++++++++++++ .../observe/ObserveSwingApplicationContext.java | 15 +++ 2 files changed, 131 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 new file mode 100644 index 0000000..a0291a7 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java @@ -0,0 +1,116 @@ +package fr.ird.observe; + +import com.google.common.base.Preconditions; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.lang3.StringUtils; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObserveOpenDataManager { + + protected String openTripId; + + protected String openRouteId; + + protected String openActivityId; + + // Trips + public boolean canOpenTrip() { + return StringUtils.isBlank(openTripId); + } + + // Trip Seine + + public void open(TripSeineDto tripSeineDto) { + Preconditions.checkState(canOpenTrip()); + openTripId = tripSeineDto.getId(); + } + + public boolean isOpen(TripSeineDto tripSeineDto) { + return tripSeineDto.getId().equals(openTripId); + } + + public void close(TripSeineDto tripSeineDto) { + Preconditions.checkState(isOpen(tripSeineDto)); + openTripId = null; + } + + // Trip Longline + + public void open(TripLonglineDto tripLonglineDto) { + Preconditions.checkState(canOpenTrip()); + openTripId = tripLonglineDto.getId(); + } + + public boolean isOpen(TripLonglineDto tripLonglineDto) { + return tripLonglineDto.getId().equals(openTripId); + } + + public void close(TripLonglineDto tripLonglineDto) { + Preconditions.checkState(isOpen(tripLonglineDto)); + openTripId = null; + } + + // Route + public boolean canOpenRoute(TripSeineDto parentTripDto) { + return isOpen(parentTripDto) && StringUtils.isBlank(openRouteId); + } + + public void open(TripSeineDto parentTripDto, RouteDto routeDto) { + Preconditions.checkState(canOpenRoute(parentTripDto)); + openRouteId = routeDto.getId(); + } + + public boolean isOpen(RouteDto routeDto) { + return routeDto.getId().equals(openRouteId); + } + + public void close(RouteDto routeDto) { + Preconditions.checkState(isOpen(routeDto)); + openRouteId = null; + } + + // Activity Seine + public boolean canOpenActivity(RouteDto parentRouteDto) { + return isOpen(parentRouteDto) && StringUtils.isBlank(openActivityId); + } + + public void open(RouteDto parentRouteDto, ActivitySeineDto activitySeineDto) { + Preconditions.checkState(canOpenActivity(parentRouteDto)); + openActivityId = activitySeineDto.getId(); + } + + public boolean isOpen(ActivitySeineDto activitySeineDto) { + return activitySeineDto.getId().equals(openActivityId); + } + + public void close(ActivitySeineDto activitySeineDto) { + Preconditions.checkState(isOpen(activitySeineDto)); + openActivityId = null; + } + + // Activity Longline + public boolean canOpenActivity(TripLonglineDto parentTripDto) { + return isOpen(parentTripDto) && StringUtils.isBlank(openActivityId); + } + + public void open(TripLonglineDto parentTripDto, ActivityLonglineDto activityLonglineDto) { + Preconditions.checkState(canOpenActivity(parentTripDto)); + openActivityId = activityLonglineDto.getId(); + } + + public boolean isOpen(ActivityLonglineDto activityLonglineDto) { + return activityLonglineDto.getId().equals(openActivityId); + } + + public void close(ActivityLonglineDto activityLonglineDto) { + Preconditions.checkState(isOpen(activityLonglineDto)); + openActivityId = null; + } + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 77fee7f..450870e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -130,6 +130,10 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { public static final JAXXContextEntryDef<ObserveDataSourceConfigurationMainFactory> DATA_SOURCE_CONFIGURATION_FACTORY_ENTRY_DEF = JAXXUtil.newContextEntryDef(ObserveDataSourceConfigurationMainFactory.class); + /** the jaxx context entry to store the data source configuration factory */ + public static final JAXXContextEntryDef<ObserveOpenDataManager> OPEN_DATA_MANAGER_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ObserveOpenDataManager.class); + /** the jaxx context entry to store the decorator service */ public static final JAXXContextEntryDef<BinderService> BINDER_SERVICE_ENTRY_DEF = @@ -229,6 +233,17 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { return textGenerator; } + public final ObserveOpenDataManager getOpenDataManager() { + ObserveOpenDataManager openDataManager = + OPEN_DATA_MANAGER_ENTRY_DEF.getContextValue(this); + if (openDataManager == null) { + + openDataManager = new ObserveOpenDataManager(); + OPEN_DATA_MANAGER_ENTRY_DEF.setContextValue(this, openDataManager); + } + return openDataManager; + } + public final ObserveDataSourceConfigurationMainFactory getObserveDataSourceConfigurationMainFactory() { -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit bc06d62314e41eea22d161a85c9d60f8efc21b2b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 11:27:20 2015 +0200 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) --- .../main/java/fr/ird/observe/ObserveOpenDataManager.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 a0291a7..bd043bc 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 @@ -8,10 +8,16 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.lang3.StringUtils; +import java.io.Closeable; + /** + * Pour gérer les données ouvertes sur une source de données dans l'application. + * À l'ouverture d'une source de données rien n'est ouvert. + * Les états de cet objet sont liés au cylce de vie d'une source de données dans l'application. + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ObserveOpenDataManager { +public class ObserveOpenDataManager implements Closeable { protected String openTripId; @@ -113,4 +119,11 @@ public class ObserveOpenDataManager { openActivityId = null; } + @Override + public void close() { + openTripId = null; + openRouteId = null; + openActivityId = 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 613246597f7fe9157a3fc59a48a597d419d3abac Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 12:00:47 2015 +0200 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) --- .../fr/ird/observe/ObserveOpenDataManager.java | 127 +++++++++++---------- 1 file changed, 65 insertions(+), 62 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 bd043bc..2095a9e 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,11 +1,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.lang3.StringUtils; import java.io.Closeable; @@ -19,111 +14,119 @@ import java.io.Closeable; */ public class ObserveOpenDataManager implements Closeable { - protected String openTripId; + protected String openTripSeineId; protected String openRouteId; - protected String openActivityId; + protected String openActivitySeineId; + + protected String openTripLonglineId; + + protected String openActivityLonglineId; - // Trips - public boolean canOpenTrip() { - return StringUtils.isBlank(openTripId); - } // Trip Seine + public boolean canOpenTripSeine() { + return StringUtils.isBlank(openTripSeineId) && StringUtils.isBlank(openTripLonglineId); + } - public void open(TripSeineDto tripSeineDto) { - Preconditions.checkState(canOpenTrip()); - openTripId = tripSeineDto.getId(); + public void openTripSeine(String tripSeineId) { + Preconditions.checkState(canOpenTripSeine()); + openTripSeineId = tripSeineId; } - public boolean isOpen(TripSeineDto tripSeineDto) { - return tripSeineDto.getId().equals(openTripId); + public boolean isOpenTripSeine(String tripSeineId) { + return tripSeineId.equals(openTripSeineId); } - public void close(TripSeineDto tripSeineDto) { - Preconditions.checkState(isOpen(tripSeineDto)); - openTripId = null; + public void closeTripSeine(String tripSeineId) { + Preconditions.checkState(isOpenTripSeine(tripSeineId)); + openTripSeineId = null; } - // Trip Longline + // Route + public boolean canOpenRoute(String parentTripSeineId) { + return isOpenTripSeine(parentTripSeineId) && StringUtils.isBlank(openRouteId); + } - public void open(TripLonglineDto tripLonglineDto) { - Preconditions.checkState(canOpenTrip()); - openTripId = tripLonglineDto.getId(); + public void openRoute(String parentTripSeineId, String routeId) { + Preconditions.checkState(canOpenRoute(parentTripSeineId)); + openRouteId = routeId; } - public boolean isOpen(TripLonglineDto tripLonglineDto) { - return tripLonglineDto.getId().equals(openTripId); + public boolean isOpenRoute(String routeId) { + return routeId.equals(openRouteId); } - public void close(TripLonglineDto tripLonglineDto) { - Preconditions.checkState(isOpen(tripLonglineDto)); - openTripId = null; + public void closeRoute(String routeId) { + Preconditions.checkState(isOpenRoute(routeId)); + openRouteId = null; } - // Route - public boolean canOpenRoute(TripSeineDto parentTripDto) { - return isOpen(parentTripDto) && StringUtils.isBlank(openRouteId); + // Activity Seine + public boolean canOpenActivitySeine(String parentRouteId) { + return isOpenRoute(parentRouteId) && StringUtils.isBlank(openActivitySeineId); } - public void open(TripSeineDto parentTripDto, RouteDto routeDto) { - Preconditions.checkState(canOpenRoute(parentTripDto)); - openRouteId = routeDto.getId(); + public void openActivitySeine(String parentRouteId, String activitySeineId) { + Preconditions.checkState(canOpenActivitySeine(parentRouteId)); + openActivitySeineId = activitySeineId; } - public boolean isOpen(RouteDto routeDto) { - return routeDto.getId().equals(openRouteId); + public boolean isOpenActivitySeine(String activitySeineId) { + return activitySeineId.equals(openActivitySeineId); } - public void close(RouteDto routeDto) { - Preconditions.checkState(isOpen(routeDto)); - openRouteId = null; + public void closeActivitySeine(String activitySeineId) { + Preconditions.checkState(isOpenActivitySeine(activitySeineId)); + openActivitySeineId = null; } - // Activity Seine - public boolean canOpenActivity(RouteDto parentRouteDto) { - return isOpen(parentRouteDto) && StringUtils.isBlank(openActivityId); + // Trip Longline + public boolean canOpenTripLongline() { + return StringUtils.isBlank(openTripSeineId) && StringUtils.isBlank(openTripLonglineId); } - public void open(RouteDto parentRouteDto, ActivitySeineDto activitySeineDto) { - Preconditions.checkState(canOpenActivity(parentRouteDto)); - openActivityId = activitySeineDto.getId(); + public void openTripLongline(String tripLongLineId) { + Preconditions.checkState(canOpenTripLongline()); + openTripLonglineId = tripLongLineId; } - public boolean isOpen(ActivitySeineDto activitySeineDto) { - return activitySeineDto.getId().equals(openActivityId); + public boolean isOpenTripLongline(String tripLongLineId) { + return tripLongLineId.equals(openTripLonglineId); } - public void close(ActivitySeineDto activitySeineDto) { - Preconditions.checkState(isOpen(activitySeineDto)); - openActivityId = null; + public void closeTripLongline(String tripLongLineId) { + Preconditions.checkState(isOpenTripLongline(tripLongLineId)); + openTripLonglineId = null; } // Activity Longline - public boolean canOpenActivity(TripLonglineDto parentTripDto) { - return isOpen(parentTripDto) && StringUtils.isBlank(openActivityId); + public boolean canOpenActivityLongline(String parentTripLonglineId) { + return isOpenTripLongline(parentTripLonglineId) && StringUtils.isBlank(openActivityLonglineId); } - public void open(TripLonglineDto parentTripDto, ActivityLonglineDto activityLonglineDto) { - Preconditions.checkState(canOpenActivity(parentTripDto)); - openActivityId = activityLonglineDto.getId(); + public void openActivityLongline(String parentTripLonglineId, String activityLonglineId) { + Preconditions.checkState(canOpenActivityLongline(parentTripLonglineId)); + openActivityLonglineId = activityLonglineId; } - public boolean isOpen(ActivityLonglineDto activityLonglineDto) { - return activityLonglineDto.getId().equals(openActivityId); + public boolean isOpenActivityLongline(String activityLonglineId) { + return activityLonglineId.equals(openActivityLonglineId); } - public void close(ActivityLonglineDto activityLonglineDto) { - Preconditions.checkState(isOpen(activityLonglineDto)); - openActivityId = null; + public void closeActivityLongline(String activityLonglineId) { + Preconditions.checkState(isOpenActivityLongline(activityLonglineId)); + openActivityLonglineId = null; } @Override public void close() { - openTripId = null; + openTripSeineId = null; openRouteId = null; - openActivityId = null; + openActivitySeineId = null; + openTripLonglineId = null; + openActivityLonglineId = 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 859931bed664e479974ec667e174c3e90327a6ac Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 5 13:41:23 2015 +0200 utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) --- .../ui/content/open/ContentOpenableUIHandler.java | 17 +++++++++++------ .../open/impl/longline/ActivityLonglineUIHandler.java | 18 ++++++++++++++++++ .../open/impl/longline/TripLonglineUIHandler.java | 18 ++++++++++++++++++ .../open/impl/seine/ActivitySeineUIHandler.java | 18 ++++++++++++++++++ .../ui/content/open/impl/seine/RouteUIHandler.java | 17 ++++++++++++++--- .../ui/content/open/impl/seine/TripSeineUIHandler.java | 18 ++++++++++++++++++ 6 files changed, 97 insertions(+), 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index e16f02d..748d356 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.ui.content.open; +import fr.ird.observe.ObserveOpenDataManager; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.OpenableDto; @@ -73,11 +75,17 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co return source.canWriteData(); } + protected ObserveOpenDataManager getOpenDataManager() { + ObserveOpenDataManager openDataManager = ObserveSwingApplicationContext.get().getOpenDataManager(); + return openDataManager; + } + + protected abstract boolean doOpenData(); + public final void openDataUI() { boolean ok = false; try { - getBean().setOpen(true); - ok = true; + ok = doOpenData(); } catch (Exception e) { ErrorDialogUI.showError(e); if (log.isErrorEnabled()) { @@ -125,10 +133,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public boolean doCloseData() { - getBean().setOpen(false); - return true; - } + public abstract boolean doCloseData(); public final void afterCloseData() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 0bd0866..b5e418c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -81,6 +81,24 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenActivityLongline(getSelectedParentId()); + if (result) { + getOpenDataManager().openActivityLongline(getSelectedParentId(), getSelectedId()); + } + return result; + } + + @Override + public boolean doCloseData() { + boolean result = getOpenDataManager().isOpenActivityLongline(getSelectedId()); + if (result) { + getOpenDataManager().closeActivityLongline(getSelectedId()); + } + return result; + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { String activityId = getSelectedId(); 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 507c493..9851c3c 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 @@ -72,6 +72,24 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenTripLongline(); + if (result) { + getOpenDataManager().openTripLongline(getSelectedId()); + } + return result; + } + + @Override + public boolean doCloseData() { + boolean result = getOpenDataManager().isOpenTripLongline(getSelectedId()); + if (result) { + getOpenDataManager().closeTripLongline(getSelectedId()); + } + return result; + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { String mareeId = getSelectedId(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index c6b5f3b..8a45db0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -89,6 +89,24 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenActivitySeine(getSelectedParentId()); + if (result) { + getOpenDataManager().openActivitySeine(getSelectedParentId(), getSelectedId()); + } + return result; + } + + @Override + public boolean doCloseData() { + boolean result = getOpenDataManager().isOpenActivitySeine(getSelectedId()); + if (result) { + getOpenDataManager().closeActivitySeine(getSelectedId()); + } + return result; + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { String activityId = getSelectedId(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 32b78e2..37b4a7e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -72,6 +72,15 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenRoute(getSelectedParentId()); + if (result) { + getOpenDataManager().openRoute(getSelectedParentId(), getSelectedId()); + } + return result; + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { String routeId = getSelectedId(); @@ -426,9 +435,11 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } // ok on peut fermer classiquement la route - super.doCloseData(); - - return true; + boolean result = getOpenDataManager().isOpenRoute(getSelectedId()); + if (result) { + getOpenDataManager().closeRoute(getSelectedId()); + } + return result; } protected ActivitySeineUI addActivityFinDeVeille(boolean close) { 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 7de1ee5..b94748e 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 @@ -71,6 +71,24 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenTripSeine(); + if (result) { + getOpenDataManager().openTripSeine(getSelectedId()); + } + return result; + } + + @Override + public boolean doCloseData() { + boolean result = getOpenDataManager().isOpenTripSeine(getSelectedId()); + if (result) { + getOpenDataManager().closeTripSeine(getSelectedId()); + } + return result; + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { String mareeId = getSelectedId(); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 3d6dad9d119b58f465a12aac2dcafb5b74f4c4b9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 14:45:37 2015 +0200 Mettre les méthodes ensembles --- .../ui/content/open/impl/seine/RouteUIHandler.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 37b4a7e..808791d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -72,15 +72,6 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } @Override - protected boolean doOpenData() { - boolean result = getOpenDataManager().canOpenRoute(getSelectedParentId()); - if (result) { - getOpenDataManager().openRoute(getSelectedParentId(), getSelectedId()); - } - return result; - } - - @Override protected ContentMode getContentMode(DataContext dataContext) { String routeId = getSelectedId(); @@ -345,6 +336,15 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // } @Override + protected boolean doOpenData() { + boolean result = getOpenDataManager().canOpenRoute(getSelectedParentId()); + if (result) { + getOpenDataManager().openRoute(getSelectedParentId(), getSelectedId()); + } + return result; + } + + @Override public boolean doCloseData() { RouteDto route = getBean(); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit a5c07a2f30ad85732c7aadc722fc5cfbe7bdd848 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:02:31 2015 +0200 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide --- .../fr/ird/observe/ObserveOpenDataManager.java | 52 +++++++++++++++------- 1 file changed, 36 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 2095a9e..1180b80 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,7 +1,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import org.apache.commons.lang3.StringUtils; import java.io.Closeable; @@ -27,96 +26,117 @@ public class ObserveOpenDataManager implements Closeable { // Trip Seine public boolean canOpenTripSeine() { - return StringUtils.isBlank(openTripSeineId) && StringUtils.isBlank(openTripLonglineId); + return openTripSeineId == null && openTripLonglineId == null; } public void openTripSeine(String tripSeineId) { - Preconditions.checkState(canOpenTripSeine()); + Preconditions.checkNotNull(tripSeineId, "id cant be null"); + Preconditions.checkState(canOpenTripSeine(), "a trip is already opened"); openTripSeineId = tripSeineId; } public boolean isOpenTripSeine(String tripSeineId) { + Preconditions.checkNotNull(tripSeineId, "id cant be null"); return tripSeineId.equals(openTripSeineId); } public void closeTripSeine(String tripSeineId) { - Preconditions.checkState(isOpenTripSeine(tripSeineId)); + Preconditions.checkNotNull(tripSeineId, "id cant be null"); + Preconditions.checkState(isOpenTripSeine(tripSeineId), "this trip is not opened"); openTripSeineId = null; } // Route public boolean canOpenRoute(String parentTripSeineId) { - return isOpenTripSeine(parentTripSeineId) && StringUtils.isBlank(openRouteId); + Preconditions.checkNotNull(parentTripSeineId, "id cant be null"); + return isOpenTripSeine(parentTripSeineId) && openRouteId == null; } public void openRoute(String parentTripSeineId, String routeId) { - Preconditions.checkState(canOpenRoute(parentTripSeineId)); + Preconditions.checkNotNull(parentTripSeineId, "id cant be null"); + Preconditions.checkNotNull(routeId, "id cant be null"); + Preconditions.checkState(canOpenRoute(parentTripSeineId), "the trip is not opened or another route already opened"); openRouteId = routeId; } public boolean isOpenRoute(String routeId) { + Preconditions.checkNotNull(routeId, "id cant be null"); return routeId.equals(openRouteId); } public void closeRoute(String routeId) { - Preconditions.checkState(isOpenRoute(routeId)); + Preconditions.checkNotNull(routeId, "id cant be null"); + Preconditions.checkState(isOpenRoute(routeId), "this route is not opened"); openRouteId = null; } // Activity Seine public boolean canOpenActivitySeine(String parentRouteId) { - return isOpenRoute(parentRouteId) && StringUtils.isBlank(openActivitySeineId); + Preconditions.checkNotNull(parentRouteId, "id cant be null"); + return isOpenRoute(parentRouteId) && openActivitySeineId == null; } public void openActivitySeine(String parentRouteId, String activitySeineId) { - Preconditions.checkState(canOpenActivitySeine(parentRouteId)); + Preconditions.checkNotNull(parentRouteId, "id cant be null"); + Preconditions.checkNotNull(activitySeineId, "id cant be null"); + Preconditions.checkState(canOpenActivitySeine(parentRouteId), "the route is not opened or another activity is already opened"); openActivitySeineId = activitySeineId; } public boolean isOpenActivitySeine(String activitySeineId) { + Preconditions.checkNotNull(activitySeineId, "id cant be null"); return activitySeineId.equals(openActivitySeineId); } public void closeActivitySeine(String activitySeineId) { - Preconditions.checkState(isOpenActivitySeine(activitySeineId)); + Preconditions.checkNotNull(activitySeineId, "id cant be null"); + Preconditions.checkState(isOpenActivitySeine(activitySeineId), "this activity is not opened"); openActivitySeineId = null; } // Trip Longline public boolean canOpenTripLongline() { - return StringUtils.isBlank(openTripSeineId) && StringUtils.isBlank(openTripLonglineId); + return openTripSeineId != null && openTripLonglineId != null; } public void openTripLongline(String tripLongLineId) { - Preconditions.checkState(canOpenTripLongline()); + Preconditions.checkNotNull(tripLongLineId, "id cant be null"); + Preconditions.checkState(canOpenTripLongline(), "a trip is already opened"); openTripLonglineId = tripLongLineId; } public boolean isOpenTripLongline(String tripLongLineId) { + Preconditions.checkNotNull(tripLongLineId, "id cant be null"); return tripLongLineId.equals(openTripLonglineId); } public void closeTripLongline(String tripLongLineId) { - Preconditions.checkState(isOpenTripLongline(tripLongLineId)); + Preconditions.checkNotNull(tripLongLineId, "id cant be null"); + Preconditions.checkState(isOpenTripLongline(tripLongLineId), "this trip is not opened"); openTripLonglineId = null; } // Activity Longline public boolean canOpenActivityLongline(String parentTripLonglineId) { - return isOpenTripLongline(parentTripLonglineId) && StringUtils.isBlank(openActivityLonglineId); + Preconditions.checkNotNull(parentTripLonglineId, "id cant be null"); + return isOpenTripLongline(parentTripLonglineId) && openActivityLonglineId == null; } public void openActivityLongline(String parentTripLonglineId, String activityLonglineId) { - Preconditions.checkState(canOpenActivityLongline(parentTripLonglineId)); + Preconditions.checkNotNull(parentTripLonglineId, "id cant be null"); + Preconditions.checkNotNull(activityLonglineId, "id cant be null"); + Preconditions.checkState(canOpenActivityLongline(parentTripLonglineId), "the trip is not opened or another activity is already opened"); openActivityLonglineId = activityLonglineId; } public boolean isOpenActivityLongline(String activityLonglineId) { + Preconditions.checkNotNull(activityLonglineId, "id cant be null"); return activityLonglineId.equals(openActivityLonglineId); } public void closeActivityLongline(String activityLonglineId) { - Preconditions.checkState(isOpenActivityLongline(activityLonglineId)); + Preconditions.checkNotNull(activityLonglineId, "id cant be null"); + Preconditions.checkState(isOpenActivityLongline(activityLonglineId), "this activity is not opened"); openActivityLonglineId = 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 develop in repository observe. See http://git.codelutin.com/observe.git commit f9f19a03f98851c3a9509f9e1b3329e2a2dc90b1 Merge: 3ba428e a5c07a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:02:40 2015 +0200 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop .../fr/ird/observe/ObserveOpenDataManager.java | 152 +++++++++++++++++++++ .../observe/ObserveSwingApplicationContext.java | 15 ++ .../ui/content/open/ContentOpenableUIHandler.java | 17 ++- .../impl/longline/ActivityLonglineUIHandler.java | 18 +++ .../open/impl/longline/TripLonglineUIHandler.java | 18 +++ .../open/impl/seine/ActivitySeineUIHandler.java | 18 +++ .../ui/content/open/impl/seine/RouteUIHandler.java | 17 ++- .../open/impl/seine/TripSeineUIHandler.java | 18 +++ 8 files changed, 264 insertions(+), 9 deletions(-) -- 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