This is an automated email from the git hooks/post-receive script. New commit to branch feature/list_screen_buttons in repository observe. See http://git.codelutin.com/observe.git commit fa79254ad5364da9e4dd4dc6258af4551034dd60 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 5 16:17:37 2015 +0100 accès aux routes et activités ouvertes depuis les niveaux supérieurs --- .../fr/ird/observe/ObserveOpenDataManager.java | 54 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 5 +- 2 files changed, 57 insertions(+), 2 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 c96d9d0..46055b9 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,8 +1,14 @@ package fr.ird.observe; import com.google.common.base.Preconditions; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import java.io.Closeable; +import java.util.ArrayList; +import java.util.List; /** * Pour gérer les données ouvertes sur une source de données dans l'application. @@ -120,6 +126,10 @@ public class ObserveOpenDataManager implements Closeable { openActivitySeineId = activitySeineId; } + public boolean isOpenActivitySeine() { + return openActivitySeineId != null; + } + public boolean isOpenActivitySeine(String activitySeineId) { Preconditions.checkNotNull(activitySeineId, "id cant be null"); return activitySeineId.equals(openActivitySeineId); @@ -142,6 +152,10 @@ public class ObserveOpenDataManager implements Closeable { openTripLonglineId = tripLongLineId; } + public boolean isOpenTripLongline() { + return openTripLonglineId != null; + } + public boolean isOpenTripLongline(String tripLongLineId) { Preconditions.checkNotNull(tripLongLineId, "id cant be null"); return tripLongLineId.equals(openTripLonglineId); @@ -166,6 +180,10 @@ public class ObserveOpenDataManager implements Closeable { openActivityLonglineId = activityLonglineId; } + public boolean isOpenActivityLongline() { + return openActivityLonglineId != null; + } + public boolean isOpenActivityLongline(String activityLonglineId) { Preconditions.checkNotNull(activityLonglineId, "id cant be null"); return activityLonglineId.equals(openActivityLonglineId); @@ -207,4 +225,40 @@ public class ObserveOpenDataManager implements Closeable { openActivityLonglineId = null; } + public String[] getOpenIds() { + return getOpenIds(null); + } + + public String[] getOpenIds(Class<?> type) { + + List<String> ids = new ArrayList<String>(); + + if (isOpenProgram()) { + ids.add(openProgramId); + + if (!ProgramDto.class.equals(type)) { + + if (isOpenTripSeine()) { + ids.add(openTripSeineId); + + if (!TripSeineDto.class.equals(type) && isOpenRoute()) { + ids.add(openRouteId); + + if (!RouteDto.class.equals(type) && isOpenActivitySeine()) { + ids.add(openActivitySeineId); + } + } + + } else if (isOpenTripLongline()) { + ids.add(openTripLonglineId); + + if (!TripLonglineDto.class.equals(type) && isOpenActivityLongline()) { + ids.add(openActivityLonglineId); + } + } + } + } + + return ids.toArray(new String[ids.size()]); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index a359417..e178bed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; @@ -279,9 +280,9 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public void selectOpenNode(JAXXContext ui, Class<?> type) { - DataContext context = ui.getContextValue(DataContext.class); + ObserveOpenDataManager openDataManager = ui.getContextValue(ObserveOpenDataManager.class); - String[] ids = context.getOpenIds(type); + String[] ids = openDataManager.getOpenIds(type); if (log.isDebugEnabled()) { log.debug("using open ids = " + Arrays.toString(ids)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.