Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
2477c752
by Tony Chemit at 2022-06-12T10:35:24+02:00
-
ba3e239b
by Tony Chemit at 2022-06-12T10:54:46+02:00
5 changed files:
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationInitializer.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java
- pom.xml
Changes:
| ... | ... | @@ -67,7 +67,6 @@ public class ContentRootListUINavigationInitializer extends NavigationInitialize |
| 67 | 67 | @Override
|
| 68 | 68 | protected Object init(NavigationContext<ContentRootListUINavigationContext> context) {
|
| 69 | 69 | decorator = context.getDecoratorService().getDecoratorByType(getScope().getMainReferenceType(), getScope().getDecoratorClassifier());
|
| 70 | -// context.initReference(parentReference);
|
|
| 71 | 70 | return getParentReference();
|
| 72 | 71 | }
|
| 73 | 72 |
| ... | ... | @@ -56,7 +56,6 @@ public final class ContentRootOpenableUINavigationInitializer extends Navigation |
| 56 | 56 | |
| 57 | 57 | @Override
|
| 58 | 58 | protected DataDtoReference init(NavigationContext<ContentRootOpenableUINavigationContext> context) {
|
| 59 | -// context.initReference(parentReference.get());
|
|
| 60 | 59 | decorator = context.getDecoratorService().getDecoratorByType(reference.getReferenceType(), getScope().getDecoratorClassifier());
|
| 61 | 60 | reference.registerDecorator(decorator);
|
| 62 | 61 | return getReference();
|
| ... | ... | @@ -50,8 +50,7 @@ public class ContentReferentialUINavigationInitializer extends NavigationInitial |
| 50 | 50 | |
| 51 | 51 | @Override
|
| 52 | 52 | protected Object init(NavigationContext<ContentReferentialUINavigationContext> context) {
|
| 53 | - decorator = context.getDecoratorService().getDecoratorByType(references.getType(), getScope().getDecoratorClassifier());
|
|
| 54 | - context.initReference(references, decorator);
|
|
| 53 | + decorator = context.getDecoratorService().getDecoratorByType(getScope().getMainReferenceType(), getScope().getDecoratorClassifier());
|
|
| 55 | 54 | return getScope().getMainType();
|
| 56 | 55 | }
|
| 57 | 56 |
| ... | ... | @@ -29,7 +29,6 @@ import fr.ird.observe.dto.data.DataGroupByDto; |
| 29 | 29 | import fr.ird.observe.dto.data.RootOpenableDto;
|
| 30 | 30 | import fr.ird.observe.dto.reference.DataGroupByDtoSet;
|
| 31 | 31 | import fr.ird.observe.dto.reference.DtoReference;
|
| 32 | -import fr.ird.observe.dto.reference.DtoReferenceCollection;
|
|
| 33 | 32 | import fr.ird.observe.dto.reference.ReferentialDtoReference;
|
| 34 | 33 | import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
|
| 35 | 34 | import fr.ird.observe.dto.referential.ReferentialLocale;
|
| ... | ... | @@ -113,19 +112,11 @@ public class NavigationContext<C extends NavigationContext<C>> implements WithCl |
| 113 | 112 | |
| 114 | 113 | public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferenceSet(Class<R> referenceType, Decorator decorator) {
|
| 115 | 114 | ReferentialDtoReferenceSet<R> reference = getMainDataSource().getReferentialService().getReferenceSet(referenceType, null);
|
| 116 | - initReference(reference, decorator);
|
|
| 115 | + reference.stream().forEach(e -> e.registerDecorator(decorator));
|
|
| 117 | 116 | log.info(String.format("Loaded %d reference(s) of type: %s", reference.size(), reference.getType().getName()));
|
| 118 | 117 | return reference;
|
| 119 | 118 | }
|
| 120 | 119 | |
| 121 | - public final <R extends DtoReference> void initReference(DtoReferenceCollection<R> reference, Decorator decorator) {
|
|
| 122 | - if (reference == null) {
|
|
| 123 | - return;
|
|
| 124 | - }
|
|
| 125 | - reference.stream().forEach(e -> e.registerDecorator(decorator));
|
|
| 126 | - log.info(String.format("Init %d reference(s) of type: %s", reference.size(), reference.getType().getName()));
|
|
| 127 | - }
|
|
| 128 | - |
|
| 129 | 120 | public final <D extends RootOpenableDto, R extends DataGroupByDto<D>> void initReference(DataGroupByDtoSet<D, R> references) {
|
| 130 | 121 | if (references == null) {
|
| 131 | 122 | return;
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2022.62</version>
|
|
| 26 | + <version>2022.63</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|
| ... | ... | @@ -170,7 +170,7 @@ |
| 170 | 170 | <dependency>
|
| 171 | 171 | <groupId>com.github.ben-manes.caffeine</groupId>
|
| 172 | 172 | <artifactId>caffeine</artifactId>
|
| 173 | - <version>3.1.0</version>
|
|
| 173 | + <version>${lib.version.caffeine}</version>
|
|
| 174 | 174 | </dependency>
|
| 175 | 175 | <dependency>
|
| 176 | 176 | <groupId>com.google.auto.service</groupId>
|
| ... | ... | @@ -190,7 +190,7 @@ |
| 190 | 190 | <dependency>
|
| 191 | 191 | <groupId>com.google.errorprone</groupId>
|
| 192 | 192 | <artifactId>error_prone_annotations</artifactId>
|
| 193 | - <version>2.13.1</version>
|
|
| 193 | + <version>${lib.version.error_prone_annotations}</version>
|
|
| 194 | 194 | </dependency>
|
| 195 | 195 | <dependency>
|
| 196 | 196 | <groupId>com.google.guava</groupId>
|