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 54001ed6bd96175588c3c940360b371b9db7b3a2 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 14:16:50 2015 +0100 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext --- .../fr/ird/observe/ObserveOpenDataManager.java | 83 +++++++----- .../observe/ObserveSwingApplicationContext.java | 4 +- .../fr/ird/observe/business/db/DataContext.java | 148 +++++++++++++++------ .../business/db/constants/DataContextType.java | 12 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../services/dto/referential/ProgramDtos.java | 19 +-- 7 files changed, 171 insertions(+), 99 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 d146008..4108439 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,6 +1,7 @@ package fr.ird.observe; import com.google.common.base.Preconditions; +import fr.ird.observe.business.db.DataContext; import java.io.Closeable; @@ -13,131 +14,153 @@ import java.io.Closeable; */ public class ObserveOpenDataManager implements Closeable { - protected String openTripSeineId; + private final DataContext dataContext; - protected String openRouteId; + public ObserveOpenDataManager(DataContext dataContext) { + this.dataContext = dataContext; + } + + // Program + public boolean canOpenProgram() { + return !dataContext.isOpenProgram(); + } - protected String openActivitySeineId; + public void openProgram(String programId) { + Preconditions.checkNotNull(programId, "id cant be null"); + Preconditions.checkState(canOpenProgram(), "a program is already opened"); + dataContext.setOpenProgramId(programId); + } - protected String openTripLonglineId; + public boolean isOpenProgram(String programId) { + Preconditions.checkNotNull(programId, "id cant be null"); + return programId.equals(dataContext.getOpenProgramId()); + } - protected String openActivityLonglineId; + public void closeProgram(String programId) { + Preconditions.checkNotNull(programId, "id cant be null"); + Preconditions.checkState(isOpenProgram(programId), "this program is not opened"); + dataContext.setOpenProgramId(null); + } // Trip Seine public boolean canOpenTripSeine() { - return openTripSeineId == null && openTripLonglineId == null; + return !dataContext.isOpenTrip(); } - public void openTripSeine(String tripSeineId) { + public void openTripSeine(String programId, String tripSeineId) { + openProgram(programId); Preconditions.checkNotNull(tripSeineId, "id cant be null"); Preconditions.checkState(canOpenTripSeine(), "a trip is already opened"); - openTripSeineId = tripSeineId; + dataContext.setOpenTripSeineId(tripSeineId); } public boolean isOpenTripSeine(String tripSeineId) { Preconditions.checkNotNull(tripSeineId, "id cant be null"); - return tripSeineId.equals(openTripSeineId); + return tripSeineId.equals(dataContext.getOpenTripSeineId()); } public void closeTripSeine(String tripSeineId) { Preconditions.checkNotNull(tripSeineId, "id cant be null"); Preconditions.checkState(isOpenTripSeine(tripSeineId), "this trip is not opened"); - openTripSeineId = null; + dataContext.setOpenTripSeineId(null); + dataContext.setOpenProgramId(null); } // Route public boolean canOpenRoute(String parentTripSeineId) { Preconditions.checkNotNull(parentTripSeineId, "id cant be null"); - return isOpenTripSeine(parentTripSeineId) && openRouteId == null; + return isOpenTripSeine(parentTripSeineId) && !dataContext.isOpenRoute(); } public void openRoute(String parentTripSeineId, String routeId) { 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; + dataContext.setOpenRouteId(routeId); } public boolean isOpenRoute(String routeId) { Preconditions.checkNotNull(routeId, "id cant be null"); - return routeId.equals(openRouteId); + return routeId.equals(dataContext.getOpenRouteId()); } public void closeRoute(String routeId) { Preconditions.checkNotNull(routeId, "id cant be null"); Preconditions.checkState(isOpenRoute(routeId), "this route is not opened"); - openRouteId = null; + dataContext.setOpenRouteId(null); } // Activity Seine public boolean canOpenActivitySeine(String parentRouteId) { Preconditions.checkNotNull(parentRouteId, "id cant be null"); - return isOpenRoute(parentRouteId) && openActivitySeineId == null; + return isOpenRoute(parentRouteId) && !dataContext.isOpenActivitySeine(); } public void openActivitySeine(String parentRouteId, String activitySeineId) { 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; + dataContext.setOpenActivitySeineId(activitySeineId); } public boolean isOpenActivitySeine(String activitySeineId) { Preconditions.checkNotNull(activitySeineId, "id cant be null"); - return activitySeineId.equals(openActivitySeineId); + return activitySeineId.equals(dataContext.getOpenActivitySeineId()); } public void closeActivitySeine(String activitySeineId) { Preconditions.checkNotNull(activitySeineId, "id cant be null"); Preconditions.checkState(isOpenActivitySeine(activitySeineId), "this activity is not opened"); - openActivitySeineId = null; + dataContext.setOpenActivitySeineId(null); } // Trip Longline public boolean canOpenTripLongline() { - return openTripSeineId == null && openTripLonglineId == null; + return !dataContext.isOpenTrip(); } - public void openTripLongline(String tripLongLineId) { + public void openTripLongline(String programId, String tripLongLineId) { + openProgram(programId); Preconditions.checkNotNull(tripLongLineId, "id cant be null"); Preconditions.checkState(canOpenTripLongline(), "a trip is already opened"); - openTripLonglineId = tripLongLineId; + dataContext.setOpenTripLonglineId(tripLongLineId); } public boolean isOpenTripLongline(String tripLongLineId) { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); - return tripLongLineId.equals(openTripLonglineId); + return tripLongLineId.equals(dataContext.getOpenTripLonglineId()); } public void closeTripLongline(String tripLongLineId) { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); Preconditions.checkState(isOpenTripLongline(tripLongLineId), "this trip is not opened"); - openTripLonglineId = null; + dataContext.setOpenTripLonglineId(null); + dataContext.setOpenProgramId(null); } // Activity Longline public boolean canOpenActivityLongline(String parentTripLonglineId) { Preconditions.checkNotNull(parentTripLonglineId, "id cant be null"); - return isOpenTripLongline(parentTripLonglineId) && openActivityLonglineId == null; + return isOpenTripLongline(parentTripLonglineId) && !dataContext.isOpenActivityLongline(); } public void openActivityLongline(String parentTripLonglineId, String activityLonglineId) { 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; + dataContext.setOpenActivityLonglineId(activityLonglineId); } public boolean isOpenActivityLongline(String activityLonglineId) { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); - return activityLonglineId.equals(openActivityLonglineId); + return activityLonglineId.equals(dataContext.getOpenActivityLonglineId()); } public void closeActivityLongline(String activityLonglineId) { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); Preconditions.checkState(isOpenActivityLongline(activityLonglineId), "this activity is not opened"); - openActivityLonglineId = null; + dataContext.setOpenActivityLonglineId(null); } public boolean isOpen(String openableId) { @@ -155,10 +178,6 @@ public class ObserveOpenDataManager implements Closeable { @Override public void close() { - openTripSeineId = null; - openRouteId = null; - openActivitySeineId = null; - openTripLonglineId = null; - openActivityLonglineId = null; + dataContext.resetOpen(); } } 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 5857f6f..439c820 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 @@ -249,7 +249,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im OPEN_DATA_MANAGER_ENTRY_DEF.getContextValue(this); if (openDataManager == null) { - openDataManager = new ObserveOpenDataManager(); + DataContext dataContext = getDataContext(); + + openDataManager = new ObserveOpenDataManager(dataContext); OPEN_DATA_MANAGER_ENTRY_DEF.setContextValue(this, openDataManager); } return openDataManager; 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 37c06be..0eda1ae 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 @@ -46,22 +46,34 @@ public class DataContext extends AbstractSerializableBean { public static final String PROPERTY_OPEN_PROGRAM = "openProgram"; public static final String PROPERTY_OPEN_TRIP = "openTrip"; + public static final String PROPERTY_OPEN_TRIP_SEINE = "openTripSeine"; + public static final String PROPERTY_OPEN_TRIP_LONGLINE = "openTripLongline"; public static final String PROPERTY_OPEN_ROUTE = "openRoute"; public static final String PROPERTY_OPEN_ACTIVITY = "openActivity"; + public static final String PROPERTY_OPEN_ACTIVITY_SEINE = "openActivitySeine"; + public static final String PROPERTY_OPEN_ACTIVITY_LONGLINE = "openActivityLongline"; public static final String PROPERTY_OPEN_SET = "openSet"; + public static final String PROPERTY_OPEN_SET_SEINE = "openSetSeine"; + public static final String PROPERTY_OPEN_SET_LONGLINE = "openSetLongline"; public static final String PROPERTY_OPEN_PROGRAM_ID = "openProgramId"; public static final String PROPERTY_OPEN_TRIP_ID = "openTripId"; + public static final String PROPERTY_OPEN_TRIP_SEINE_ID = "openTripSeineId"; + public static final String PROPERTY_OPEN_TRIP_LONGLINE_ID = "openTripLonglineId"; public static final String PROPERTY_OPEN_ROUTE_ID = "openRouteId"; public static final String PROPERTY_OPEN_ACTIVITY_ID = "openActivityId"; + public static final String PROPERTY_OPEN_ACTIVITY_SEINE_ID = "openActivitySeineId"; + public static final String PROPERTY_OPEN_ACTIVITY_LONGLINE_ID = "openActivityLonglineId"; public static final String PROPERTY_OPEN_SET_ID = "openSetId"; + public static final String PROPERTY_OPEN_SET_SEINE_ID = "openSetSeineId"; + public static final String PROPERTY_OPEN_SET_LONGLINE_ID = "openSetLonglineId"; public static final String PROPERTY_SELECTED_PROGRAM_ID = "selectedProgramId"; @@ -81,13 +93,19 @@ public class DataContext extends AbstractSerializableBean { protected String openProgramId; - protected String openTripId; + protected String openTripSeineId; + + protected String openTripLonglineId; protected String openRouteId; - protected String openActivityId; + protected String openActivitySeineId; + + protected String openActivityLonglineId; - protected String openSetId; + protected String openSetSeineId; + + protected String openSetLonglineId; protected String selectedProgramId; @@ -133,24 +151,39 @@ public class DataContext extends AbstractSerializableBean { } public String getOpenTripId() { - return openTripId; + return openTripSeineId != null ? openTripSeineId : openTripLonglineId; } - public String getOpenTripLonglineId() { - return isOpenTripLongline() ? getOpenTripId() : null; + public String getOpenTripSeineId() { + return openTripSeineId; } - public String getOpenTripSeineId() { - return isOpenTripSeine() ? getOpenTripId() : null; + public String getOpenTripLonglineId() { + return openTripLonglineId; } + public void setOpenTripSeineId(String openTripId) { + String oldValue = getOpenTripId(); + String oldValue2 = getOpenTripSeineId(); + boolean oldValue3 = isOpenTrip(); + boolean oldValue4 = isOpenTripSeine(); + this.openTripSeineId = openTripId; + firePropertyChange(PROPERTY_OPEN_TRIP_ID, oldValue, this.openTripSeineId); + firePropertyChange(PROPERTY_OPEN_TRIP_SEINE_ID, oldValue2, this.openTripSeineId); + firePropertyChange(PROPERTY_OPEN_TRIP, oldValue3, isOpenTrip()); + firePropertyChange(PROPERTY_OPEN_TRIP_SEINE, oldValue4, isOpenTripSeine()); + } - public void setOpenTripId(String openTripId) { + public void setOpenTripLonglineId(String openTripId) { String oldValue = getOpenTripId(); - boolean oldValue2 = isOpenTrip(); - this.openTripId = openTripId; - firePropertyChange(PROPERTY_OPEN_TRIP_ID, oldValue, this.openTripId); - firePropertyChange(PROPERTY_OPEN_TRIP, oldValue2, isOpenTrip()); + String oldValue2 = getOpenTripLonglineId(); + boolean oldValue3 = isOpenTrip(); + boolean oldValue4 = isOpenTripLongline(); + this.openTripLonglineId = openTripId; + firePropertyChange(PROPERTY_OPEN_TRIP_ID, oldValue, this.openTripLonglineId); + firePropertyChange(PROPERTY_OPEN_TRIP_LONGLINE_ID, oldValue2, this.openTripLonglineId); + firePropertyChange(PROPERTY_OPEN_TRIP, oldValue3, isOpenTrip()); + firePropertyChange(PROPERTY_OPEN_TRIP_LONGLINE, oldValue4, isOpenTripLongline()); } public String getOpenRouteId() { @@ -166,44 +199,75 @@ public class DataContext extends AbstractSerializableBean { } public String getOpenActivityId() { - return openActivityId; + return openActivitySeineId != null ? openActivitySeineId : openActivityLonglineId; } public String getOpenActivityLonglineId() { - return isOpenActivityLongline() ? getOpenActivityId() : null; + return openActivityLonglineId; } public String getOpenActivitySeineId() { - return isOpenActivitySeine() ? getOpenActivityId() : null; + return openActivitySeineId; } - public void setOpenActivityId(String openActivityId) { + public void setOpenActivitySeineId(String openActivityId) { String oldValue = getOpenActivityId(); - boolean oldValue2 = isOpenActivity(); - this.openActivityId = openActivityId; - firePropertyChange(PROPERTY_OPEN_ACTIVITY_ID, oldValue, this.openActivityId); - firePropertyChange(PROPERTY_OPEN_ACTIVITY, oldValue2, isOpenActivity()); + String oldValue2 = getOpenActivitySeineId(); + boolean oldValue3 = isOpenActivity(); + boolean oldValue4 = isOpenActivitySeine(); + this.openActivitySeineId = openActivityId; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_ID, oldValue, this.openActivitySeineId); + firePropertyChange(PROPERTY_OPEN_ACTIVITY_SEINE_ID, oldValue2, this.openActivitySeineId); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, oldValue3, isOpenActivity()); + firePropertyChange(PROPERTY_OPEN_ACTIVITY_SEINE, oldValue4, isOpenActivitySeine()); + } + + public void setOpenActivityLonglineId(String openActivityId) { + String oldValue = getOpenActivityId(); + String oldValue2 = getOpenActivityLonglineId(); + boolean oldValue3 = isOpenActivity(); + boolean oldValue4 = isOpenActivityLongline(); + this.openActivityLonglineId = openActivityId; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_ID, oldValue, this.openActivityLonglineId); + firePropertyChange(PROPERTY_OPEN_ACTIVITY_LONGLINE_ID, oldValue2, this.openActivityLonglineId); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, oldValue3, isOpenActivity()); + firePropertyChange(PROPERTY_OPEN_ACTIVITY_LONGLINE, oldValue4, isOpenActivityLongline()); } public String getOpenSetId() { - return openSetId; + return openSetSeineId != null ? openSetSeineId : openSetLonglineId; } public String getOpenSetLonglineId() { - return isOpenSetLongline() ? getOpenSetId() : null; + return openSetSeineId; } public String getOpenSetSeineId() { - return isOpenSetSeine() ? getOpenSetId() : null; + return openSetLonglineId; } + public void setOpenSetSeineId(String openSetId) { + String oldValue = getOpenSetId(); + String oldValue2 = getOpenSetSeineId(); + boolean oldValue3 = isOpenSet(); + boolean oldValue4 = isOpenSetSeine(); + this.openSetSeineId = openSetId; + firePropertyChange(PROPERTY_OPEN_SET_ID, oldValue, this.openSetSeineId); + firePropertyChange(PROPERTY_OPEN_SET_SEINE_ID, oldValue2, this.openSetSeineId); + firePropertyChange(PROPERTY_OPEN_SET, oldValue3, isOpenSet()); + firePropertyChange(PROPERTY_OPEN_SET_SEINE, oldValue4, isOpenSetSeine()); + } - public void setOpenSetId(String openSetId) { + public void setOpenSetLonglineId(String openSetId) { String oldValue = getOpenSetId(); - boolean oldValue2 = isOpenSet(); - this.openSetId = openSetId; - firePropertyChange(PROPERTY_OPEN_SET_ID, oldValue, this.openSetId); - firePropertyChange(PROPERTY_OPEN_SET, oldValue2, isOpenSet()); + String oldValue2 = getOpenSetLonglineId(); + boolean oldValue3 = isOpenSet(); + boolean oldValue4 = isOpenSetLongline(); + this.openSetLonglineId = openSetId; + firePropertyChange(PROPERTY_OPEN_SET_ID, oldValue, this.openSetLonglineId); + firePropertyChange(PROPERTY_OPEN_SET_LONGLINE_ID, oldValue2, this.openSetLonglineId); + firePropertyChange(PROPERTY_OPEN_SET, oldValue3, isOpenSet()); + firePropertyChange(PROPERTY_OPEN_SET_LONGLINE, oldValue4, isOpenSetLongline()); } public String getSelectedProgramId() { @@ -459,15 +523,15 @@ public class DataContext extends AbstractSerializableBean { } public boolean isOpenTrip() { - return openTripId != null; + return isOpenTripLongline() || isOpenTripSeine(); } public boolean isOpenTripLongline() { - return isOpenTrip() && IdDtos.isLonglineId(openTripId); + return openTripLonglineId != null; } public boolean isOpenTripSeine() { - return isOpenTrip() && IdDtos.isSeineId(openTripId); + return openTripSeineId != null; } public boolean isOpenRoute() { @@ -475,28 +539,28 @@ public class DataContext extends AbstractSerializableBean { } public boolean isOpenActivity() { - return openActivityId != null; + return isOpenActivityLongline() || isOpenActivitySeine(); } public boolean isOpenActivityLongline() { - return isOpenActivity() && IdDtos.isLonglineId(openActivityId); + return openActivityLonglineId != null; } public boolean isOpenActivitySeine() { - return isOpenActivity() && IdDtos.isSeineId(openActivityId); + return openActivitySeineId != null; } public boolean isOpenSet() { - return openSetId != null; + return isOpenSetLongline() || isOpenSetSeine(); } public boolean isOpenSetLongline() { - return isOpenSet() && IdDtos.isLonglineId(openSetId); + return openSetLonglineId != null; } public boolean isOpenSetSeine() { - return isOpenSet() && IdDtos.isSeineId(openSetId); + return openSetSeineId != null; } public boolean isSelectedOpen(Class<?> type) { @@ -688,11 +752,13 @@ public class DataContext extends AbstractSerializableBean { selectionChanged = false; } - protected void resetOpen() { + public void resetOpen() { setOpenProgramId(null); - setOpenTripId(null); + setOpenTripSeineId(null); + setOpenTripLonglineId(null); setOpenRouteId(null); - setOpenActivityId(null); + setOpenActivitySeineId(null); + setOpenActivityLonglineId(null); } protected void firePropertyChange(String propertyName, Object newValue) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java index 73448a7..9bee852 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java @@ -82,7 +82,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenTripId(id); + dataContext.setOpenTripSeineId(id); } @Override @@ -109,7 +109,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenTripId(id); + dataContext.setOpenTripLonglineId(id); } @Override @@ -163,7 +163,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenActivityId(id); + dataContext.setOpenActivitySeineId(id); } @Override @@ -190,7 +190,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenActivityId(id); + dataContext.setOpenActivityLonglineId(id); } @Override @@ -217,7 +217,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenSetId(id); + dataContext.setOpenSetSeineId(id); } @Override @@ -244,7 +244,7 @@ public enum DataContextType { @Override public void setOpenId(DataContext dataContext, String id) { - dataContext.setOpenSetId(id); + dataContext.setOpenSetLonglineId(id); } @Override 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 2b0eced..5c23f87 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 @@ -78,7 +78,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline protected boolean doOpenData() { boolean result = getOpenDataManager().canOpenTripLongline(); if (result) { - getOpenDataManager().openTripLongline(getSelectedId()); + getOpenDataManager().openTripLongline(getSelectedParentId(), getSelectedId()); } return result; } 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 faa8f50..b60d8d1 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 @@ -77,7 +77,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { protected boolean doOpenData() { boolean result = getOpenDataManager().canOpenTripSeine(); if (result) { - getOpenDataManager().openTripSeine(getSelectedId()); + getOpenDataManager().openTripSeine(getSelectedParentId(), getSelectedId()); } return result; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java index 70a4640..eb0b619 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java @@ -47,12 +47,7 @@ public class ProgramDtos extends AbstractProgramDtos { } public static ReferenceDto<ProgramDto> newReferenceDto(ProgramDto programDto) { - ArrayList<String> propertyNames = Lists.newArrayList(ProgramDto.PROPERTY_CODE, - ProgramDto.PROPERTY_URI, - ProgramDto.PROPERTY_STATUS, - ProgramDto.PROPERTY_NEED_COMMENT, - ProgramDto.PROPERTY_LAST_UPDATE, - ProgramDto.PROPERTY_LABEL1, + ArrayList<String> propertyNames = Lists.newArrayList(ProgramDto.PROPERTY_LABEL1, ProgramDto.PROPERTY_LABEL2, ProgramDto.PROPERTY_LABEL3, ProgramDto.PROPERTY_LABEL4, @@ -60,17 +55,7 @@ public class ProgramDtos extends AbstractProgramDtos { ProgramDto.PROPERTY_LABEL6, ProgramDto.PROPERTY_LABEL7, ProgramDto.PROPERTY_LABEL8, - ProgramDto.PROPERTY_ORGANISM, - ProgramDto.PROPERTY_START_DATE, - ProgramDto.PROPERTY_END_DATE, - ProgramDto.PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION, - ProgramDto.PROPERTY_NON_TARGET_OBSERVATION, - ProgramDto.PROPERTY_BAIT_OBSERVATION, - ProgramDto.PROPERTY_MAMMALS_OBSERVATION, - ProgramDto.PROPERTY_SAMPLES_OBSERVATION, - ProgramDto.PROPERTY_OBJECTS_OBSERVATION, - ProgramDto.PROPERTY_BIRDS_OBSERVATION, - ProgramDto.PROPERTY_TARGET_DISCARDS_OBSERVATION, + ProgramDto.PROPERTY_LABEL, ProgramDto.PROPERTY_GEAR_TYPE); ReferenceDto<ProgramDto> reference = ReferenceDtos.newReferenceDto(programDto, propertyNames); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.