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 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte --- .../main/java/fr/ird/observe/db/DataContext.java | 104 +++++++++++++++++++-- .../ird/observe/db/constants/DataContextType.java | 36 +++---- .../java/fr/ird/observe/entities/Entities.java | 8 ++ 3 files changed, 120 insertions(+), 28 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java index b64f10f..378a81b 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java @@ -23,6 +23,7 @@ package fr.ird.observe.db; */ import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Program; @@ -135,6 +136,15 @@ public class DataContext extends AbstractSerializableBean { return openTripId; } + public String getOpenTripLonglineId() { + return isOpenTripLongline() ? getOpenTripId() : null; + } + + public String getOpenTripSeineId() { + return isOpenTripSeine() ? getOpenTripId() : null; + } + + public void setOpenTripId(String openTripId) { String oldValue = getOpenTripId(); boolean oldValue2 = isOpenTrip(); @@ -159,6 +169,14 @@ public class DataContext extends AbstractSerializableBean { return openActivityId; } + public String getOpenActivityLonglineId() { + return isOpenActivityLongline() ? getOpenActivityId() : null; + } + + public String getOpenActivitySeineId() { + return isOpenActivitySeine() ? getOpenActivityId() : null; + } + public void setOpenActivityId(String openActivityId) { String oldValue = getOpenActivityId(); boolean oldValue2 = isOpenActivity(); @@ -171,6 +189,15 @@ public class DataContext extends AbstractSerializableBean { return openSetId; } + public String getOpenSetLonglineId() { + return isOpenSetLongline() ? getOpenSetId() : null; + } + + public String getOpenSetSeineId() { + return isOpenSetSeine() ? getOpenSetId() : null; + } + + public void setOpenSetId(String openSetId) { String oldValue = getOpenSetId(); boolean oldValue2 = isOpenSet(); @@ -193,6 +220,14 @@ public class DataContext extends AbstractSerializableBean { return selectedTripId; } + public String getSelectedTripLonglineId() { + return isSelectedTripLongline() ? getSelectedTripId() : null; + } + + public String getSelectedTripSeineId() { + return isSelectedTripSeine() ? getSelectedTripId() : null; + } + public void setSelectedTripId(String selectedTripId) { String oldValue = getSelectedTripId(); this.selectedTripId = selectedTripId; @@ -200,7 +235,11 @@ public class DataContext extends AbstractSerializableBean { } public boolean isSelectedTripLongline() { - return selectedTripId != null && selectedTripId.contains("Longline"); + return selectedTripId != null && Entities.isLonglineId(selectedTripId); + } + + public boolean isSelectedTripSeine() { + return selectedTripId != null && Entities.isSeineId(selectedTripId); } public String getSelectedRouteId() { @@ -217,8 +256,20 @@ public class DataContext extends AbstractSerializableBean { return selectedActivityId; } + public String getSelectedActivityLonglineId() { + return isSelectedActivityLongline() ? getSelectedActivityId() : null; + } + + public String getSelectedActivitySeineId() { + return isSelectedActivitySeine() ? getSelectedActivityId() : null; + } + public boolean isSelectedActivityLongline() { - return selectedActivityId != null && selectedActivityId.contains("Longline"); + return selectedActivityId != null && Entities.isLonglineId(selectedActivityId); + } + + public boolean isSelectedActivitySeine() { + return selectedActivityId != null && Entities.isSeineId(selectedActivityId); } public void setSelectedActivityId(String selectedActivityId) { @@ -231,6 +282,14 @@ public class DataContext extends AbstractSerializableBean { return selectedSetId; } + public String getSelectedSetLonglineId() { + return isSelectedActivityLongline() ? getSelectedSetId() : null; + } + + public String getSelectedSetSeineId() { + return isSelectedActivitySeine() ? getSelectedSetId() : null; + } + public void setSelectedSetId(String selectedSetId) { String oldValue = getSelectedSetId(); this.selectedSetId = selectedSetId; @@ -365,10 +424,10 @@ public class DataContext extends AbstractSerializableBean { // on a seine trip if (!TripSeine.class.equals(type) && isOpenRoute()) { ids.add(getOpenRouteId()); - if (!Route.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivitySeine.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!Route.class.equals(type) && isOpenActivitySeine()) { + ids.add(getOpenActivitySeineId()); + if (!ActivitySeine.class.equals(type) && isOpenSetSeine()) { + ids.add(getOpenSetSeineId()); } } } @@ -376,10 +435,10 @@ public class DataContext extends AbstractSerializableBean { } else { // on a longline trip - if (!TripLongline.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivityLongline.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!TripLongline.class.equals(type) && isOpenActivityLongline()) { + ids.add(getOpenActivityLonglineId()); + if (!ActivityLongline.class.equals(type) && isOpenSetLongline()) { + ids.add(getOpenSetLonglineId()); } } @@ -403,6 +462,14 @@ public class DataContext extends AbstractSerializableBean { return openTripId != null; } + public boolean isOpenTripLongline() { + return isOpenTrip() && Entities.isLonglineId(openTripId); + } + + public boolean isOpenTripSeine() { + return isOpenTrip() && Entities.isSeineId(openTripId); + } + public boolean isOpenRoute() { return openRouteId != null; } @@ -411,10 +478,27 @@ public class DataContext extends AbstractSerializableBean { return openActivityId != null; } + public boolean isOpenActivityLongline() { + return isOpenActivity() && Entities.isLonglineId(openActivityId); + } + + public boolean isOpenActivitySeine() { + return isOpenActivity() && Entities.isSeineId(openActivityId); + } + + public boolean isOpenSet() { return openSetId != null; } + public boolean isOpenSetLongline() { + return isOpenSet() && Entities.isLonglineId(openSetId); + } + + public boolean isOpenSetSeine() { + return isOpenSet() && Entities.isSeineId(openSetId); + } + public boolean isSelectedOpen(Class<?> type) { for (DataContextType entityType : DataContextType.values()) { diff --git a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java index 4c9522b..592b4fc 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java +++ b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java @@ -72,12 +72,12 @@ public enum DataContextType { TripSeine(TripSeine.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripSeineId(); } @Override @@ -87,7 +87,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripSeineId(); } @Override @@ -99,12 +99,12 @@ public enum DataContextType { TripLongline(TripLongline.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripLonglineId(); } @Override @@ -114,7 +114,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripLonglineId(); } @Override @@ -153,12 +153,12 @@ public enum DataContextType { ActivitySeine(ActivitySeine.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivitySeineId(); } @Override @@ -168,7 +168,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivitySeineId(); } @Override @@ -180,12 +180,12 @@ public enum DataContextType { ActivityLongline(ActivityLongline.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivityLonglineId(); } @Override @@ -195,7 +195,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivityLonglineId(); } @Override @@ -207,12 +207,12 @@ public enum DataContextType { SetSeine(SetSeine.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetSeineId(); } @Override @@ -222,7 +222,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetSeineId(); } @Override @@ -234,12 +234,12 @@ public enum DataContextType { SetLongline(SetLongline.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetLonglineId(); } @Override @@ -249,7 +249,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetLonglineId(); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index da63dac..f914e3b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -351,4 +351,12 @@ public class Entities { } + public static boolean isSeineId(String id) { + return id.contains("Seine"); + } + + public static boolean isLonglineId(String id) { + return id.contains("Longline"); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.