September 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-8
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed new branch release/7.0-RC-8 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-8 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 1 commit: [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci]
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 906bc7c0 by Tony CHEMIT at 2017-09-11T09:03:55+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/906bc7c0c2c49c7b4ba40f2b41d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/906bc7c0c2c49c7b4ba40f2b41d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-8
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT deleted branch release/7.0-RC-8 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci]
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 906bc7c0 by Tony CHEMIT at 2017-09-11T09:03:55+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-8-SNAPSHOT</version> + <version>7.0-RC-9-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/906bc7c0c2c49c7b4ba40f2b41d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/906bc7c0c2c49c7b4ba40f2b41d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-8
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed new branch release/7.0-RC-8 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-8 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] up toolkit version
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b570797 by Tony CHEMIT at 2017-09-11T10:55:14+02:00 up toolkit version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>1.4-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>1.4</observeToolkitVersion> <eugenePluginVersion>3.0-alpha-13</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b5707976f149ea9e857e022c6f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b5707976f149ea9e857e022c6f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix some broken api
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e646a35 by Tony CHEMIT at 2017-09-11T10:26:32+02:00 fix some broken api - - - - - 12 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java - services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java @@ -79,14 +79,14 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple getStepModel().setSource(getModel().getConfigModel().getSafeLocalSource(false)); - Set<DataDtoReference<?,?>> trips = getModel().getSelectDataModel().getSelectionDataModel().getSelectedData(); + Set<DataDtoReference<?, ?>> trips = getModel().getSelectDataModel().getSelectionDataModel().getSelectedData(); ImmutableSet<String> tripIds = ImmutableSet.copyOf(trips.stream() .filter(input -> IdHelper.isTripSeineId(input.getId())) .map(DataDtoReference::getId) .collect(Collectors.toSet())); ProgressModel progressModel = getStepModel().getProgressModel(); - progressModel.setStepsCount(tripIds.size()); + progressModel.setStepsCount(tripIds.size() + 1); try (ObserveSwingDataSource dataSource = getStepModel().getSource()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java @@ -125,7 +125,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa UIHelper.setTableColumnRenderer(table4, 0, UIHelper.newBooleanTableCellRenderer(renderer5)); UIHelper.setTableColumnRenderer(table4, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer5, ProgramReference.class)); - UIHelper.setTableColumnRenderer(table4, 2, UIHelper.newDecorateTableCellRenderer(renderer5, DataDtoReference.class, DecoratorService.TRIP_CONTEXT)); + UIHelper.setTableColumnRenderer(table4, 2, UIHelper.newDecorateTableCellRenderer(renderer5, TripSeineReference.class, DecoratorService.TRIP_CONTEXT)); UIHelper.setTableColumnRenderer(table4, 3, UIHelper.newBooleanTableCellRenderer(renderer5)); UIHelper.setTableColumnEditor(table4, 0, MyDefaultCellEditor.newBooleanEditor(false)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -659,6 +659,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U public <F extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<F> formDefinition) { loadReferentialReferenceSetsInModel(formDefinition, true); } + protected <F extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<F> formDefinition, boolean clear) { Class<F> dtoType = formDefinition.getType(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java @@ -95,7 +95,7 @@ public class UIHelper extends SwingUtil { public static final Icon ICON_MODE_READ = SwingUtil.getUIManagerActionIcon("mode-read"); public static final Icon ICON_MODE_CREATE = SwingUtil.getUIManagerActionIcon("mode-create"); - public static final Icon ICON_MODE_UPDATE= SwingUtil.getUIManagerActionIcon("mode-update"); + public static final Icon ICON_MODE_UPDATE = SwingUtil.getUIManagerActionIcon("mode-update"); /** * Components which must NOT be blocked by any layer in ui. @@ -414,27 +414,39 @@ public class UIHelper extends SwingUtil { public static DecoratorTableCellRenderer newDecorateTableCellRenderer( - TableCellRenderer renderer, Class<?> entityClass) { - Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(entityClass); + TableCellRenderer renderer, Class<?> type) { + Objects.requireNonNull(renderer); + Objects.requireNonNull(type); + Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(type); + Objects.requireNonNull(decorator, "cant find decorator for " + type.getName()); return new DecoratorTableCellRenderer(renderer, decorator); } public static DecoratorTableCellRenderer newDecorateTableCellRenderer( - TableCellRenderer renderer, Class<?> entityClass, String context) { - Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(entityClass, context); + TableCellRenderer renderer, Class<?> type, String context) { + Objects.requireNonNull(renderer); + Objects.requireNonNull(type); + Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(type, context); + Objects.requireNonNull(decorator, "cant find decorator for " + type.getName() + " - " + context); return new DecoratorTableCellRenderer(renderer, decorator); } public static <T extends DataDtoReference> DecoratorTableCellRenderer newDataReferenceDecorateTableCellRenderer(TableCellRenderer renderer, Class<T> referenceType, String context) { + Objects.requireNonNull(renderer); + Objects.requireNonNull(referenceType); Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(referenceType, context); + Objects.requireNonNull(decorator, "cant find decorator for " + referenceType.getName() + " - " + context); return new DecoratorTableCellRenderer(renderer, decorator); } public static <T extends ReferentialDtoReference> DecoratorTableCellRenderer newReferentialReferenceDecorateTableCellRenderer(TableCellRenderer renderer, Class<T> referenceType) { + Objects.requireNonNull(renderer); + Objects.requireNonNull(referenceType); Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(referenceType); + Objects.requireNonNull(decorator, "cant find decorator for " + referenceType.getName()); return new DecoratorTableCellRenderer(renderer, decorator); } ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java ===================================== --- a/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java +++ b/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java @@ -33,7 +33,6 @@ import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; -import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import java.util.Date; import org.junit.Assert; import org.junit.Before; @@ -68,7 +67,7 @@ public class ReferenceValuesSetServiceClientTest extends ServiceClientTestSuppor //FIXME ReferenceSetsRequest<TripSeineDto> request = new ReferenceSetsRequest<>(); request.setRequestName(requestName); - request.setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName.<Date>builder().build()); + request.setLastUpdateDates(ImmutableDtoMap.<Date>builder().build()); ImmutableSet<ReferentialDtoReferenceSet<?>> referenceSetResult = service.getReferentialReferenceSets(request); Assert.assertNotNull(referenceSetResult); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java @@ -61,7 +61,7 @@ import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.context.ReferentialReferenceEntityContext; -import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; +import fr.ird.observe.spi.map.ImmutableDtoMap; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import java.util.Arrays; import java.util.Collections; @@ -143,7 +143,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe FormDefinition<D> requestDefinition = optionalRequestDefinition.get(); - ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = request.getLastUpdateDates(); + ImmutableDtoMap<Date> lastUpdateDates = request.getLastUpdateDates(); Objects.requireNonNull(lastUpdateDates); for (Class propertyType : requestDefinition.getPropertiesTypes()) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java @@ -22,9 +22,8 @@ package fr.ird.observe.services.local.service.referential; * #L% */ -import com.google.common.cache.LoadingCache; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import java.util.Set; import java.util.TreeSet; @@ -43,36 +42,31 @@ public class ReferentialShellBuilder { return new ReferentialShellBuilder(incomingReferentialIds); } - private final GetEntityReferentialsShellVisitor visitor; + private final GetEntityReferentialShellVisitor visitor; - public ReferentialShellBuilder scan(TopiaEntity entity) { + void scan(TopiaEntity entity) { entity.accept(visitor); - return this; } public ImmutableSetDtoMap<String> build() { - return visitor.missingreferentialIds.build(); + return visitor.missingReferentialIds.build(); } private ReferentialShellBuilder(ImmutableSetDtoMap<String> incomingReferentialIds) { - visitor = new GetEntityReferentialsShellVisitor(incomingReferentialIds); + visitor = new GetEntityReferentialShellVisitor(incomingReferentialIds); } - private static class GetEntityReferentialsShellVisitor implements TopiaEntityVisitor { + private static class GetEntityReferentialShellVisitor implements TopiaEntityVisitor { private final Set<String> hitIds; private final ImmutableSetDtoMap<String> incomingReferentialIds; - private final ImmutableSetDtoMap.Builder<String> missingreferentialIds; - private final LoadingCache<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDtoReference>> typeCache; + private final ImmutableSetDtoMap.Builder<String> missingReferentialIds; - public GetEntityReferentialsShellVisitor(ImmutableSetDtoMap<String> incomingReferentialIds) { + GetEntityReferentialShellVisitor(ImmutableSetDtoMap<String> incomingReferentialIds) { this.incomingReferentialIds = incomingReferentialIds; - //FIXME Use our many class mapping api... - this.typeCache = null; - this.hitIds = new TreeSet<>(); - this.missingreferentialIds = ImmutableSetDtoMap.builder(); + this.missingReferentialIds = ImmutableSetDtoMap.builder(); } @Override @@ -83,9 +77,9 @@ public class ReferentialShellBuilder { return; } hitIds.add(topiaId); - Class<? extends ReferentialDtoReference> dtoType = typeCache.getUnchecked(((ObserveReferentialEntity) entity).getClass()); + Class<?> dtoType = DbModelHelper.fromReferentialEntity((ObserveReferentialEntity) entity).toReferenceType(); if (!incomingReferentialIds.containsEntry(dtoType, topiaId)) { - missingreferentialIds.put(dtoType, topiaId); + missingReferentialIds.put(dtoType, topiaId); } } } @@ -117,7 +111,6 @@ public class ReferentialShellBuilder { @Override public void clear() { hitIds.clear(); - typeCache.invalidateAll(); } } ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -30,7 +30,6 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; -import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import fr.ird.observe.spi.map.MutableDtoMap; import java.io.Closeable; import java.io.Serializable; @@ -94,7 +93,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { FormDefinition<D> formDefinition = optionalRequestDefinition.get(); log.info(String.format("Loading %d referential dependencies for: %s", formDefinition.getProperties().size(), dtoType.getName())); - ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = getLastUpdateDates(formDefinition); + ImmutableDtoMap<Date> lastUpdateDates = getLastUpdateDates(formDefinition); ReferenceSetsRequest<D> request = new ReferenceSetsRequest<>(); request.setRequestName(dtoType); @@ -126,9 +125,9 @@ public class ObserveReferentialCache implements Closeable, Serializable { * @param formDefinition la définition de requète * @return le dictionnaire des dates de dernières mises à jour pour chaque ensemble de référentiels */ - private ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { + private ImmutableDtoMap<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { - ImmutableDtoMapDtoSimplifiedName.Builder<Date> builder = ImmutableDtoMapDtoSimplifiedName.builder(); + ImmutableDtoMap.Builder<Date> builder = ImmutableDtoMap.builder(); for (Class type : formDefinition.getPropertiesTypes()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; -import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; +import fr.ird.observe.spi.map.ImmutableDtoMap; import java.util.Date; /** @@ -39,7 +39,7 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { private Class<D> requestName; - private ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates; + private ImmutableDtoMap<Date> lastUpdateDates; public Class<D> getDtoType() { return requestName; @@ -49,11 +49,11 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { this.requestName = requestName; } - public ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates() { + public ImmutableDtoMap<Date> getLastUpdateDates() { return lastUpdateDates; } - public void setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates) { + public void setLastUpdateDates(ImmutableDtoMap<Date> lastUpdateDates) { this.lastUpdateDates = lastUpdateDates; } ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -498,8 +498,8 @@ observe.validation.nonTargetCatchRelease.required.speciesGroupReleaseMode=Releas observe.validation.nonTargetCatchRelease.required.status=Status not filled. observe.validation.nonTargetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. observe.validation.nonTargetLength.desactivated.speciesFate=Selected species fate is disabled. -observe.validation.nonTargetLength.required.sizeMeasureType=Size measure type is mandatory. observe.validation.nonTargetLength.null.speciesFate=Species fate should be filled. +observe.validation.nonTargetLength.required.sizeMeasureType=Size measure type is mandatory. observe.validation.nonTargetSample.bound.length=Length must be bound between %s and %s. observe.validation.nonTargetSample.bound.weight=Weight must be bound between %s and %s. observe.validation.nonTargetSample.comment.tobig=Comment size can not exceed 1024 characters. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -498,8 +498,8 @@ observe.validation.nonTargetCatchRelease.required.speciesGroupReleaseMode=Mode d observe.validation.nonTargetCatchRelease.required.status=État à la libération non renseigné. \#TODO observe.validation.nonTargetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO observe.validation.nonTargetLength.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. -observe.validation.nonTargetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO observe.validation.nonTargetLength.null.speciesFate=Futuro de fauna no establecida. +observe.validation.nonTargetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO observe.validation.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -498,8 +498,8 @@ observe.validation.nonTargetCatchRelease.required.speciesGroupReleaseMode=Mode d observe.validation.nonTargetCatchRelease.required.status=État à la libération non renseigné. observe.validation.nonTargetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. observe.validation.nonTargetLength.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. -observe.validation.nonTargetLength.required.sizeMeasureType=Le type de mesure est obligatoire. observe.validation.nonTargetLength.null.speciesFate=La sélection d'un devenir faune est conseillée. +observe.validation.nonTargetLength.required.sizeMeasureType=Le type de mesure est obligatoire. observe.validation.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. observe.validation.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. observe.validation.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e646a35d1758eab1587717ee78… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e646a35d1758eab1587717ee78… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: some fix on decorators and validation
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8991fc68 by Tony CHEMIT at 2017-09-11T08:49:01+02:00 some fix on decorators and validation - - - - - 255dd1dc by Tony CHEMIT at 2017-09-11T09:04:19+02:00 Mise à jour de libellés (See #865) - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeaderHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - validation/src/main/resources/fr/ird/observe/dto/data/seine/NonTargetLengthDto-update-warning-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java @@ -25,6 +25,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.constants.ValidationModelMode; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.ObserveKeyStrokes; @@ -261,7 +262,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements return; } - DtoReference<?,?> ref = (DtoReference) o; + DtoReference<?, ?> ref = (DtoReference) o; if (log.isDebugEnabled()) { log.debug(ref); @@ -377,6 +378,8 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements ImmutableSet<NuitonValidatorScope> scopes = ImmutableSet.copyOf(stepModel.getScopes()); String contextName = stepModel.getContextName(); + ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); + ValidationResult<?> result; if (dataModel.isLoadReferential()) { @@ -387,6 +390,9 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements request.setReferentialTypes(dataModel.getSelectedReferentiel()); request.setScopes(scopes); request.setValidationContext(contextName); + request.setValidationSpeedMaxValue(config.getValidationSpeedMaxValue()); + request.setValidationSpeedEnable(config.getValidationSpeedEnable()); + request.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); progressModel.incrementsCurrentStep(); @@ -394,12 +400,16 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements } else if (dataModel.isUseData()) { + DataValidationRequest mainRequest = new DataValidationRequest(); mainRequest.setDataIds(ImmutableSet.copyOf(dataModel.getSelectedData().stream().map(DataDtoReference::getId).collect(Collectors.toSet()))); mainRequest.setScopes(scopes); mainRequest.setValidationContext(contextName); + mainRequest.setValidationSpeedMaxValue(config.getValidationSpeedMaxValue()); + mainRequest.setValidationSpeedEnable(config.getValidationSpeedEnable()); + mainRequest.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); - ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(ReferentialLocale.valueOf(ObserveSwingApplicationContext.get().getConfig().getDbLocale()), mainRequest); + ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(ReferentialLocale.valueOf(config.getDbLocale()), mainRequest); for (DataDtoReference<?, ?> dataReference : dataModel.getSelectedData()) { @@ -409,9 +419,12 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements request.setDataIds(ImmutableSet.of(id)); request.setScopes(scopes); request.setValidationContext(contextName); + request.setValidationSpeedMaxValue(config.getValidationSpeedMaxValue()); + request.setValidationSpeedEnable(config.getValidationSpeedEnable()); + request.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); //noinspection unchecked - sendMessage(t("observe.actions.validate.message.validate.trip", getDecoratorService().getDataReferenceDecorator((Class) dataReference.getDtoType()).toString(dataReference))); + sendMessage(t("observe.actions.validate.message.validate.trip", getDecoratorService().getDataReferenceDecorator((Class) dataReference.getReferenceType()).toString(dataReference))); progressModel.incrementsCurrentStep(); result = validateService.validateData(request); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -656,12 +656,12 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - public <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) { + public <F extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<F> formDefinition) { loadReferentialReferenceSetsInModel(formDefinition, true); } - protected <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition, boolean clear) { + protected <F extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<F> formDefinition, boolean clear) { - Class<E> dtoType = formDefinition.getType(); + Class<F> dtoType = formDefinition.getType(); ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); @@ -1136,12 +1136,12 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U comboBox.setData(data); } - protected <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> dtoType) { - return getDecoratorService().getDataReferenceDecorator(dtoType); + protected <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType) { + return getDecoratorService().getDataReferenceDecorator(referenceType); } - protected <D extends ReferentialDtoReference> ReferentialReferenceDecorator<D> getReferentialReferenceDecorator(Class<D> dtoType) { - return getDecoratorService().getReferentialReferenceDecorator(dtoType); + protected <R extends ReferentialDtoReference> ReferentialReferenceDecorator<R> getReferentialReferenceDecorator(Class<R> referenceType) { + return getDecoratorService().getReferentialReferenceDecorator(referenceType); } private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> ReferentialDtoReferenceSet<R> filterReferentialReferenceSet(String propertyName, DtoReferenceDefinition<D, R> propertyDefinition, @@ -1248,7 +1248,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } -// protected <D extends ReferentialDto> Optional<FormDefinition<D>> getReferentialFormRequest(Class<D> type) { +// protected <R extends ReferentialDto> Optional<FormDefinition<R>> getReferentialFormRequest(Class<R> type) { // return DtoModelHelper.fromReferentialForm(type).toFormDefinition(); // } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeaderHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeaderHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeaderHandler.java @@ -67,10 +67,10 @@ public class NavigationTreeHeaderHandler implements UIHandler<NavigationTreeHead @Override public void afterInit(NavigationTreeHeader ui) { - ui.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); - ui.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); + ui.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation.referential.Program-16")); + ui.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation.referential.Program-16")); ui.getShowReferential().setIcon(UIHelper.getUIManagerIcon("navigation.referentiel-16")); - ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation." + TripSeineDto.class.getName() + "-16")); + ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation.data.seine.TripSeine-16")); NavigationTree tree = ui.getTree(); TreeSearchable searchable = new TreeSearchable(tree); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui.tree.selection.nodes; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.reference.DtoReference; import org.nuiton.decorator.Decorator; @@ -33,7 +34,7 @@ import org.nuiton.decorator.Decorator; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R extends DtoReference<D,R>> extends SelectionTreeNodeSupport<R> { +public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R extends DtoReference<D, R>> extends SelectionTreeNodeSupport<R> { private boolean selected; @@ -56,7 +57,7 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten @Override public String getIconPath() { - return "navigation." + getData().getDtoType().getName(); + return "navigation." + IdHelper.getDtoSimplifiedName(getData().getDtoType()); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui.util; import fr.ird.observe.client.ui.admin.validate.ValidationMessageTableModel; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.dto.decoration.ObserveI18nLabelsBuilder; import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; import java.awt.Color; import java.awt.Component; @@ -47,6 +48,8 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende private static final long serialVersionUID = 1L; + private final ObserveI18nLabelsBuilder labelsBuilder = new ObserveI18nLabelsBuilder(null); + @Override public Component getTableCellRendererComponent(JTable table, Object value, @@ -78,7 +81,7 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende case 1: // field name - text = getFieldName(model.getRow(row),(String) value); + text = getFieldName(model.getRow(row), (String) value); toolTipText = t("observe.validator.field.tip", text); break; @@ -112,8 +115,10 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende } private String getFieldName(ValidationResultDtoMessage model, String value) { - String fieldName = value.startsWith("observe.") ? value : ObserveI18nDecoratorHelper.getPropertyI18nKey(model.getType(), value); - return t(fieldName); + if (value.startsWith("observe.")) { + return t(value); + } + return t(labelsBuilder.getI18nKey(model.getType(), ObserveI18nDecoratorHelper.OBSERVE_COMMON_PREFIX, value)); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java @@ -23,6 +23,7 @@ package fr.ird.observe.client.ui.util; */ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.dto.decoration.ObserveI18nLabelsBuilder; import java.awt.Color; import java.awt.Component; import javax.swing.JComponent; @@ -51,6 +52,8 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT /** Logger. */ private static final Log log = LogFactory.getLog(ObserveValidatorMessageTableRenderer.class); + private final ObserveI18nLabelsBuilder labelsBuilder = new ObserveI18nLabelsBuilder(null); + @Override public String getFieldName(JTable table, String value, int row) { SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); @@ -74,8 +77,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT if (value.startsWith("observe.") || model.getValidator() == null) { return t(value); } - String fieldName = ObserveI18nDecoratorHelper.getPropertyI18nKey(model.getValidator().getType(), value); - return t(fieldName); + return t(labelsBuilder.getI18nKey(model.getValidator().getType(), ObserveI18nDecoratorHelper.OBSERVE_COMMON_PREFIX, value)); } @Override ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -746,7 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Numéro de cuve observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Le nombre estimé a été calculé (%s) observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Le nombre estimé a été observé observe.common.NonTargetCatchDto.well=Cuve -observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libération</strong>(pas de faune accessoire sensible)</body></html> +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des libérations</strong>(pas de faune accessoire sensible)</body></html> observe.common.NonTargetCatchReleaseDto.table.comment=Com observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java @@ -321,8 +321,9 @@ public class DecoratorService extends DecoratorProvider { @Override public void end() { // Trip commun decorator - registerDecorator(TRIP_CONTEXT, - new DataReferenceDecorator<>(TripSeineReference.class, "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s")); + registerDataReferenceDecorator(TRIP_CONTEXT, + TripSeineReference.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s"); // gps decorators registerObserveDecorator("activity-gps", ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n.t; */ public class ObserveI18nDecoratorHelper { - private static final String OBSERVE_COMMON_PREFIX = "observe.common."; + public static final String OBSERVE_COMMON_PREFIX = "observe.common."; public static <C extends Class<?>> List<C> sortTypes(Collection<C> types, Locale locale) { return ObserveUtil.sortTypes(types, klass -> t(getTypeI18nKey(klass)), locale); ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java @@ -65,6 +65,7 @@ public class ObserveI18nLabelsBuilder extends I18nLabelsBuilder { .put(ReferentialDto.PROPERTY_URI, ReferentialDto.class.getSimpleName() + ".") .put(ReferentialDto.PROPERTY_NEED_COMMENT, ReferentialDto.class.getSimpleName() + ".") .put(ReferentialDto.PROPERTY_CODE, ReferentialDto.class.getSimpleName() + ".") + .put(ReferentialDto.PROPERTY_STATUS, ReferentialDto.class.getSimpleName() + ".") .put("species", "") .put("country", "") .build(); ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/NonTargetLengthDto-update-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/data/seine/NonTargetLengthDto-update-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/data/seine/NonTargetLengthDto-update-warning-validation.xml @@ -30,7 +30,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.nonTargetLength.required.speciesFate</message> + <message>observe.validation.nonTargetLength.null.speciesFate</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -499,7 +499,7 @@ observe.validation.nonTargetCatchRelease.required.status=Status not filled. observe.validation.nonTargetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. observe.validation.nonTargetLength.desactivated.speciesFate=Selected species fate is disabled. observe.validation.nonTargetLength.required.sizeMeasureType=Size measure type is mandatory. -observe.validation.nonTargetLength.required.speciesFate=Species fate must be filled. +observe.validation.nonTargetLength.null.speciesFate=Species fate should be filled. observe.validation.nonTargetSample.bound.length=Length must be bound between %s and %s. observe.validation.nonTargetSample.bound.weight=Weight must be bound between %s and %s. observe.validation.nonTargetSample.comment.tobig=Comment size can not exceed 1024 characters. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -499,7 +499,7 @@ observe.validation.nonTargetCatchRelease.required.status=État à la libération observe.validation.nonTargetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO observe.validation.nonTargetLength.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. observe.validation.nonTargetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO -observe.validation.nonTargetLength.required.speciesFate=Es obligatoiro seleccionar un futuro de fauna. +observe.validation.nonTargetLength.null.speciesFate=Futuro de fauna no establecida. observe.validation.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -499,7 +499,7 @@ observe.validation.nonTargetCatchRelease.required.status=État à la libération observe.validation.nonTargetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. observe.validation.nonTargetLength.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. observe.validation.nonTargetLength.required.sizeMeasureType=Le type de mesure est obligatoire. -observe.validation.nonTargetLength.required.speciesFate=La sélection d'un devenir faune est obligatoire. +observe.validation.nonTargetLength.null.speciesFate=La sélection d'un devenir faune est conseillée. observe.validation.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. observe.validation.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. observe.validation.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/061dc4bccd16ea487b3d5fc715… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/061dc4bccd16ea487b3d5fc715… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use new topia and nuiton-config version
by Tony CHEMIT 11 Sep '17

11 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 061dc4bc by Tony CHEMIT at 2017-09-11T07:45:25+02:00 use new topia and nuiton-config version - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content; +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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% + */ + /** * Created by tchemit on 06/09/17. * ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -158,8 +158,8 @@ <jaxxVersion>3.0-alpha-12</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> - <nuitonConfigVersion>3.2</nuitonConfigVersion> - <topiaVersion>3.2.1</topiaVersion> + <nuitonConfigVersion>3.3</nuitonConfigVersion> + <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> @@ -167,7 +167,7 @@ <httpVersion>1.0.7</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.26.4</flexmarkVersion> - <hibernateVersion>5.1.9.Final</hibernateVersion> + <hibernateVersion>5.2.10.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.11</reflectionsVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/061dc4bccd16ea487b3d5fc7157… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/061dc4bccd16ea487b3d5fc7157… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Problème affichage navire et observateur dans arbre de navigation (See #867)
by Tony CHEMIT 10 Sep '17

10 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e7eb06e by Tony CHEMIT at 2017-09-10T09:38:26+00:00 Problème affichage navire et observateur dans arbre de navigation (See #867) - - - - - 93ecc2b2 by Tony CHEMIT at 2017-09-10T09:40:12+00:00 fix some rest problems = loading form - - - - - 11 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -656,12 +656,19 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) { + public <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) { + loadReferentialReferenceSetsInModel(formDefinition, true); + } + protected <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition, boolean clear) { Class<E> dtoType = formDefinition.getType(); ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); + if (!clear) { + modelReferentialReferenceSets.putAll(getModel().getReferentialReferenceSets()); + } + log.debug("Update referential reference sets for: " + dtoType); // mettre à jour le cache de référentiel ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java @@ -36,9 +36,6 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport; -import fr.ird.observe.dto.decoration.DecoratorService; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.BasketReference; import fr.ird.observe.dto.data.longline.BranchlineDto; import fr.ird.observe.dto.data.longline.BranchlineHelper; @@ -50,6 +47,10 @@ import fr.ird.observe.dto.data.longline.SetLonglineCatchHelper; import fr.ird.observe.dto.data.longline.SizeMeasureDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.data.longline.WeightMeasureDto; +import fr.ird.observe.dto.decoration.DecoratorService; +import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesDto; @@ -58,12 +59,14 @@ import fr.ird.observe.dto.referential.WeightMeasureTypeReference; import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference; import fr.ird.observe.dto.referential.longline.HealthnessReference; import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.DtoModelHelper; import java.beans.PropertyChangeListener; import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -651,6 +654,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat loadReferentialReferenceSetsInModel(form); + Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class); + optionalFormDefinition.ifPresent(branchlineDtoFormDefinition -> loadReferentialReferenceSetsInModel(branchlineDtoFormDefinition, false)); + model.setForm(form); LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java @@ -35,6 +35,7 @@ import fr.ird.observe.client.ui.content.ContentUIHandler; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.client.ui.content.list.ContentListUIModel; import fr.ird.observe.client.ui.util.JVetoableTabbedPane; +import fr.ird.observe.dto.data.longline.BaitsCompositionDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; import fr.ird.observe.dto.data.longline.BasketDto; @@ -45,13 +46,16 @@ import fr.ird.observe.dto.data.longline.SectionWithTemplate; import fr.ird.observe.dto.data.longline.SectionWithTemplateHelper; import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionHelper; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.spi.DtoModelHelper; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.swing.JComboBox; import javax.swing.JOptionPane; @@ -378,7 +382,11 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null); BranchlineUIModel branchlineUIModel = getUi().getBranchlineDetailUI().getModel(); - branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class); + optionalFormDefinition.ifPresent(getUi().getBranchlineDetailUI().getHandler()::loadReferentialReferenceSetsInModel); + branchlineUIModel.setForm(branchlineDtoForm); //FIXME Validate this default date ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java @@ -27,11 +27,18 @@ import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.content.ContentMode; import fr.ird.observe.client.ui.content.ContentUIHandler; -import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; +import fr.ird.observe.dto.data.longline.BaitsCompositionDto; +import fr.ird.observe.dto.data.longline.BranchlinesCompositionDto; +import fr.ird.observe.dto.data.longline.FloatlinesCompositionDto; +import fr.ird.observe.dto.data.longline.HooksCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionHelper; +import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.DtoModelHelper; +import java.util.Optional; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -147,7 +154,11 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open floatlinesComposition tab FloatlinesCompositionUIModel floatlinesCompositionModel = getUi().getFloatlinesCompositionModel(); - floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<FloatlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(FloatlinesCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getFloatlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + floatlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean()); @@ -159,7 +170,12 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open branchlinesComposition tab BranchlinesCompositionUIModel branchlinesCompositionModel = getUi().getBranchlinesCompositionModel(); - branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + +// branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<BranchlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlinesCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getBranchlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + branchlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean()); @@ -171,7 +187,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open hooksComposition tab HooksCompositionUIModel hooksCompositionModel = getUi().getHooksCompositionModel(); - hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + Optional<FormDefinition<HooksCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(HooksCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getHooksCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + hooksCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean()); @@ -183,7 +202,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open baitsComposition tab BaitsCompositionUIModel baitsCompositionModel = getUi().getBaitsCompositionModel(); - baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + Optional<FormDefinition<BaitsCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BaitsCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getBaitsCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + baitsCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -226,7 +226,9 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U Dimension preferredSize = ui.getPreferredSize(); JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class); - ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + if (parentContainer!=null) { + ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + } // parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200)); } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java @@ -491,7 +491,7 @@ public class DecoratorService extends DecoratorProvider { public void initTripLonglineDto() { registerDecorator(new TripLonglineDecorator()); registerDataReferenceDecorator(TripLonglineReference.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s"); } @Override ===================================== server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java +++ b/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; +import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; /** * Cet injecteur a été mis en place pour permettre la conversion des immutableSet arrivant dans une requete. @@ -70,8 +71,17 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); String[] values = (String[]) parameterTree.getValue(); - Collection o = gson.fromJson(values[0], generic); - builder.addAll(o); + String value = values[0]; + if (!value.isEmpty() && !value.contains("[")) { + if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) { + value = "\"" + value + "\""; + } + value = "[" + value + "]"; + } + Collection o = gson.fromJson(value, generic); + if (o != null) { + builder.addAll(o); + } } result = builder.build(); ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java ===================================== --- a/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java +++ b/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import java.util.Date; import org.junit.Assert; import org.junit.Before; @@ -67,7 +68,7 @@ public class ReferenceValuesSetServiceClientTest extends ServiceClientTestSuppor //FIXME ReferenceSetsRequest<TripSeineDto> request = new ReferenceSetsRequest<>(); request.setRequestName(requestName); - request.setLastUpdateDates(ImmutableDtoMap.<Date>builder().build()); + request.setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName.<Date>builder().build()); ImmutableSet<ReferentialDtoReferenceSet<?>> referenceSetResult = service.getReferentialReferenceSets(request); Assert.assertNotNull(referenceSetResult); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java @@ -61,7 +61,7 @@ import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.context.ReferentialReferenceEntityContext; -import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import java.util.Arrays; import java.util.Collections; @@ -143,7 +143,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe FormDefinition<D> requestDefinition = optionalRequestDefinition.get(); - ImmutableDtoMap<Date> lastUpdateDates = request.getLastUpdateDates(); + ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = request.getLastUpdateDates(); Objects.requireNonNull(lastUpdateDates); for (Class propertyType : requestDefinition.getPropertiesTypes()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -30,6 +30,7 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import fr.ird.observe.spi.map.MutableDtoMap; import java.io.Closeable; import java.io.Serializable; @@ -93,7 +94,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { FormDefinition<D> formDefinition = optionalRequestDefinition.get(); log.info(String.format("Loading %d referential dependencies for: %s", formDefinition.getProperties().size(), dtoType.getName())); - ImmutableDtoMap<Date> lastUpdateDates = getLastUpdateDates(formDefinition); + ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = getLastUpdateDates(formDefinition); ReferenceSetsRequest<D> request = new ReferenceSetsRequest<>(); request.setRequestName(dtoType); @@ -125,9 +126,9 @@ public class ObserveReferentialCache implements Closeable, Serializable { * @param formDefinition la définition de requète * @return le dictionnaire des dates de dernières mises à jour pour chaque ensemble de référentiels */ - private ImmutableDtoMap<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { + private ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { - ImmutableDtoMap.Builder<Date> builder = ImmutableDtoMap.builder(); + ImmutableDtoMapDtoSimplifiedName.Builder<Date> builder = ImmutableDtoMapDtoSimplifiedName.builder(); for (Class type : formDefinition.getPropertiesTypes()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; -import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import java.util.Date; /** @@ -39,7 +39,7 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { private Class<D> requestName; - private ImmutableDtoMap<Date> lastUpdateDates; + private ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates; public Class<D> getDtoType() { return requestName; @@ -49,11 +49,11 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { this.requestName = requestName; } - public ImmutableDtoMap<Date> getLastUpdateDates() { + public ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates() { return lastUpdateDates; } - public void setLastUpdateDates(ImmutableDtoMap<Date> lastUpdateDates) { + public void setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates) { this.lastUpdateDates = lastUpdateDates; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85d9ecc9582ea6a62595354ad2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85d9ecc9582ea6a62595354ad2… You're receiving this email because of your account on gitlab.com.

1 0