[Observe-commits] 09/09: rebase sur develop

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 3a03a156bb0dd3278cc7350b4efac709514c1d49 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:14:31 2015 +0200 rebase sur develop --- .../observe/ObserveSwingApplicationContext.java | 3 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 23 ++------------ .../content/list/impl/seine/RoutesUIHandler.java | 3 +- .../list/impl/seine/TripSeinesUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 14 ++++++--- .../v1/seine/ActivitySeineServiceController.java | 9 ------ .../service/seine/ActivitySeineService.java | 4 --- .../service/seine/ActivitySeineServiceTopia.java | 36 ---------------------- .../service/seine/TripSeineServiceTopia.java | 1 - 10 files changed, 18 insertions(+), 81 deletions(-) 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 16f99e3..1c3169a 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 @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -730,7 +731,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { String programName = (String) programDtoRef.getPropertyValue("label"); log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { - ReferenceSetDto<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); + ReferenceSetDto<TripSeineDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); for (ReferenceDto tripSeine : tripSeines.getReference()) { log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 3ee3ed5..cb32499 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -25,11 +25,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -116,29 +114,14 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<ReferenceDto> getChilds(RouteDto bean) { -<<<<<<< HEAD ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); - ReferenceSetDto<ActivitySeineStubDto> activitySeineStubByRoute = service.getActivitySeineStubByRoute(bean.getId()); + ReferenceSetDto<ActivitySeineDto> activitySeineByRoute = service.getActivitySeineByRoute(bean.getId()); if (log.isDebugEnabled()) { - log.debug("Will use " + activitySeineStubByRoute.sizeReference() + " activities."); + log.debug("Will use " + activitySeineByRoute.sizeReference() + " activities."); } - return new ArrayList<>(activitySeineStubByRoute.getReference()); -======= - ObserveSwingDataSource source = getDataSource(); - //FIXME -// DataService dataService = getDataService(); -// -// List<ActivitySeine> list = dataService.getActivitySeineByRoute(source, bean.getTopiaId()); -// -// if (log.isDebugEnabled()) { -// log.debug("Will use " + list.size() + " activities."); -// } -// -// return list; - return null; ->>>>>>> chargement des noeuds des routes (refs #7553) + return new ArrayList<>(activitySeineByRoute.getReference()); } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index 48a4067..07833df 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -28,7 +28,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.RouteService; @@ -113,7 +112,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto protected List<ReferenceDto> getChilds(TripSeineDto bean) { RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - ReferenceSetDto<RouteStubDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); + ReferenceSetDto<RouteDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + routeByTripSeine.sizeReference() + " routes."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index f81d211..ec61f50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -30,7 +30,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; @@ -98,7 +97,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe protected List<ReferenceDto> getChilds(ProgramDto bean) { TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + tripSeineByProgram.sizeReference() + " trips."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index aab10b4..eeae2be 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -635,7 +635,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // add the program in tree ObserveTreeHelper treeHelper = getTreeHelper(getUi()); - treeHelper.addProgram((ProgramDto) bean); + //FIXME +// treeHelper.addProgram((ProgramDto) bean); } return true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index a83ae3d..01e5cbc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -29,10 +29,6 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; -import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; -import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.ConnexionStatus; @@ -49,7 +45,10 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceDumpProducerService; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; @@ -710,6 +709,7 @@ public class StorageUIHandler { ObserveSwingApplicationContext.get().getDecoratorService(); return decoratorService; } + protected void computeBackupReport(SelectDataUI stepUI, StorageUIModel model, StringBuilder sb) { @@ -950,7 +950,6 @@ public class StorageUIHandler { } protected void checkImportDbVersion(StorageUIModel model, ObserveSwingDataSource dataSource) { - //FIXME try { dataSource.open(); @@ -959,10 +958,15 @@ public class StorageUIHandler { if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } + } catch (DatabaseConnexionNotAuthorizedException e) { if (log.isErrorEnabled()) { log.error("", e); } + } catch (BabModelVersionException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } } catch (DatabaseNotFoundException e) { if (log.isErrorEnabled()) { log.error("", e); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index 37cf567..368aa10 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -24,10 +24,6 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; -<<<<<<< HEAD -======= -import fr.ird.observe.services.dto.ReferenceDto; ->>>>>>> chargement des noeuds des routes (refs #7553) import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -42,13 +38,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override -<<<<<<< HEAD - public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - return service.getActivitySeineStubByRoute(routeId); -======= public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { return service.getActivitySeineByRoute(routeId); ->>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 3c60a73..05b91b2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -38,11 +38,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivitySeineService extends ObserveService { @ReadDataPermission -<<<<<<< HEAD - ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); -======= ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId); ->>>>>>> chargement des noeuds des routes (refs #7553) @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 50d3598..54135b3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -52,30 +51,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override -<<<<<<< HEAD - public ReferenceSetDto<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - - Route route = loadEntity(RouteDto.class, Route.class, routeId); - - ReferenceLocale referenceLocale = getReferenceLocale(); - - LinkedHashSet<ReferenceDto<ActivitySeineStubDto>> stubs = Sets.newLinkedHashSet(); - - for (ActivitySeine activitySeine : route.getActivitySeine()) { - - ReferenceDto<ActivitySeineStubDto> stub = - ReferenceDtos.newReferenceDto(ActivitySeineStubDto.class, - Lists.newArrayList(ActivitySeineStubDto.PROPERTY_TIME, - ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, - ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE)); - - stub.setId(activitySeine.getTopiaId()); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_TIME, activitySeine.getTime()); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, - referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE, - activitySeine.getSetSeine() != null); -======= public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -98,21 +73,10 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); stubs.add(stub); ->>>>>>> chargement des noeuds des routes (refs #7553) - - stubs.add(stub); } -<<<<<<< HEAD - Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); - ReferenceSetDto<ActivitySeineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(ActivitySeineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; -======= ReferenceSetDto<ActivitySeineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivitySeineDto.class, stubs, null); return result; ->>>>>>> chargement des noeuds des routes (refs #7553) } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index c1ca623..127d562 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.