branch feature/fix_close_7593 created (now 51f9e80)
This is an automated email from the git hooks/post-receive script. New change to branch feature/fix_close_7593 in repository observe. See http://git.codelutin.com/observe.git at 51f9e80 fix test sur l'id du noeud de tripseine This branch includes the following new commits: new 51f9e80 fix test sur l'id du noeud de tripseine 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 51f9e8031b09b844839d7e8eefed89faa0d26b28 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 10 18:07:59 2015 +0100 fix test sur l'id du noeud de tripseine -- 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/fix_close_7593 in repository observe. See http://git.codelutin.com/observe.git commit 51f9e8031b09b844839d7e8eefed89faa0d26b28 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 10 18:07:59 2015 +0100 fix test sur l'id du noeud de tripseine --- .../src/main/java/fr/ird/observe/business/db/DataContext.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java index 1e7d9e2..0541525 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java @@ -483,13 +483,17 @@ public class DataContext extends AbstractSerializableBean { String tripId = getOpenTripId(); ids.add(tripId); - if (tripId.startsWith(TripSeineDto.class.getName())) { + if (IdDtos.isTripSeineId(tripId)) { // on a seine trip if (!TripSeineDto.class.equals(type) && isOpenRoute()) { + ids.add(getOpenRouteId()); + if (!RouteDto.class.equals(type) && isOpenActivitySeine()) { + ids.add(getOpenActivitySeineId()); + if (!ActivitySeineDto.class.equals(type) && isOpenSetSeine()) { ids.add(getOpenSetSeineId()); } @@ -500,7 +504,9 @@ public class DataContext extends AbstractSerializableBean { // on a longline trip if (!TripLonglineDto.class.equals(type) && isOpenActivityLongline()) { + ids.add(getOpenActivityLonglineId()); + if (!ActivityLonglineDto.class.equals(type) && isOpenSetLongline()) { ids.add(getOpenSetLonglineId()); } -- 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