branch feature/fix_menu_navigation created (now 758868c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/fix_menu_navigation in repository observe. See http://git.codelutin.com/observe.git at 758868c suppression code mort + fixmes This branch includes the following new commits: new 46cdb89 réajout des menus de navigation vers les marées, activités et sets new 758868c suppression code mort + fixmes The 2 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 758868ca5e6e40d85300986ce695e8d65d2b332a Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 12:39:21 2015 +0100 suppression code mort + fixmes 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 -- 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_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>.
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 758868ca5e6e40d85300986ce695e8d65d2b332a Author: Kevin Morin <morin@codelutin.com> Date: Thu Nov 12 12:39:21 2015 +0100 suppression code mort + fixmes --- .../fr/ird/observe/ObserveSwingBinderService.java | 22 ---------------------- .../ObserveSwingApplicationConfigOption.java | 1 - .../ird/observe/ui/tree/ActivityLonglineNode.java | 6 ------ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 1 - .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 6 ------ .../loadors/ActivityLonglineNodeChildLoador.java | 1 - .../loadors/ProgramLonglineNodeChildLoador.java | 4 ++-- .../ui/tree/loadors/RoutesNodeChildLoador.java | 6 ------ 8 files changed, 2 insertions(+), 45 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java index 2ff97fa..ceb6b58 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java @@ -38,28 +38,6 @@ public class ObserveSwingBinderService { return builder; } - //FIXME -// public <E extends TopiaEntity> TopiaEntityBinder<E> getTopiaBinder(Class<E> entityClass, -// String contextName) { -// if (ObserveBinderHelper.getCachedBinderModel(entityClass, entityClass, contextName) == null) { -// -// // we do not want to have auto created binder model by the factory -// return null; -// } -// return (TopiaEntityBinder<E>) ObserveBinderHelper.newBinder(entityClass, entityClass, contextName, TopiaEntityBinder.class); -// } - - //FIXME -// public <E extends TopiaEntity> TopiaEntityBinder<E> registerTopiaBinder(Class<E> entityClass, -// BinderModelBuilder<E, E> builder, -// String contextName) { -// return ObserveBinderHelper.registerTopiaBinder(entityClass, builder, contextName); -// } -// -// public <E extends TopiaEntity> TopiaEntityBinder<E> getSimpleTopiaBinder(Class<E> entityClass) { -// return getTopiaBinder(entityClass, "Observe"); -// } - public <E extends AbstractObserveDto> void simpleCopy(E source, E target, boolean tech) { //FIXME // Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(ObserveDAOHelper.getContracts(), target.getClass()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java index c8def54..26e5ed0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java @@ -608,7 +608,6 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { false ), - //FIXME /** le type de liste d'espèces pour les captures cibles (seine) */ SPECIES_LIST_SEINE_TARGET_CATCH_ID( "speciesList.seine.targetCatch", diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index fb566c5..2b1bfd3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -49,10 +49,4 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { return referenceDto; } - //FIXME -// @Override -// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { -// return dataService.getActivityLonglineStub(source, id); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index e5de607..b122b50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -143,7 +143,6 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { log.info("will load entity " + internalClass.getSimpleName() + " : " + id); } - //FIXME entity = fetchEntity(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 414e18d..6bef031 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -49,10 +49,4 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { return referenceDto; } - //FIXME -// @Override -// protected SetSeine getEntity(DataService dataService, DataSource source) { -// return (SetSeine) dataService.loadEntity(source, id, true); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 039af11..be4ff46 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -45,7 +45,6 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -//FIXME public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 8b732dd..d29e594 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -123,8 +123,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add activities - //FIXME - ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); + ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, + ActivityLonglinesNodeChildLoador.class); result.add(child); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index ef1f626..414459c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -60,16 +60,10 @@ public class RoutesNodeChildLoador extends AbstractReferenceDtoChildLoador<Route String parentId, NavDataProvider dataProvider) throws Exception { -// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); -// return data; - RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); ReferenceSetDto<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(routeByTripSeine.getReference())); - } -- 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