February 2021 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Remove OpenableDataService.loadReferenceToRead
by Tony CHEMIT 18 Feb '21

18 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80aa87df by Tony Chemit at 2021-02-18T19:51:05+01:00 Remove OpenableDataService.loadReferenceToRead Remove EditableDataService.loadReferenceToRead - - - - - 3507d254 by Tony Chemit at 2021-02-18T21:18:49+01:00 Use new toolkit APIs - - - - - 23 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java - pom.xml - server/core/src/main/filtered-resources/mapping - services/api-test/src/main/java/fr/ird/observe/services/service/data/EditableDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/ActivityServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java - services/api/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityPairingEngine.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/ActivityPairingServiceLocalSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java ===================================== @@ -25,13 +25,11 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUII18nHelper; import fr.ird.observe.dto.IdDto; -import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.spi.map.ImmutableTypedMap; import fr.ird.observe.spi.module.BusinessProjectMapping; import fr.ird.observe.spi.module.ObserveBusinessProject; @@ -194,11 +192,11 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U ButtonGroup buttonGroup = new ButtonGroup(); ImmutableTypedMap<Long> usages = usagesGetter.getCount(); - @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<? extends DtoReference>> types = (Collection) usages.types(); - for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDto.filterReferentialReference(types)) { + @SuppressWarnings({"unchecked", "rawtypes"}) Collection<Class<?>> types = (Collection) usages.types(); + for (Class<? extends ReferentialDtoReference> dtoType : ReferentialDtoReference.filterReferentialReference(types)) { buildUsagePanel(buttonGroup, dtoType, usagesGetter); } - for (Class<? extends DataDtoReference> dtoType : DataDto.filterDataReference(types)) { + for (Class<? extends DataDtoReference> dtoType : DataDtoReference.filterDataReference(types)) { buildUsagePanel(buttonGroup, dtoType, usagesGetter); } JToggleButton component = (JToggleButton) getUsages().getUsagesCount().getComponent(0); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java ===================================== @@ -67,7 +67,7 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates { } updateActivityObsCandidates(); }); - pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getLlCommonTripService(), getReferenceCache().getDataSource().getLlLogbookActivityService()); + pairingEngine = new ActivityPairingEngine(model.getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getReferenceService(), getReferenceCache().getDataSource().getLlLogbookActivityService()); } @Override ===================================== pom.xml ===================================== @@ -149,7 +149,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.4</toolkit.version> + <toolkit.version>5.0.5-SNAPSHOT</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl>  ===================================== server/core/src/main/filtered-resources/mapping ===================================== @@ -110,7 +110,6 @@ GET /api/v1/data/ll/common/TripService/getSpeciesByListAndTrip GET /api/v1/data/ll/common/TripService/getTripMap v1.data.ll.common.TripServiceRestApi.getTripMap GET /api/v1/data/ll/common/TripService/loadDto v1.data.ll.common.TripServiceRestApi.loadDto GET /api/v1/data/ll/common/TripService/loadForm v1.data.ll.common.TripServiceRestApi.loadForm -GET /api/v1/data/ll/common/TripService/loadReferenceToRead v1.data.ll.common.TripServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/common/TripService/move v1.data.ll.common.TripServiceRestApi.move GET /api/v1/data/ll/common/TripService/preCreate v1.data.ll.common.TripServiceRestApi.preCreate POST /api/v1/data/ll/common/TripService/save v1.data.ll.common.TripServiceRestApi.save @@ -121,7 +120,6 @@ GET /api/v1/data/ll/landing/LandingService/getChildren GET /api/v1/data/ll/landing/LandingService/getChildrenUpdate v1.data.ll.landing.LandingServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/landing/LandingService/loadDto v1.data.ll.landing.LandingServiceRestApi.loadDto GET /api/v1/data/ll/landing/LandingService/loadForm v1.data.ll.landing.LandingServiceRestApi.loadForm -GET /api/v1/data/ll/landing/LandingService/loadReferenceToRead v1.data.ll.landing.LandingServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/landing/LandingService/move v1.data.ll.landing.LandingServiceRestApi.move GET /api/v1/data/ll/landing/LandingService/preCreate v1.data.ll.landing.LandingServiceRestApi.preCreate POST /api/v1/data/ll/landing/LandingService/save v1.data.ll.landing.LandingServiceRestApi.save @@ -130,7 +128,6 @@ GET /api/v1/data/ll/logbook/ActivitySampleService/exists GET /api/v1/data/ll/logbook/ActivitySampleService/getParents v1.data.ll.logbook.ActivitySampleServiceRestApi.getParents GET /api/v1/data/ll/logbook/ActivitySampleService/loadDto v1.data.ll.logbook.ActivitySampleServiceRestApi.loadDto GET /api/v1/data/ll/logbook/ActivitySampleService/loadForm v1.data.ll.logbook.ActivitySampleServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/ActivitySampleService/loadReferenceToRead v1.data.ll.logbook.ActivitySampleServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/ActivitySampleService/move v1.data.ll.logbook.ActivitySampleServiceRestApi.move GET /api/v1/data/ll/logbook/ActivitySampleService/preCreate v1.data.ll.logbook.ActivitySampleServiceRestApi.preCreate POST /api/v1/data/ll/logbook/ActivitySampleService/save v1.data.ll.logbook.ActivitySampleServiceRestApi.save @@ -141,7 +138,6 @@ GET /api/v1/data/ll/logbook/ActivityService/getChildren GET /api/v1/data/ll/logbook/ActivityService/getChildrenUpdate v1.data.ll.logbook.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/logbook/ActivityService/loadDto v1.data.ll.logbook.ActivityServiceRestApi.loadDto GET /api/v1/data/ll/logbook/ActivityService/loadForm v1.data.ll.logbook.ActivityServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/ActivityService/loadReferenceToRead v1.data.ll.logbook.ActivityServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/ActivityService/move v1.data.ll.logbook.ActivityServiceRestApi.move GET /api/v1/data/ll/logbook/ActivityService/preCreate v1.data.ll.logbook.ActivityServiceRestApi.preCreate POST /api/v1/data/ll/logbook/ActivityService/save v1.data.ll.logbook.ActivityServiceRestApi.save @@ -152,7 +148,6 @@ GET /api/v1/data/ll/logbook/SampleService/getChildren GET /api/v1/data/ll/logbook/SampleService/getChildrenUpdate v1.data.ll.logbook.SampleServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/logbook/SampleService/loadDto v1.data.ll.logbook.SampleServiceRestApi.loadDto GET /api/v1/data/ll/logbook/SampleService/loadForm v1.data.ll.logbook.SampleServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/SampleService/loadReferenceToRead v1.data.ll.logbook.SampleServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/logbook/SampleService/move v1.data.ll.logbook.SampleServiceRestApi.move GET /api/v1/data/ll/logbook/SampleService/preCreate v1.data.ll.logbook.SampleServiceRestApi.preCreate POST /api/v1/data/ll/logbook/SampleService/save v1.data.ll.logbook.SampleServiceRestApi.save @@ -164,7 +159,6 @@ DELETE /api/v1/data/ll/logbook/SetService/delete GET /api/v1/data/ll/logbook/SetService/exists v1.data.ll.logbook.SetServiceRestApi.exists GET /api/v1/data/ll/logbook/SetService/loadDto v1.data.ll.logbook.SetServiceRestApi.loadDto GET /api/v1/data/ll/logbook/SetService/loadForm v1.data.ll.logbook.SetServiceRestApi.loadForm -GET /api/v1/data/ll/logbook/SetService/loadReferenceToRead v1.data.ll.logbook.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ll/logbook/SetService/preCreate v1.data.ll.logbook.SetServiceRestApi.preCreate POST /api/v1/data/ll/logbook/SetService/save v1.data.ll.logbook.SetServiceRestApi.save POST /api/v1/data/ll/logbook/SetService/saveAndCopyProperties v1.data.ll.logbook.SetServiceRestApi.saveAndCopyProperties @@ -179,7 +173,6 @@ GET /api/v1/data/ll/observation/ActivityService/getChildren GET /api/v1/data/ll/observation/ActivityService/getChildrenUpdate v1.data.ll.observation.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ll/observation/ActivityService/loadDto v1.data.ll.observation.ActivityServiceRestApi.loadDto GET /api/v1/data/ll/observation/ActivityService/loadForm v1.data.ll.observation.ActivityServiceRestApi.loadForm -GET /api/v1/data/ll/observation/ActivityService/loadReferenceToRead v1.data.ll.observation.ActivityServiceRestApi.loadReferenceToRead POST /api/v1/data/ll/observation/ActivityService/move v1.data.ll.observation.ActivityServiceRestApi.move GET /api/v1/data/ll/observation/ActivityService/preCreate v1.data.ll.observation.ActivityServiceRestApi.preCreate POST /api/v1/data/ll/observation/ActivityService/save v1.data.ll.observation.ActivityServiceRestApi.save @@ -195,7 +188,6 @@ DELETE /api/v1/data/ll/observation/SetService/delete GET /api/v1/data/ll/observation/SetService/exists v1.data.ll.observation.SetServiceRestApi.exists GET /api/v1/data/ll/observation/SetService/loadDto v1.data.ll.observation.SetServiceRestApi.loadDto GET /api/v1/data/ll/observation/SetService/loadForm v1.data.ll.observation.SetServiceRestApi.loadForm -GET /api/v1/data/ll/observation/SetService/loadReferenceToRead v1.data.ll.observation.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ll/observation/SetService/preCreate v1.data.ll.observation.SetServiceRestApi.preCreate POST /api/v1/data/ll/observation/SetService/save v1.data.ll.observation.SetServiceRestApi.save GET /api/v1/data/ll/observation/SetTdrService/loadForm v1.data.ll.observation.SetTdrServiceRestApi.loadForm @@ -217,7 +209,6 @@ GET /api/v1/data/ps/common/TripService/getSpeciesByListAndTrip GET /api/v1/data/ps/common/TripService/getTripMap v1.data.ps.common.TripServiceRestApi.getTripMap GET /api/v1/data/ps/common/TripService/loadDto v1.data.ps.common.TripServiceRestApi.loadDto GET /api/v1/data/ps/common/TripService/loadForm v1.data.ps.common.TripServiceRestApi.loadForm -GET /api/v1/data/ps/common/TripService/loadReferenceToRead v1.data.ps.common.TripServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/common/TripService/move v1.data.ps.common.TripServiceRestApi.move GET /api/v1/data/ps/common/TripService/preCreate v1.data.ps.common.TripServiceRestApi.preCreate POST /api/v1/data/ps/common/TripService/save v1.data.ps.common.TripServiceRestApi.save @@ -228,7 +219,6 @@ GET /api/v1/data/ps/observation/ActivityService/getChildren GET /api/v1/data/ps/observation/ActivityService/getChildrenUpdate v1.data.ps.observation.ActivityServiceRestApi.getChildrenUpdate GET /api/v1/data/ps/observation/ActivityService/loadDto v1.data.ps.observation.ActivityServiceRestApi.loadDto GET /api/v1/data/ps/observation/ActivityService/loadForm v1.data.ps.observation.ActivityServiceRestApi.loadForm -GET /api/v1/data/ps/observation/ActivityService/loadReferenceToRead v1.data.ps.observation.ActivityServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/observation/ActivityService/move v1.data.ps.observation.ActivityServiceRestApi.move GET /api/v1/data/ps/observation/ActivityService/preCreate v1.data.ps.observation.ActivityServiceRestApi.preCreate POST /api/v1/data/ps/observation/ActivityService/save v1.data.ps.observation.ActivityServiceRestApi.save @@ -244,7 +234,6 @@ GET /api/v1/data/ps/observation/FloatingObjectService/getChildren GET /api/v1/data/ps/observation/FloatingObjectService/getObjectMaterialHierarchy v1.data.ps.observation.FloatingObjectServiceRestApi.getObjectMaterialHierarchy GET /api/v1/data/ps/observation/FloatingObjectService/loadDto v1.data.ps.observation.FloatingObjectServiceRestApi.loadDto GET /api/v1/data/ps/observation/FloatingObjectService/loadForm v1.data.ps.observation.FloatingObjectServiceRestApi.loadForm -GET /api/v1/data/ps/observation/FloatingObjectService/loadReferenceToRead v1.data.ps.observation.FloatingObjectServiceRestApi.loadReferenceToRead GET /api/v1/data/ps/observation/FloatingObjectService/preCreate v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate GET /api/v1/data/ps/observation/FloatingObjectService/preCreate2 v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate2 POST /api/v1/data/ps/observation/FloatingObjectService/save v1.data.ps.observation.FloatingObjectServiceRestApi.save @@ -260,7 +249,6 @@ GET /api/v1/data/ps/observation/RouteService/getChildrenUpdate GET /api/v1/data/ps/observation/RouteService/isActivityEndOfSearchFound v1.data.ps.observation.RouteServiceRestApi.isActivityEndOfSearchFound GET /api/v1/data/ps/observation/RouteService/loadDto v1.data.ps.observation.RouteServiceRestApi.loadDto GET /api/v1/data/ps/observation/RouteService/loadForm v1.data.ps.observation.RouteServiceRestApi.loadForm -GET /api/v1/data/ps/observation/RouteService/loadReferenceToRead v1.data.ps.observation.RouteServiceRestApi.loadReferenceToRead POST /api/v1/data/ps/observation/RouteService/move v1.data.ps.observation.RouteServiceRestApi.move GET /api/v1/data/ps/observation/RouteService/preCreate v1.data.ps.observation.RouteServiceRestApi.preCreate POST /api/v1/data/ps/observation/RouteService/save v1.data.ps.observation.RouteServiceRestApi.save @@ -278,7 +266,6 @@ DELETE /api/v1/data/ps/observation/SetService/delete GET /api/v1/data/ps/observation/SetService/exists v1.data.ps.observation.SetServiceRestApi.exists GET /api/v1/data/ps/observation/SetService/loadDto v1.data.ps.observation.SetServiceRestApi.loadDto GET /api/v1/data/ps/observation/SetService/loadForm v1.data.ps.observation.SetServiceRestApi.loadForm -GET /api/v1/data/ps/observation/SetService/loadReferenceToRead v1.data.ps.observation.SetServiceRestApi.loadReferenceToRead GET /api/v1/data/ps/observation/SetService/preCreate v1.data.ps.observation.SetServiceRestApi.preCreate POST /api/v1/data/ps/observation/SetService/save v1.data.ps.observation.SetServiceRestApi.save POST /api/v1/referential/ReferentialService/changeId v1.referential.ReferentialServiceRestApi.changeId ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/EditableDataServiceFixtures.java ===================================== @@ -112,14 +112,6 @@ public class EditableDataServiceFixtures { return dto; } - public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) { - String id = fixtures.getProperty("loadReferenceToRead.id"); - R reference = service.loadReferenceToRead(id); - Assert.assertNotNull(reference); - Assert.assertEquals(id, reference.getId()); - return reference; - } - public static <D extends EditableDto, R extends DataDtoReference, S extends EditableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) { String id = fixtures.getProperty("exists.id"); Assert.assertTrue(service.exists(id)); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java ===================================== @@ -138,14 +138,6 @@ public class OpenableDataServiceFixtures { return dto; } - public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> R loadReferenceToRead(ObserveServiceFixtures<S> fixtures, S service) { - String id = fixtures.getProperty("loadReferenceToRead.id"); - R reference = service.loadReferenceToRead(id); - Assert.assertNotNull(reference); - Assert.assertEquals(id, reference.getId()); - return reference; - } - public static <D extends OpenableDto, R extends DataDtoReference, S extends OpenableDataService<D, R>> void exists(ObserveServiceFixtures<S> fixtures, S service) { String id = fixtures.getProperty("exists.id"); Assert.assertTrue(service.exists(id)); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.TripMapDto; import fr.ird.observe.dto.data.ll.common.TripReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.services.service.data.OpenableDataServiceFixtures; @@ -72,11 +73,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(TripService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(TripService service) { OpenableDataServiceFixtures.move(this, service); @@ -109,7 +105,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { @Override public void getMatchingTripsVesselWithinDateRange(TripService service) { - TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service); + TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR); String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId"); String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId"); ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate()); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class LandingServiceFixtures extends GeneratedLandingServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(LandingService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(LandingService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java ===================================== @@ -51,11 +51,6 @@ public class ActivitySampleServiceFixtures extends GeneratedActivitySampleServic EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivitySampleService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(ActivitySampleService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class SampleServiceFixtures extends GeneratedSampleServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SampleService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(SampleService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java ===================================== @@ -51,11 +51,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SetService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(SetService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetServiceFixtures.java ===================================== @@ -47,11 +47,6 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { EditableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(SetService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void preCreate(SetService service) { EditableDataServiceFixtures.preCreate(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java ===================================== @@ -31,6 +31,7 @@ import fr.ird.observe.dto.data.ps.common.TripReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.services.service.ObserveServiceFixtures; @@ -75,11 +76,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(TripService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(TripService service) { OpenableDataServiceFixtures.move(this, service); @@ -129,7 +125,7 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { @Override public void getMatchingTripsVesselWithinDateRange(TripService service) { - TripReference reference = OpenableDataServiceFixtures.loadReferenceToRead(this, service); + TripReference reference = OpenableDataServiceFixtures.loadDto(this, service).toReference(ReferentialLocale.FR); String tripId = getProperty("getMatchingTripsVesselWithinDateRange.tripId"); String vesselId = getProperty("getMatchingTripsVesselWithinDateRange.vesselId"); ImmutableSet<TripReference> actual = service.getMatchingTripsVesselWithinDateRange(tripId, vesselId, reference.getStartDate(), reference.getEndDate()); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/ActivityServiceFixtures.java ===================================== @@ -62,11 +62,6 @@ public class ActivityServiceFixtures extends GeneratedActivityServiceFixtures { OpenableDataServiceFixtures.loadForm(this, service); } - @Override - public void loadReferenceToRead(ActivityService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(ActivityService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java ===================================== @@ -97,9 +97,4 @@ public class FloatingObjectServiceFixtures extends GeneratedFloatingObjectServic public void loadForm(FloatingObjectService service) { EditableDataServiceFixtures.loadForm(this, service); } - - @Override - public void loadReferenceToRead(FloatingObjectService service) { - EditableDataServiceFixtures.loadReferenceToRead(this, service); - } -} +} \ No newline at end of file ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java ===================================== @@ -72,11 +72,6 @@ public class RouteServiceFixtures extends GeneratedRouteServiceFixtures { Assert.assertEquals(14, dto.getActivitySize()); } - @Override - public void loadReferenceToRead(RouteService service) { - OpenableDataServiceFixtures.loadReferenceToRead(this, service); - } - @Override public void move(RouteService service) { OpenableDataServiceFixtures.move(this, service); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.services.service.data.ps.observation; import fr.ird.observe.dto.data.ps.observation.SetDto; -import fr.ird.observe.dto.data.ps.observation.SetReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.service.data.EditableDataServiceFixtures; import org.junit.Assert; @@ -73,15 +72,4 @@ public class SetServiceFixtures extends GeneratedSetServiceFixtures { //FIXME:Test }); } - - @Override - public void loadReferenceToRead(SetService service) { - SetReference reference = EditableDataServiceFixtures.loadReferenceToRead(this, service); - Assert.assertNotNull(reference); - Assert.assertTrue(reference.isKeptTargetSampleEnabled()); - Assert.assertTrue(reference.isDiscardedTargetSampleEnabled()); - Assert.assertTrue(reference.isNonTargetSampleEnabled()); - Assert.assertTrue(reference.isSetNonTargetCatchReleaseEnabled()); - } - } ===================================== services/api/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityPairingEngine.java ===================================== @@ -32,7 +32,7 @@ import fr.ird.observe.dto.data.ll.pairing.ActivityPairingResultItem; import fr.ird.observe.dto.data.ll.pairing.TripPairingContext; import fr.ird.observe.dto.data.ll.pairing.TripPairingResult; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.services.service.data.ll.common.TripService; +import fr.ird.observe.services.service.ReferenceService; import fr.ird.observe.services.service.data.ll.logbook.ActivityService; import java.util.ArrayList; @@ -48,12 +48,12 @@ import java.util.Set; public class ActivityPairingEngine { private final ReferentialLocale referentialLocale; - private final TripService tripService; + private final ReferenceService referenceService; private final ActivityService activitService; - public ActivityPairingEngine(ReferentialLocale referentialLocale, TripService tripService, ActivityService activitService) { + public ActivityPairingEngine(ReferentialLocale referentialLocale, ReferenceService referenceService, ActivityService activitService) { this.referentialLocale = referentialLocale; - this.tripService = tripService; + this.referenceService = referenceService; this.activitService = activitService; } @@ -68,7 +68,7 @@ public class ActivityPairingEngine { ActivityPairingResult activityPairingResult = computeForActivityLogbook(context, activityLogbook); resultBuilder.add(activityPairingResult); } - TripReference reference = tripService.loadReferenceToRead(context.getTripId()); + TripReference reference = referenceService.loadData(TripReference.class, context.getTripId()); return new TripPairingResult(reference, resultBuilder.build()); } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java ===================================== @@ -70,12 +70,6 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten return loadEntityToDto(id); } - @Override - public R loadReferenceToRead(String id) { - D dto = loadDto(id); - return spi.toReference(getReferentialLocale(), dto); - } - @Override public boolean exists(String id) { return spi.existsEntity(getTopiaPersistenceContext(), id); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableDataServiceLocalSupport.java ===================================== @@ -97,11 +97,6 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten return loadEntityToDto(id); } - @Override - public R loadReferenceToRead(String id) { - return spi.loadEntityToReferenceDto(getReferentialLocale(), getTopiaPersistenceContext(), id); - } - @Override public boolean exists(String id) { return spi.existsEntity(getTopiaPersistenceContext(), id); @@ -119,9 +114,10 @@ public abstract class OpenableDataServiceLocalSupport<PE extends Entity, D exten @Override public void move(String newParentId, ImmutableSet<String> ids) { - if (ids.isEmpty()){ + if (ids.isEmpty()) { return; } + Date now = now(); PE newParent = loadParentEntity(newParentId); Collection<E> collection = getChildren0(newParent, null); List<E> moved = new LinkedList<>(); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/ActivityPairingServiceLocalSupport.java ===================================== @@ -30,8 +30,8 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.entities.data.ll.logbook.Activity; import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; +import fr.ird.observe.services.service.ReferenceService; import fr.ird.observe.services.service.data.ll.ActivityPairingService; -import fr.ird.observe.services.service.data.ll.common.TripService; import fr.ird.observe.services.service.data.ll.pairing.ActivityPairingEngine; import org.nuiton.topia.persistence.script.SqlScriptReader; @@ -49,20 +49,20 @@ import java.util.Map; class ActivityPairingServiceLocalSupport extends ObserveServiceLocal implements ActivityPairingService { private fr.ird.observe.services.service.data.ll.observation.ActivityService activityObsService; - private TripService tripService; private fr.ird.observe.services.service.data.ll.logbook.ActivityService activityLogbookService; + private ReferenceService referenceService; @Override public void setServiceContext(ObserveServiceContextLocal serviceContext) { super.setServiceContext(serviceContext); activityObsService = serviceContext.newService(fr.ird.observe.services.service.data.ll.observation.ActivityService.class); activityLogbookService = serviceContext.newService(fr.ird.observe.services.service.data.ll.logbook.ActivityService.class); - tripService = serviceContext.newService(TripService.class); + referenceService = serviceContext.newService(ReferenceService.class); } @Override public TripPairingResult computePairing(String tripId) { - ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), tripService, activityLogbookService); + ActivityPairingEngine engine = new ActivityPairingEngine(getReferentialLocale(), referenceService, activityLogbookService); DataDtoReferenceSet<ActivityReference> activityObsSet = activityObsService.getChildren(tripId); TripPairingContext pairingContext = engine.newTripContext(tripId, activityObsSet.toSet()); return engine.computeForTrip(pairingContext); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/926e652aa03ba19ab11bc75a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/926e652aa03ba19ab11bc75a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 32 commits: Impossible d'importer des données en mode avancé - Closes #1783
by Tony CHEMIT 18 Feb '21

18 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3fb0b64e by Tony Chemit at 2021-02-18T18:08:58+01:00 Impossible d'importer des données en mode avancé - Closes #1783 - - - - - 79ca68de by Tony Chemit at 2021-02-18T18:08:58+01:00 Finaliser les tests automatisés de services - See #1785 Stash before moving to home - - - - - 817dcb74 by Tony Chemit at 2021-02-18T18:08:58+01:00 fix application-assembly profiles: should be able to get a minimal assembly zip on not release build. - - - - - 40375bae by Tony Chemit at 2021-02-18T18:08:58+01:00 Problème sur la gestion des référentiels manquant lors d'un import - Closes #1784 - - - - - 695f980e by Tony Chemit at 2021-02-18T18:08:58+01:00 Review some start action accelerator (replace Alt+Q by Alt+S) (the first one looks more than a quit command...) - - - - - 1471acea by Tony Chemit at 2021-02-18T18:08:58+01:00 Improve data management messages - - - - - 17cea43e by Tony Chemit at 2021-02-18T18:08:58+01:00 Déplacement de marées pas effectif - See #1786 - - - - - 02a3a075 by Tony Chemit at 2021-02-18T18:08:58+01:00 Add nice NavigationResult.getProgram method - - - - - f18f6bee by Tony Chemit at 2021-02-18T18:08:58+01:00 On en voit plus les DCP! - Closes #1782 Déplacement de marées pas effectif - Closes #1786 - - - - - 37a0539c by Tony Chemit at 2021-02-18T18:08:58+01:00 Problème de contexte d'édition lors de déplacement - Closes #1789 Déplacement de marées pas effectif - Closes #1786 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - add1acac by Tony Chemit at 2021-02-18T18:08:58+01:00 Mauvaise disposition de l'encadré des espèces et quelques améliorations sur les deux écrans - Closes #1781 - - - - - 2891e9ac by Tony Chemit at 2021-02-18T18:08:58+01:00 Déplacement de marées pas effectif - Closes #1786 Revue pour le déplacement simple. - - - - - 2d8a2798 by Tony Chemit at 2021-02-18T18:08:58+01:00 Revoir l'ordre des actions dans la popup **Actions** - Closes #1788 - - - - - 1f69e482 by Tony Chemit at 2021-02-18T18:08:58+01:00 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - 3966a835 by Tony Chemit at 2021-02-18T18:08:58+01:00 Do not select new node (stays on parent node) - - - - - efdb9cbb by Tony Chemit at 2021-02-18T18:08:58+01:00 LL-Logbook Set second tab has a bad layout (the content is center on the screen, instead of being at top). - - - - - 3d53881c by Tony Chemit at 2021-02-18T18:08:58+01:00 Amélioration de l'arbre de navigation - Closes #1790 - - - - - c5a6393e by Tony Chemit at 2021-02-18T18:08:58+01:00 Revoir les actions à réaliser lors d'un déplacement de données - See #1791 La mise à jour des nœuds de l'arbre sont de nouveau correctes. - - - - - 5ac3925a by Tony Chemit at 2021-02-18T18:08:58+01:00 Problème de persistence de trois relations - See #1776 petit oubli ... - - - - - a7c13093 by Tony Chemit at 2021-02-18T18:08:58+01:00 Fix some little errors on LL-Landing - - - - - b5fa30d2 by Tony Chemit at 2021-02-18T18:08:58+01:00 Finaliser les tests automatisés de services - Closes #1785 - - - - - 0e153437 by Tony Chemit at 2021-02-18T18:08:58+01:00 Fix ActivitySample save: always set the entity to parent (before was only done if sample was null) - - - - - 2ad9fcb2 by Tony Chemit at 2021-02-18T18:08:58+01:00 Add nice log to get scripts - - - - - dfdacc1d by Tony Chemit at 2021-02-18T18:08:58+01:00 Catch error when deleting - - - - - 9aa8f15d by Tony Chemit at 2021-02-18T18:08:58+01:00 Catch error when moving - - - - - d0a53298 by Tony Chemit at 2021-02-18T18:08:58+01:00 LL-Logbook-Sample fix bad timeStamp binding in form. - - - - - 475d57e8 by Tony Chemit at 2021-02-18T18:08:58+01:00 Make Ps-Observation-DCP addPreset action works again (added in Actions menu with accelerator F9). - - - - - 368caa0d by Tony Chemit at 2021-02-18T18:08:58+01:00 Fix NavigationNode.findById method (do not use the isLeaf method, prefer use concrete getChildCount since we are sure at this point that children nodes are loaded) - - - - - 06d97416 by Tony Chemit at 2021-02-18T18:08:58+01:00 Add nice isEmptyNode method to force leaf property on some node. - - - - - 567b0bfc by Tony Chemit at 2021-02-18T18:08:58+01:00 Better catch of exceptions in DeleteExecutor. - - - - - b206cadf by Tony Chemit at 2021-02-18T18:08:58+01:00 Amélioration du rendu des coordonnées - Closes #1792 - - - - - 926e652a by Tony Chemit at 2021-02-18T18:08:58+01:00 Correction des tri sur les dates - See #1792 - - - - - 30 changed files: - .gitignore - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_en_GB.ftl - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_es_ES.ftl - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeId.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9445e2c4aa30d9986b5624bd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9445e2c4aa30d9986b5624bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Make Ps-Observation-DCP addPreset action works again (added in Actions menu with accelerator F9).
by Tony CHEMIT 17 Feb '21

17 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7d737dec by Tony Chemit at 2021-02-17T17:09:54+01:00 Make Ps-Observation-DCP addPreset action works again (added in Actions menu with accelerator F9). - - - - - 70b71ffc by Tony Chemit at 2021-02-17T17:09:54+01:00 Fix NavigationNode.findById method (do not use the isLeaf method, prefer use concrete getChildCount since we are sure at this point that children nodes are loaded) - - - - - 84ab2eee by Tony Chemit at 2021-02-17T17:09:54+01:00 Add nice isEmptyNode method to force leaf property on some node. - - - - - ee10922f by Tony Chemit at 2021-02-17T17:09:54+01:00 Better catch of exceptions in DeleteExecutor. - - - - - f450d7ae by Tony Chemit at 2021-02-17T17:09:54+01:00 Amélioration du rendu des coordonnées - Closes #1792 - - - - - 9445e2c4 by Tony Chemit at 2021-02-17T18:18:29+01:00 Correction des tri sur les dates - See #1792 - - - - - 22 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/FloatingObjectUIAddFloatingObjectPreset.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/dcp/UsePresetAction.java - models/dto/java/src/main/i18n/getters/java.getter - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivityReference.java - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - + models/dto/java/src/test/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilderTest.java - pom.xml - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -67,6 +67,7 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6"); public static final KeyStroke KEY_STROKE_MOVE = KeyStroke.getKeyStroke("pressed F7"); public static final KeyStroke KEY_STROKE_DUPLICATE = KeyStroke.getKeyStroke("pressed F7"); + public static final KeyStroke KEY_STROKE_ADD_PRESET = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_GENERATE = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_CHANGE_ID = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_SHOW_TECHNICAL_INFORMATIONS = KeyStroke.getKeyStroke("pressed F10"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java ===================================== @@ -30,7 +30,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.application.ActionExecutor; import javax.swing.SwingUtilities; -import java.lang.reflect.InvocationTargetException; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -94,8 +93,8 @@ public class DeleteExecutor { DeleteTreeAdapter<?> treeAdapter = this.treeAdapter.apply(request); try { SwingUtilities.invokeAndWait(() -> treeAdapter.adaptTree(request, tree)); - } catch (InterruptedException | InvocationTargetException e) { - log.error(e); + } catch (Exception e) { + UIHelper.handlingError(e); } log.info(String.format("Delete adapt tree [end..] %s", ids)); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java ===================================== @@ -53,7 +53,7 @@ public abstract class ContentOpenableUINavigationHandler<N extends ContentOpenab @Override public final boolean isLeaf() { - return getNode().getInitializer().isNotPersisted() || super.isLeaf(); + return getNode().getInitializer().isNotPersisted() || getNode().getInitializer().isLeaf() || super.isLeaf(); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java ===================================== @@ -27,6 +27,8 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationIni import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; +import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition; +import io.ultreia.java4all.util.SingletonSupplier; import java.util.Objects; @@ -38,6 +40,10 @@ import java.util.Objects; */ public final class ContentOpenableUINavigationInitializer extends NavigationInitializer<ContentOpenableUINavigationContext> { + /** + * flag to force a node to be a leaf even if it is not loaded. + */ + private final SingletonSupplier<Boolean> leaf; private DtoReference parentReference; private DataDtoReference reference; @@ -45,60 +51,74 @@ public final class ContentOpenableUINavigationInitializer extends NavigationInit super(scope); this.parentReference = Objects.requireNonNull(parentReference); this.reference = Objects.requireNonNull(reference); + this.leaf = SingletonSupplier.of(this::computeLeaf); + } + + private Boolean computeLeaf() { + @SuppressWarnings("unchecked") JavaBeanPropertyDefinition<DataDtoReference, ?> propertyDefinition = (JavaBeanPropertyDefinition<DataDtoReference, ?>) reference.javaBeanDefinition().properties().get("emptyNode"); + if (propertyDefinition != null && propertyDefinition.canRead()) { + return (Boolean) propertyDefinition.get(reference); + } + return false; } @Override - protected DataDtoReference init(NavigationContext<ContentOpenableUINavigationContext> context) { + protected final DataDtoReference init(NavigationContext<ContentOpenableUINavigationContext> context) { context.initReference(parentReference); context.initReference(reference); return getReference(); } @Override - protected void open(NavigationContext<ContentOpenableUINavigationContext> context) { + protected final void open(NavigationContext<ContentOpenableUINavigationContext> context) { updateSelectNodeId(getSelectId()); } @Override - protected void reload(NavigationContext<ContentOpenableUINavigationContext> context) { + protected final void reload(NavigationContext<ContentOpenableUINavigationContext> context) { this.parentReference = context.reloadReference(getParentReference()); this.reference = context.reloadReference(getReference()); + leaf.clear(); } @Override - public String toString() { + public final String toString() { return super.toString() + "" + getSelectId(); } - public DtoReference getParentReference() { + public final DtoReference getParentReference() { return parentReference; } - public DataDtoReference getReference() { + public final DataDtoReference getReference() { return reference; } - public String getSelectId() { + public final String getSelectId() { return getReference().getId(); } - public String getSelectedParentId() { + public final String getSelectedParentId() { return getParentReference().getId(); } - public boolean isOpen() { + public final boolean isOpen() { return Objects.equals(getSelectId(), getEditNodeId()); } - public boolean isPersisted() { + public final boolean isPersisted() { return getSelectId() != null; } - public boolean isNotPersisted() { + public final boolean isNotPersisted() { return getSelectId() == null; } - public void setReference(DataDtoReference reference) { + public final boolean isLeaf() { + return leaf.get(); + } + + public final void setReference(DataDtoReference reference) { this.reference = Objects.requireNonNull(reference); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java ===================================== @@ -450,17 +450,10 @@ public abstract class NavigationNode extends DefaultMutableTreeNode implements W super.remove(childIndex); } -// @Override -// public void removeFromParent() { -// NavigationNode parent = getParent(); -// int index = parent.getIndex(this); -// parent.remove(index); -// } - public void removeChildren(Set<String> ids) { for (String id : ids) { NavigationNode childNode = findChildById(id); - childNode.removeFromParent(); + Objects.requireNonNull(childNode, String.format("Could not find child node from %s with id: '%s'.", id, this)).removeFromParent(); } } @@ -488,7 +481,7 @@ public abstract class NavigationNode extends DefaultMutableTreeNode implements W // il faut charger les fils du nœud pour effectuer la recherche populateChildrenIfNotLoaded(); - if (isLeaf()) { + if (getChildCount() == 0) { // au final le nœud est une feuille, donc ne convient pas return null; } ===================================== client/datasource/editor/common/src/main/i18n/getters/jaxx.getter ===================================== @@ -1,4 +1,5 @@ observe.Id.comment +observe.Id.coordinate observe.Id.country observe.Id.description observe.Id.ocean ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -1,4 +1,5 @@ observe.Id.comment +observe.Id.coordinate observe.Id.country observe.Id.homeId observe.Id.ocean ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx ===================================== @@ -320,5 +320,5 @@ <JPanel id="invisible"> <JLabel id='noBaliseEditor' styleClass="skipI18n"/> </JPanel> - <JMenuItem id="addFloatingObjectPreset"/> + <JMenuItem id="addPreset"/> </fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEditUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss ===================================== @@ -36,7 +36,7 @@ } #addFloatingObjectPreset { - enabled:{states.isUpdatingMode() && states.getReference() == null}; + enabled:{!states.isCreatingMode() && states.getReference() == null}; } #objectOperation { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java ===================================== @@ -21,6 +21,7 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.observation; +import fr.ird.observe.client.datasource.editor.ps.data.observation.actions.FloatingObjectUIAddFloatingObjectPreset; import fr.ird.observe.client.datasource.editor.ps.data.observation.dcp.FloatingObjectPartsTreeTableModel; import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation; @@ -79,14 +80,19 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { model.getStates().getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> updateMaterials((ObjectOperationReference) e.getNewValue())); } - //FIXME:Focus ui.getModel().getStates().isCreatingMode() ? getUi().getObjectOperation() : getUi().getSupportVesselName() + @Override + protected void installExtraActions() { + super.installExtraActions(); + FloatingObjectUIAddFloatingObjectPreset.init(ui, ui.getAddPreset(), FloatingObjectUIAddFloatingObjectPreset.class); + } +//FIXME:Focus ui.getModel().getStates().isCreatingMode() ? getUi().getObjectOperation() : getUi().getSupportVesselName() @Override public void onOpenForm(Form<?> form) { FloatingObjectUIModel model = getModel(); - Optional<FloatingObjectPreset> floatingObjectReference = model.getStates().getReference(); + FloatingObjectPreset floatingObjectReference = model.getStates().getReference(); FloatingObjectDto bean = model.getStates().getBean(); @@ -98,7 +104,7 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { TypeTransmittingBuoyOperation typeTransmittingBuoyOperation = bean.getTypeTransmittingBuoyOperation(); ui.getTypeOperation().setSelectedItem(typeTransmittingBuoyOperation); - ui.getTable().openTable(model, bean.isPersisted() || floatingObjectReference.isPresent()); + ui.getTable().openTable(model, bean.isPersisted() || floatingObjectReference != null); Optional.ofNullable(bean.getFirstBuoy()).ifPresent(b -> b.copy(getUi().getTransmittingBuoy1())); Optional.ofNullable(bean.getSecondBuoy()).ifPresent(b -> b.copy(getUi().getTransmittingBuoy2())); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java ===================================== @@ -22,33 +22,12 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation; * #L% */ -import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.WithClientUIContext; -import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; -import fr.ird.observe.client.datasource.editor.ps.ObservePsKeyStrokes; +import fr.ird.observe.client.datasource.editor.ps.data.observation.dcp.UsePresetAction; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; -import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetModel; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; -import fr.ird.observe.dto.decoration.WithDecoratorService; import fr.ird.observe.dto.form.Form; import fr.ird.observe.services.ObserveServicesProvider; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import javax.swing.AbstractAction; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import java.awt.Font; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.util.Objects; -import java.util.Set; - -import static fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageUIHandlerSupport.findButton; -import static io.ultreia.java4all.i18n.I18n.t; /** * Created on 9/28/14. @@ -58,36 +37,6 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implements WithClientUIContext { - private static final Logger log = LogManager.getLogger(FloatingObjectUIModel.class); - - public static class UsePresetAction extends AbstractAction implements WithDecoratorService { - - private final FloatingObjectPreset preset; - private final KeyStroke keyStroke; - private JOptionPane pane; - - public UsePresetAction(FloatingObjectPreset preset, int index) { - this.preset = Objects.requireNonNull(preset); - this.keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke("F" + index)); - putValue(UsePresetAction.class.getName(), getClass().getName() + "_" + index); - putValue(NAME, getDecoratorService().getDecoratorByType(preset.getClass()).toString(preset)); - } - - public void install(JButton parent, JOptionPane pane) { - this.pane = pane; - String actionMapKey = (String) getValue(UsePresetAction.class.getName()); - pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStroke, actionMapKey); - pane.getActionMap().put(actionMapKey, this); - ObservePsKeyStrokes.addKeyStroke(parent, keyStroke); - } - - @Override - public void actionPerformed(ActionEvent e) { - log.info(String.format("Choose dcp preset: %s", preset.getLabel1())); - pane.setValue(preset); - } - } - public FloatingObjectUIModel(FloatingObjectUINavigationNode source) { super(source); } @@ -95,50 +44,16 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem @Override public void open() { FloatingObjectUIModelStates states = getStates(); - if (states.getReference().isPresent()) { - log.info(String.format("%s Will use dcp preset: %s", getPrefix(), states.getReference())); - } super.open(); if (states.isCreatingMode()) { - FloatingObjectPreset reference = chooseFloatingObjectPreset(); + FloatingObjectPreset reference = UsePresetAction.chooseFloatingObjectPreset(getClientUIContext()); states.setReference(reference); } } @Override public Form<FloatingObjectDto> preCreateForm(ObserveServicesProvider servicesProvider, String parentId) { - return servicesProvider.getPsObservationFloatingObjectService().preCreate2(parentId, getStates().getReference().orElse(null)); - } - - private FloatingObjectPreset chooseFloatingObjectPreset() { - - FloatingObjectPresetsManager floatingObjectPresetsManager = getClientUIContext().getFloatingObjectPresetsManager(); - Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPresets(FloatingObjectPresetModel.ps_observation); - if (!psObservation.isEmpty()) { - - JPanel userConfigs = new JPanel(new GridLayout(0, 2)); - - String replaceText = t("observe.ui.choice.dcp.default") + " (Enter)"; - Object[] options = {replaceText}; - JOptionPane pane = new JOptionPane(userConfigs, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); - JButton jButton = Objects.requireNonNull(findButton(pane, replaceText)); - Font font = jButton.getFont().deriveFont(18f); - jButton.setFont(font.deriveFont(Font.ITALIC)); - int index = 0; - for (FloatingObjectPreset preset : psObservation) { - UsePresetAction a = new UsePresetAction(preset, ++index); - JButton b = new JButton(a); - b.setFont(font); - userConfigs.add(b); - a.install(b, pane); - } - ClientUIContext.askUser(pane, t("observe.data.ps.observation.FloatingObjectReference.choose.title"), options); - Object value = pane.getValue(); - if (value instanceof FloatingObjectPreset) { - return (FloatingObjectPreset) value; - } - } - return null; + return servicesProvider.getPsObservationFloatingObjectService().preCreate2(parentId, getStates().getReference()); } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java ===================================== @@ -153,8 +153,8 @@ public class FloatingObjectUIModelStates extends GeneratedFloatingObjectUIModelS return whenLeaving.get(dto); } - public Optional<FloatingObjectPreset> getReference() { - return Optional.ofNullable(reference); + public FloatingObjectPreset getReference() { + return reference; } public void setReference(FloatingObjectPreset reference) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/actions/FloatingObjectUIAddFloatingObjectPreset.java ===================================== @@ -24,8 +24,9 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation.actions; import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; +import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction; import fr.ird.observe.client.datasource.editor.api.content.actions.ContentUIActionSupport; -import fr.ird.observe.client.datasource.editor.api.content.actions.InsertMenuAction; import fr.ird.observe.client.datasource.editor.ps.data.dcp.presets.FloatingObjectPresetUI; import fr.ird.observe.client.datasource.editor.ps.data.observation.FloatingObjectUI; import fr.ird.observe.client.util.UIHelper; @@ -51,13 +52,14 @@ import static io.ultreia.java4all.i18n.I18n.t; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class FloatingObjectUIAddFloatingObjectPreset extends ContentUIActionSupport<FloatingObjectUI> implements InsertMenuAction<FloatingObjectUI> { +public class FloatingObjectUIAddFloatingObjectPreset extends ContentUIActionSupport<FloatingObjectUI> implements ConfigureMenuAction<FloatingObjectUI> { private static final Logger log = LogManager.getLogger(FloatingObjectUIAddFloatingObjectPreset.class); public FloatingObjectUIAddFloatingObjectPreset() { super(t("observe.data.ps.observation.FloatingObjectReference.action.add"), - t("observe.data.ps.observation.FloatingObjectReference.action.add.tip"), "add-preset", null); + t("observe.data.ps.observation.FloatingObjectReference.action.add.tip"), "add-preset", + ObserveKeyStrokesEditorApi.KEY_STROKE_ADD_PRESET); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/dcp/UsePresetAction.java ===================================== @@ -0,0 +1,114 @@ +package fr.ird.observe.client.datasource.editor.ps.data.observation.dcp; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.ClientUIContext; +import fr.ird.observe.client.WithClientUIContext; +import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; +import fr.ird.observe.client.datasource.editor.ps.ObservePsKeyStrokes; +import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; +import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetModel; +import fr.ird.observe.dto.decoration.WithDecoratorService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.AbstractAction; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.KeyStroke; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.util.Objects; +import java.util.Set; + +import static fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageUIHandlerSupport.findButton; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created on 17/02/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0.6 + */ +public class UsePresetAction extends AbstractAction implements WithDecoratorService { + private static final Logger log = LogManager.getLogger(UsePresetAction.class); + private final FloatingObjectPreset preset; + private final KeyStroke keyStroke; + private JOptionPane pane; + + public static FloatingObjectPreset chooseFloatingObjectPreset(ClientUIContext context) { + + FloatingObjectPresetsManager floatingObjectPresetsManager = context.getFloatingObjectPresetsManager(); + Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPresets(FloatingObjectPresetModel.ps_observation); + if (!psObservation.isEmpty()) { + + JPanel userConfigs = new JPanel(new GridLayout(0, 2)); + + String replaceText = ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(t("observe.ui.choice.dcp.default"), KeyStroke.getKeyStroke("pressed ENTER")); + Object[] options = {replaceText}; + JOptionPane pane = new JOptionPane(userConfigs, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + JButton jButton = Objects.requireNonNull(findButton(pane, replaceText)); + Font font = jButton.getFont().deriveFont(18f); + jButton.setFont(font.deriveFont(Font.ITALIC)); + int index = 0; + for (FloatingObjectPreset preset : psObservation) { + UsePresetAction a = new UsePresetAction(preset, ++index); + JButton b = new JButton(a); + b.setFont(font); + userConfigs.add(b); + a.install(b, pane); + } + ClientUIContext.askUser(pane, t("observe.data.ps.observation.FloatingObjectReference.choose.title"), options); + Object value = pane.getValue(); + if (value instanceof FloatingObjectPreset) { + return (FloatingObjectPreset) value; + } + } + return null; + } + + public UsePresetAction(FloatingObjectPreset preset, int index) { + this.preset = Objects.requireNonNull(preset); + this.keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke("F" + index)); + putValue(UsePresetAction.class.getName(), getClass().getName() + "_" + index); + putValue(NAME, getDecoratorService().getDecoratorByType(preset.getClass()).toString(preset)); + } + + public void install(JButton parent, JOptionPane pane) { + this.pane = pane; + String actionMapKey = (String) getValue(UsePresetAction.class.getName()); + pane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(keyStroke, actionMapKey); + pane.getActionMap().put(actionMapKey, this); + ObservePsKeyStrokes.addKeyStroke(parent, keyStroke); + } + + @Override + public void actionPerformed(ActionEvent e) { + log.info(String.format("Choose dcp preset: %s", preset.getLabel1())); + pane.setValue(preset); + } +} ===================================== models/dto/java/src/main/i18n/getters/java.getter ===================================== @@ -1,4 +1,5 @@ observe.Id.comment +observe.Id.coordinate observe.Id.country observe.Id.description observe.Id.gearCharacteristic ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivityReference.java ===================================== @@ -93,4 +93,8 @@ public class ActivityReference extends GeneratedActivityReference { public void setFloatingObject(ImmutableList<FloatingObjectReference> floatingObject) { this.floatingObject = floatingObject; } + + public final boolean isEmptyNode() { + return getSet() == null && (floatingObject == null || floatingObject.isEmpty()); + } } ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -69,6 +69,7 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport n("validator.scope.info.label"); n("validator.scope.warning.label"); n("observe.Id.comment"); + n("observe.Id.coordinate"); n("observe.Id.country"); n("observe.Id.homeId"); n("observe.Id.sex"); @@ -130,7 +131,16 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport if (latitude == null || longitude == null) { return t("observe.common.no.coordinate"); } - return String.format("(%s°;%s°)", Numbers.roundThreeDigits(latitude), Numbers.roundThreeDigits(longitude)); + return String.format("(%s°;%s°)", fillCoordinateComponent(2,latitude), fillCoordinateComponent(3,longitude)); + } + + public static String fillCoordinateComponent(int integerPartDigit, Float component) { + boolean withSign = component<0; + String round = String.valueOf(Numbers.roundThreeDigits(component)); + int index = round.indexOf("."); + return (withSign?"-":" ") + +StringUtils.leftPad(round.substring(0,index).replace("-", ""), integerPartDigit, "0") + + StringUtils.rightPad(round.substring(index), 5, "0"); } public ObserveI18nLabelsBuilder() { @@ -182,6 +192,7 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport .put("quadrant", idDtoPrefix) .put("whenArriving", idDtoPrefix) .put("whenLeaving", idDtoPrefix) + .put("coordinate", idDtoPrefix) .put("species", referentialDtoPrefix) .put(ReferentialDto.PROPERTY_URI, referentialDtoPrefix) ===================================== models/dto/java/src/test/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilderTest.java ===================================== @@ -0,0 +1,50 @@ +package fr.ird.observe.dto.decoration; + +/*- + * #%L + * ObServe Models :: Dto :: Java + * %% + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.junit.Assert; +import org.junit.Test; + +/** + * Created on 17/02/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0.6 + */ +public class ObserveI18nLabelsBuilderTest { + + @Test + public void fillCoordinateComponent() { + assertFillCoordinateComponent(1.02f, " 001.0200"); + assertFillCoordinateComponent(-1.02f, "-001.0200"); + assertFillCoordinateComponent(-10.02f, "-010.0200"); + assertFillCoordinateComponent(-10.032f, "-010.0320"); + assertFillCoordinateComponent(10.032f, " 010.0320"); + assertFillCoordinateComponent(-100.0321f,"-100.0321"); + } + + private void assertFillCoordinateComponent(Float component, String excepted) { + String actual = ObserveI18nLabelsBuilder.fillCoordinateComponent(3,component); + Assert.assertEquals(excepted, actual); + } +} ===================================== pom.xml ===================================== @@ -147,7 +147,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.3</toolkit.version> + <toolkit.version>5.0.4-SNAPSHOT</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl>  ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1,9 +1,10 @@ boolean.false=No boolean.true=Yes observe.Id.comment=Comment +observe.Id.coordinate=Coordinate observe.Id.country=Country observe.Id.description=Description -observe.Id.gearCharacteristic=Caracteristic +observe.Id.gearCharacteristic=Characteristic observe.Id.homeId=Home id observe.Id.latitude=Latitude observe.Id.longitude=Longitude @@ -45,9 +46,9 @@ observe.constant.NonTargetCatchReleaseStatus.P=Perfect observe.constant.NonTargetCatchReleaseStatus.S=Bad observe.constant.NonTargetCatchReleaseStatus.U=Unknown observe.constant.ObserveModelType.LL=Longline -observe.constant.ObserveModelType.LL.description=Display Palangre's programs +observe.constant.ObserveModelType.LL.description=Display Longline programs observe.constant.ObserveModelType.PS=Seine -observe.constant.ObserveModelType.PS.description=Display Seine's programs +observe.constant.ObserveModelType.PS.description=Display Senne programs observe.constant.TripMapPointType.llActivityLogbook=Logbook - Other activity observe.constant.TripMapPointType.llActivityLogbookInHarbour=Logbook - At Harbour observe.constant.TripMapPointType.llActivityLogbookWithHaulingEnd=Logbook - Hauling end ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1,6 +1,7 @@ boolean.false=No boolean.true=Si observe.Id.comment=Commentario +observe.Id.coordinate=Coordinate \#TODO observe.Id.country=País observe.Id.description=Descripción observe.Id.gearCharacteristic=Característica ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1,6 +1,7 @@ boolean.false=Non boolean.true=Oui observe.Id.comment=Commentaire +observe.Id.coordinate=Coordonnées observe.Id.country=Pays observe.Id.description=Description observe.Id.gearCharacteristic=Caractéristique View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d48b24a9f6efef849b39853d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d48b24a9f6efef849b39853d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 13 commits: Improve services tests (do not keep concrete local test, just generate them) - See #1785
by Tony CHEMIT 17 Feb '21

17 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 670daf7a by Tony Chemit at 2021-02-16T07:39:22+01:00 Improve services tests (do not keep concrete local test, just generate them) - See #1785 - - - - - 7e9b4d43 by Tony Chemit at 2021-02-16T07:40:04+01:00 Improve services tests (always generate to source concrete fixtures) - See #1785 - - - - - 9d5a9bdb by Tony Chemit at 2021-02-16T07:40:23+01:00 Improve services tests (one more test in tck data) - See #1785 - - - - - 3afeaae4 by Tony Chemit at 2021-02-16T08:26:50+01:00 Add convenient method to know if local service is on h2 (on tck it breaks (we do not have configuration..)) - - - - - dd374207 by Tony Chemit at 2021-02-16T09:40:48+01:00 Improve services tests - See #1785 * simplify profiles, now that tests are nearly all written * use last http plugin - - - - - e619443a by Tony Chemit at 2021-02-16T10:31:58+01:00 Write more fixtures - See #1785 - - - - - d4ee41a2 by Tony Chemit at 2021-02-16T17:49:31+01:00 fix test method name when using parametrized tests :) - - - - - 8715cc82 by Tony Chemit at 2021-02-16T17:49:56+01:00 update pom and toolkit - - - - - 0b37062f by Tony Chemit at 2021-02-17T11:51:37+01:00 Rename report allActivitys to allActivities - - - - - 696b62b0 by Tony Chemit at 2021-02-17T11:51:56+01:00 Load test fixtures file with UTF-8 - - - - - 9341d8ee by Tony Chemit at 2021-02-17T11:53:42+01:00 Write more fixtures - See #1785 - - - - - 32685a8a by Tony Chemit at 2021-02-17T12:16:10+01:00 update pom - - - - - d48b24a9 by Tony Chemit at 2021-02-17T14:33:29+01:00 LL-Logbook-Sample fix bad timeStamp binding in form. - - - - - 30 changed files: - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIModelStates.java - models/dto/java/src/main/resources/observe-reports.properties - pom.xml - services/api-test/pom.xml - + services/api-test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java - services/client-test/src/main/java/fr/ird/observe/services/client/service/data/ll/logbook/SetCatchServiceClientTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/LastUpdateDateServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/ObserveServiceFixtures.java - services/client-test/src/main/java/fr/ird/observe/services/client/service/data/TripManagementServiceClientTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/PingServiceFixtures.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceFixtures.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetSampleServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ll/TripLonglineGearUseFeaturesReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/AccessoryCatchByGroupReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/AccessoryCatchReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/ActivityWithCommentReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/AllActivitiesReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/DiscardedTargetSampleServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/DailySetAndCatchReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/FobUsageExtendedReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/FobUsageMinimalReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/NonTargetDistributionLengthsReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/RepartionCaleeParCuveReportFixture.java - services/local-impl/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportSeineEquipmentsTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/SetByAssociationReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetCatchByAssociationReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetDiscardedByAssociationReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetDiscardedDistributionLengthsLD1ReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetDiscardedDistributionLengthsLFReportFixture.java - + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetStoredDistributionLengthsLD1ReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/RouteServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TargetStoredDistributionLengthsLFReportFixture.java - services/local-test/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SetNonTargetCatchReleaseServiceLocalTest.java → services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ps/TripSeineGearUseFeaturesReportFixture.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8ac162cd24a079f550180cdf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8ac162cd24a079f550180cdf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 15 commits: Déplacement de marées pas effectif - Closes #1786
by Tony CHEMIT 15 Feb '21

15 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ea6eb31 by Tony Chemit at 2021-02-15T14:46:53+01:00 Déplacement de marées pas effectif - Closes #1786 Revue pour le déplacement simple. - - - - - 12e2ca29 by Tony Chemit at 2021-02-15T14:46:53+01:00 Revoir l'ordre des actions dans la popup **Actions** - Closes #1788 - - - - - ec0b92ba by Tony Chemit at 2021-02-15T14:46:53+01:00 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - 6eafa9f3 by Tony Chemit at 2021-02-15T14:46:53+01:00 Do not select new node (stays on parent node) - - - - - f6c8972d by Tony Chemit at 2021-02-15T14:46:53+01:00 LL-Logbook Set second tab has a bad layout (the content is center on the screen, instead of being at top). - - - - - 58ae3c15 by Tony Chemit at 2021-02-15T14:46:53+01:00 Amélioration de l'arbre de navigation - Closes #1790 - - - - - 001a189d by Tony Chemit at 2021-02-15T14:46:53+01:00 Revoir les actions à réaliser lors d'un déplacement de données - See #1791 La mise à jour des nœuds de l'arbre sont de nouveau correctes. - - - - - 7ce37f81 by Tony Chemit at 2021-02-15T14:46:53+01:00 Problème de persistence de trois relations - See #1776 petit oubli ... - - - - - b1680529 by Tony Chemit at 2021-02-15T14:46:53+01:00 Fix some little errors on LL-Landing - - - - - 24a7a383 by Tony Chemit at 2021-02-15T21:07:14+01:00 Finaliser les tests automatisés de services - See #1785 With new tck, there is a data with a empty decoration fr.ird.data.ll.observation.Tdr#1537854438978#0.35327035333939394 Finaliser les tests automatisés de services - See #1785 - - - - - 38ec159d by Tony Chemit at 2021-02-15T21:07:14+01:00 Fix ActivitySample save: always set the entity to parent (before was only done if sample was null) - - - - - f3b7b393 by Tony Chemit at 2021-02-15T21:07:14+01:00 Add nice log to get scripts - - - - - 6651ba5d by Tony Chemit at 2021-02-15T21:07:14+01:00 Catch error when deleting - - - - - f01d322e by Tony Chemit at 2021-02-15T21:07:14+01:00 Catch error when moving - - - - - 8ac162cd by Tony Chemit at 2021-02-15T21:07:14+01:00 update topia-extension - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeId.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd11139f2e8c698cbf55f500… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd11139f2e8c698cbf55f500… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: Déplacement de marées pas effectif - Closes #1786
by Tony CHEMIT 15 Feb '21

15 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1fa107d2 by Tony Chemit at 2021-02-15T12:27:38+01:00 Déplacement de marées pas effectif - Closes #1786 Revue pour le déplacement simple. - - - - - f2eaa694 by Tony Chemit at 2021-02-15T12:27:43+01:00 Revoir l'ordre des actions dans la popup **Actions** - Closes #1788 - - - - - 9a2e0f25 by Tony Chemit at 2021-02-15T12:28:04+01:00 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - b292dacb by Tony Chemit at 2021-02-15T12:28:07+01:00 Do not select new node (stays on parent node) - - - - - 2a8bb64d by Tony Chemit at 2021-02-15T12:28:07+01:00 LL-Logbook Set second tab has a bad layout (the content is center on the screen, instead of being at top). - - - - - fbb1be69 by Tony Chemit at 2021-02-15T12:28:07+01:00 Amélioration de l'arbre de navigation - Closes #1790 - - - - - f6e3c5db by Tony Chemit at 2021-02-15T12:28:07+01:00 Revoir les actions à réaliser lors d'un déplacement de données - See #1791 La mise à jour des nœuds de l'arbre sont de nouveau correctes. - - - - - c5cbd670 by Tony Chemit at 2021-02-15T14:10:18+01:00 Problème de persistence de trois relations - See #1776 petit oubli ... - - - - - cd11139f by Tony Chemit at 2021-02-15T14:23:44+01:00 Fix some little errors on LL-Landing - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeId.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a9348da1bd2e1cd01e21f679… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a9348da1bd2e1cd01e21f679… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Déplacement de marées pas effectif - Closes #1786
by Tony CHEMIT 15 Feb '21

15 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 86ada50c by Tony Chemit at 2021-02-15T12:06:57+01:00 Déplacement de marées pas effectif - Closes #1786 Revue pour le déplacement simple. - - - - - 576a6532 by Tony Chemit at 2021-02-15T12:07:17+01:00 Revoir l'ordre des actions dans la popup **Actions** - Closes #1788 - - - - - 5d941e54 by Tony Chemit at 2021-02-15T12:07:20+01:00 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - e191334a by Tony Chemit at 2021-02-15T12:07:20+01:00 Do not select new node (stays on parent node) - - - - - 8464ecf7 by Tony Chemit at 2021-02-15T12:07:20+01:00 LL-Logbook Set second tab has a bad layout (the content is center on the screen, instead of being at top). - - - - - 1865a477 by Tony Chemit at 2021-02-15T12:07:20+01:00 Amélioration de l'arbre de navigation - Closes #1790 - - - - - a9348da1 by Tony Chemit at 2021-02-15T12:07:20+01:00 Revoir les actions à réaliser lors d'un déplacement de données - See #1791 La mise à jour des nœuds de l'arbre sont de nouveau correctes. - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeId.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2677e2e2ee0861227d4ba966… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2677e2e2ee0861227d4ba966… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Do not select new node (stays on parent node)
by Tony CHEMIT 15 Feb '21

15 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 065d73be by Tony Chemit at 2021-02-15T06:05:43+01:00 Do not select new node (stays on parent node) - - - - - 6412c43a by Tony Chemit at 2021-02-15T06:21:10+01:00 LL-Logbook Set second tab has a bad layout (the content is center on the screen, instead of being at top). - - - - - b08ac62c by Tony Chemit at 2021-02-15T08:40:29+01:00 Amélioration de l'arbre de navigation - Closes #1790 - - - - - 2677e2e2 by Tony Chemit at 2021-02-15T09:29:39+01:00 Revoir les actions à réaliser lors d'un déplacement de données - See #1791 La mise à jour des nœuds de l'arbre sont de nouveau correctes. - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetHooksCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityEncounterUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivitySensorUsedUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetBaitsCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetBranchlinesCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetFloatlinesCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetHooksCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectObservedSpeciesUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectObjectSchoolEstimateUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUINavigationNode.scope The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2030822da37937740bac1feb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2030822da37937740bac1feb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Problème de contexte d'édition lors de déplacement - Closes #1789
by Tony CHEMIT 14 Feb '21

14 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 00fed91e by Tony Chemit at 2021-02-14T19:47:39+01:00 Problème de contexte d'édition lors de déplacement - Closes #1789 Déplacement de marées pas effectif - Closes #1786 Amélioration de la boite de dialogue de suppression - Closes #1787 - - - - - 32faae36 by Tony Chemit at 2021-02-14T19:47:39+01:00 Mauvaise disposition de l'encadré des espèces et quelques améliorations sur les deux écrans - Closes #1781 - - - - - f6815612 by Tony Chemit at 2021-02-14T19:47:39+01:00 Déplacement de marées pas effectif - Closes #1786 Revue pour le déplacement simple. - - - - - 8db20e5c by Tony Chemit at 2021-02-14T19:47:39+01:00 Revoir l'ordre des actions dans la popup **Actions** - Closes #1788 - - - - - b4286c6a by Tony Chemit at 2021-02-14T19:47:39+01:00 Review Move API and generate most of it. - See #1787 - - - - - 2030822d by Tony Chemit at 2021-02-14T19:47:39+01:00 Review Delete and save API and generate most of it. - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ChangeId.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8efa805e4508114990112778… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8efa805e4508114990112778… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Review Move API and generate most of it. - See #1787
by Tony CHEMIT 14 Feb '21

14 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bcd1fb13 by Tony Chemit at 2021-02-14T18:44:51+01:00 Review Move API and generate most of it. - See #1787 - - - - - 8efa805e by Tony Chemit at 2021-02-14T18:45:01+01:00 Review Delete and save API and generate most of it. - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultMultipleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveTreeAdapter.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/tree/MoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationNode.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/MoveMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/71da0962713044ece2fa6611… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/71da0962713044ece2fa6611… You're receiving this email because of your account on gitlab.com.

1 0