This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_menu_navigation in repository observe. See http://git.codelutin.com/observe.git commit 46cdb8979f2da0b06b1c8d98f4003f4d4222dcf0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 12:38:55 2015 +0100 réajout des menus de navigation vers les marées, activités et sets --- .../java/fr/ird/observe/business/db/DataContext.java | 10 ++++------ .../src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 17 ++++++++++------- .../main/java/fr/ird/observe/services/dto/IdDtos.java | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 13 deletions(-) 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 0541525..dc81a55 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 @@ -24,8 +24,6 @@ package fr.ird.observe.business.db; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -486,7 +484,7 @@ public class DataContext extends AbstractSerializableBean { if (IdDtos.isTripSeineId(tripId)) { // on a seine trip - if (!TripSeineDto.class.equals(type) && isOpenRoute()) { + if (!IdDtos.isTripClass(type) && isOpenRoute()) { ids.add(getOpenRouteId()); @@ -494,7 +492,7 @@ public class DataContext extends AbstractSerializableBean { ids.add(getOpenActivitySeineId()); - if (!ActivitySeineDto.class.equals(type) && isOpenSetSeine()) { + if (!IdDtos.isActivityClass(type) && isOpenSetSeine()) { ids.add(getOpenSetSeineId()); } } @@ -503,11 +501,11 @@ public class DataContext extends AbstractSerializableBean { } else { // on a longline trip - if (!TripLonglineDto.class.equals(type) && isOpenActivityLongline()) { + if (!IdDtos.isTripClass(type) && isOpenActivityLongline()) { ids.add(getOpenActivityLonglineId()); - if (!ActivityLonglineDto.class.equals(type) && isOpenSetLongline()) { + if (!IdDtos.isActivityClass(type) && isOpenSetLongline()) { ids.add(getOpenSetLonglineId()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 100fe39..d7b7870 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -27,8 +27,11 @@ fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.business.db.DataContext - fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.services.dto.referential.ProgramDto + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.constants.ReferentialLocale fr.ird.observe.ui.actions.shared.ReOpenUIAction @@ -175,14 +178,14 @@ void $afterCompleteSetup() { <JMenu id='menuNavigation'> <JMenuItem id='menuNavigationProgram' onActionPerformed="getTreeHelper().selectOpenNode(this, ProgramDto.class)"/> - <!--<JMenuItem id='menuNavigationTrip'--> - <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Trip.class)"/>--> + <JMenuItem id='menuNavigationTrip' + onActionPerformed="getTreeHelper().selectOpenNode(this, TripSeineDto.class)"/> <JMenuItem id='menuNavigationRoute' onActionPerformed="getTreeHelper().selectOpenNode(this, RouteDto.class)"/> - <!--<JMenuItem id='menuNavigationActivity'--> - <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Activity.class)"/>--> - <!--<JMenuItem id='menuNavigationSet'--> - <!--onActionPerformed="getTreeHelper().selectOpenNode(this, Set.class)"/>--> + <JMenuItem id='menuNavigationActivity' + onActionPerformed="getTreeHelper().selectOpenNode(this, ActivitySeineDto.class)"/> + <JMenuItem id='menuNavigationSet' + onActionPerformed="getTreeHelper().selectOpenNode(this, SetSeineDto.class)"/> <JSeparator/> <JMenuItem id='menuNavigationReferentiel' onActionPerformed='getTreeHelper().selectNode("observe.common.referentiel")'/> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java index 0e13d53..c53d3e4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java @@ -25,6 +25,12 @@ package fr.ird.observe.services.dto; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import java.util.Collection; import java.util.Map; @@ -71,6 +77,10 @@ public class IdDtos extends AbstractIdDtos { return isTripSeine(dto) || isTripLongline(dto); } + public static boolean isTripClass(Class<?> dtoClass) { + return TripSeineDto.class.equals(dtoClass) || TripLonglineDto.class.equals(dtoClass); + } + public static boolean isTripLongline(IdDto dto) { return isTripLonglineId(dto.getId()); } @@ -111,6 +121,10 @@ public class IdDtos extends AbstractIdDtos { return id.contains("ActivityLongline"); } + public static boolean isActivityClass(Class<?> dtoClass) { + return ActivitySeineDto.class.equals(dtoClass) || ActivityLonglineDto.class.equals(dtoClass); + } + public static boolean isSetSeine(IdDto dto) { return isSetSeineId(dto.getId()); } @@ -127,6 +141,10 @@ public class IdDtos extends AbstractIdDtos { return id.contains("SetLongline"); } + public static boolean isSetClass(Class<?> dtoClass) { + return SetSeineDto.class.equals(dtoClass) || SetLonglineDto.class.equals(dtoClass); + } + public static boolean isFloatingObject(IdDto dto) { return isFloatingObjectId(dto.getId()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.