branch feature/7469 updated (bc06d62 -> 6132465)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7469 in repository observe. See http://git.codelutin.com/observe.git from 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) The 1 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 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) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 127 +++++++++++---------- 1 file changed, 65 insertions(+), 62 deletions(-) -- 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/7469 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>.
participants (1)
-
codelutin.com scm