branch feature/7469 updated (859931b -> a5c07a2)
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 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 The 2 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 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 Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 52 +++++++++++++++------- .../ui/content/open/impl/seine/RouteUIHandler.java | 18 ++++---- 2 files changed, 45 insertions(+), 25 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 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 feature/7469 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>.
participants (1)
-
codelutin.com scm