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

[Git][ultreiaio/ird-observe][develop] 10 commits: update pom
by Tony CHEMIT 28 Feb '20

28 Feb '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 68b32ce5 by tchemit at 2020-02-28T13:53:13+01:00 update pom - - - - - 93035094 by tchemit at 2020-02-28T17:14:04+01:00 [Synchro Avancée] Certaines actions ne sont plus présentes - Closes #1447 - - - - - e755cd09 by tchemit at 2020-02-28T17:14:05+01:00 be able to deploy again to tomcat - - - - - 076149f9 by tchemit at 2020-02-28T17:14:05+01:00 Remove shade in client runner - - - - - e4c04413 by tchemit at 2020-02-28T17:14:05+01:00 Add synchro referential doc - - - - - cb23e4b3 by tchemit at 2020-02-28T17:14:05+01:00 [SYNCHRO AVANCEE] Lorsqu'aucune action de synchro n'est empilée, 'Appliquer' devrait être inactif - Closes #1444 - - - - - 2ee46dcb by tchemit at 2020-02-28T17:14:05+01:00 [SYNCHRO AVANCEE] Fonctionnement des sélections - Closes #1440 - - - - - 84bd2d75 by tchemit at 2020-02-28T17:14:05+01:00 [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441 - - - - - 61984566 by tchemit at 2020-02-28T17:14:05+01:00 add ReferentialService.loadDtoList method - - - - - 1a0741a1 by tchemit at 2020-02-28T17:14:05+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 Mise en place d'un nouveau système pour calculer les différences fines directement et utilisation sur les deux synchro de référentiels. Suppression de l'ancienne api de calcul de différences. - - - - - 30 changed files: - .gitlab-ci.yml - client-core/src/main/resources/icons/action-desactivateFromLeft.png → client-core/src/main/resources/icons/action-deactivateFromLeft.png - client-core/src/main/resources/icons/action-desactivateFromRight.png → client-core/src/main/resources/icons/action-deactivateFromRight.png - client-core/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png → client-core/src/main/resources/icons/action-deactivateWithReplaceFromLeft.png - client-core/src/main/resources/icons/action-desactivateWithReplaceFromRight.png → client-core/src/main/resources/icons/action-deactivateWithReplaceFromRight.png - client-core/src/main/resources/observe-ui.properties - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/RegisterTasksActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreeCellRenderer.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client-datasource-actions/src/main/resources/icons/action-desactivateFromLeft.png → client-datasource-actions/src/main/resources/icons/action-deactivateFromLeft.png - client-datasource-actions/src/main/resources/icons/action-desactivateFromRight.png → client-datasource-actions/src/main/resources/icons/action-deactivateFromRight.png - client-datasource-actions/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png → client-datasource-actions/src/main/resources/icons/action-deactivateWithReplaceFromLeft.png - client-datasource-actions/src/main/resources/icons/action-desactivateWithReplaceFromRight.png → client-datasource-actions/src/main/resources/icons/action-deactivateWithReplaceFromRight.png - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/common/ProgramSeineNavigationTreeNode.java - client-runner/src/main/assembly/bin.xml - dto/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/I18nTreeHelper.java → dto/src/main/java/fr/ird/observe/dto/tree/I18nTreeHelper.java - dto/src/main/models/Observe-03-referential-ps-observation.model - pom.xml - server-core/src/main/filtered-resources/mapping - server-runner/pom.xml - − services-client/src/main/java/fr/ird/observe/services/client/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceClient.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc54d9959dd6effbb6fc4ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc54d9959dd6effbb6fc4ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: update changelog [skip ci]
by Tony CHEMIT 28 Feb '20

28 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 65d3d6c2 by tchemit at 2020-02-28T13:51:30+01:00 update changelog [skip ci] - - - - - 4130ac63 by tchemit at 2020-02-28T13:51:50+01:00 fix site - - - - - 0d88df29 by tchemit at 2020-02-28T13:52:05+01:00 Add synchro referential doc - - - - - 22 changed files: - + .mvn/gitlab-cache/milestones/1005038-artifacts.json - + .mvn/gitlab-cache/milestones/1005038-issues.json - + .mvn/gitlab-cache/milestones/1005038.json - + .mvn/gitlab-cache/milestones/1005048-artifacts.json - + .mvn/gitlab-cache/milestones/1005048-issues.json - + .mvn/gitlab-cache/milestones/1005048.json - + .mvn/gitlab-cache/milestones/1110720-artifacts.json - + .mvn/gitlab-cache/milestones/1110720-issues.json - + .mvn/gitlab-cache/milestones/1110720.json - + .mvn/gitlab-cache/milestones/1115633-artifacts.json - + .mvn/gitlab-cache/milestones/1115633-issues.json - + .mvn/gitlab-cache/milestones/1115633.json - + .mvn/gitlab-cache/milestones/1117003-artifacts.json - + .mvn/gitlab-cache/milestones/1117003-issues.json - + .mvn/gitlab-cache/milestones/1117003.json - + .mvn/gitlab-cache/milestones/1117288-issues.json - + .mvn/gitlab-cache/milestones/1117288.json - + .mvn/gitlab-cache/milestones/1136007-issues.json - + .mvn/gitlab-cache/milestones/1136007.json - .mvn/gitlab-cache/milestones/268612-issues.json - .mvn/gitlab-cache/milestones/268617-issues.json - .mvn/gitlab-cache/milestones/268621-issues.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f334fec77ad9cf45c13ef181… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f334fec77ad9cf45c13ef181… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Remove shade in client runner
by Tony CHEMIT 28 Feb '20

28 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f334fec7 by tchemit at 2020-02-28T10:18:42+01:00 Remove shade in client runner - - - - - 2 changed files: - client-runner/src/main/assembly/bin.xml - pom.xml Changes: ===================================== client-runner/src/main/assembly/bin.xml ===================================== @@ -38,6 +38,14 @@ </includes> </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory/> + <includes> + <include>lib/*.jar</include> + </includes> + </fileSet> + <fileSet> <directory>target/classes</directory> <outputDirectory/> ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.3</version> + <version>2020.4</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f334fec77ad9cf45c13ef1810… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f334fec77ad9cf45c13ef1810… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] * migration du code pour être compatible avec java > 8
by Tony CHEMIT 27 Feb '20

27 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d96c7c6b by tchemit at 2020-02-27T13:26:05+01:00 * migration du code pour être compatible avec java > 8 * mise à jour de jaxx (à tester plus en profondeur) - - - - - 14 changed files: - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java - persistence/pom.xml - pom.xml - server-core/pom.xml - server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java - services-client/pom.xml - − services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java Changes: ===================================== client-core/pom.xml ===================================== @@ -618,7 +618,7 @@ </dependency> <dependency> <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-util</artifactId> + <artifactId>flexmark-util-ast</artifactId> </dependency>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java ===================================== @@ -273,8 +273,8 @@ public class AdminTabUIInitializer<UI extends AdminTabUI> { beanList.setI18nPrefix("observe.common."); Class referenceType = beanList.getBeanType(); // beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType)); - beanList.getAddButton().setFocusable(false); - beanList.getRemoveButton().setFocusable(false); + beanList.getAddAction().setFocusable(false); + beanList.getRemoveAction().setFocusable(false); log.debug("init list for " + beanList.getBeanType()); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== @@ -477,8 +477,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanList.setI18nPrefix("observe.common."); Class referenceType = beanList.getBeanType(); // beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType)); - beanList.getAddButton().setFocusable(false); - beanList.getRemoveButton().setFocusable(false); + beanList.getAddAction().setFocusable(false); + beanList.getRemoveAction().setFocusable(false); log.debug("init list for " + beanList.getBeanType()); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== @@ -429,9 +429,9 @@ public class NavigationTree extends JXTree { if (deep) { // repaint childs nodes @SuppressWarnings("unchecked") - Enumeration<NavigationTreeNodeSupport<?>> e = node.children(); + Enumeration e = node.children(); while (e.hasMoreElements()) { - NavigationTreeNodeSupport<?> child = e.nextElement(); + NavigationTreeNodeSupport<?> child = (NavigationTreeNodeSupport<?>)e.nextElement(); reloadNode(child, true); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java ===================================== @@ -133,9 +133,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration<NavigationTreeNodeSupport> children = children(); + Enumeration children = children(); while (children.hasMoreElements()) { - NavigationTreeNodeSupport node = children.nextElement(); + NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) children.nextElement(); if (id.equals(node.getId()) || (node.getUserObject() instanceof String && id.equals(node.getUserObject()))) { return node; } @@ -163,9 +163,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration<NavigationTreeNodeSupport<?>> children = children(); + Enumeration children = children(); while (children.hasMoreElements()) { - NavigationTreeNodeSupport<?> node = children.nextElement(); + NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement(); if (childType.isAssignableFrom(node.getClass())) { return node; } @@ -187,9 +187,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration<NavigationTreeNodeSupport<?>> children = children(); + Enumeration children = children(); while (children.hasMoreElements()) { - NavigationTreeNodeSupport<?> node = children.nextElement(); + NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement(); if (childType.isAssignableFrom(node.getDataType())) { return node; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java ===================================== @@ -77,6 +77,6 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo @Override public Iterator<TripLonglineNavigationTreeNode> iterator() { - return EnumerationUtils.toList(children()).iterator(); + return (Iterator)EnumerationUtils.toList(children()).iterator(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java ===================================== @@ -76,6 +76,6 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS @Override public Iterator<TripSeineNavigationTreeNode> iterator() { - return EnumerationUtils.toList(children()).iterator(); + return (Iterator)EnumerationUtils.toList(children()).iterator(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -66,13 +66,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract void setSelected(boolean selected); - @Override - public Enumeration<SelectionTreeNodeSupport> children() { - return (Enumeration) super.children(); - } - public ReferenceSelectionTreeNodeSupport findById(String id) { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration children = children(); while (children.hasMoreElements()) { ReferenceSelectionTreeNodeSupport<?, ?> child = (ReferenceSelectionTreeNodeSupport) children.nextElement(); if (id.equals(child.getData().getId())) { ===================================== persistence/pom.xml ===================================== @@ -183,6 +183,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.8.7</version> + <version>2020.3</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@  <lib.version.h2>1.4.196</lib.version.h2> <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> - <lib.version.java4all.jaxx>3.0-alpha-56</lib.version.java4all.jaxx> +  <lib.version.java4all.topia>1.1.16</lib.version.java4all.topia> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils> @@ -483,7 +483,6 @@ <reports> <report>dependency-updates-report</report> <report>plugin-updates-report</report> - <report>property-updates-report</report> </reports> </reportSet> </reportSets> ===================================== server-core/pom.xml ===================================== @@ -156,6 +156,12 @@ </exclusions> </dependency> + <dependency> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -185,6 +191,11 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> ===================================== server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java ===================================== @@ -29,8 +29,8 @@ import org.apache.logging.log4j.Logger; 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; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; import java.util.Objects; @@ -74,7 +74,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I String[] values = (String[]) parameterTree.getValue(); StringBuilder value = new StringBuilder(values[0]); if ((value.length() > 0) && !value.toString().contains("[")) { - if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) { + if (((ParameterizedType) generic).getActualTypeArguments()[0].equals(String.class)) { value = new StringBuilder(); for (String s : values) { value.append(", \"").append(s).append("\""); ===================================== services-client/pom.xml ===================================== @@ -140,7 +140,11 @@ <artifactId>junit</artifactId> </dependency> - + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> ===================================== services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java deleted ===================================== @@ -1,42 +0,0 @@ -package fr.ird.observe.services.client.referential; - -/*- - * #%L - * ObServe :: Services client implementation - * %% - * Copyright (C) 2008 - 2020 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.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.http.HttpStatus; - -import java.util.concurrent.TimeUnit; - -public class ReferentialServiceClient extends GeneratedReferentialServiceClient { - - @Override - public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R loadReference(Class<R> type, String id) { - return executeRequest(create("loadReference") - .addParameter("type", type) - .addParameter("id", id) - .addAuthToken() - .setTimeout(TimeUnit.MINUTES, 1) - .get(), HttpStatus.SC_OK).toJson(type); - } -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d96c7c6be4cbe889bf42c4355… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d96c7c6be4cbe889bf42c4355… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 7 commits: Possibilité de décider, lors de la mise à jour d'une référence, des champs que...
by Tony CHEMIT 24 Feb '20

24 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0926d9e2 by tchemit at 2020-02-22T20:00:38+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 - - - - - 358a6dce by tchemit at 2020-02-23T22:37:54+01:00 Fix species reference binder - - - - - dd6854ff by tchemit at 2020-02-23T22:39:32+01:00 add ReferentialService.loadDtoList method - - - - - 319bc1b0 by tchemit at 2020-02-24T00:21:15+01:00 be able to deploy again to tomcat - - - - - 9340c926 by tchemit at 2020-02-24T21:26:13+01:00 update pom - - - - - 9ceccbb6 by tchemit at 2020-02-24T22:16:27+01:00 [Synchro Avancée] Certaines actions ne sont plus présentes - Closes #1447 - - - - - 5a9daa21 by tchemit at 2020-02-24T22:19:35+01:00 Possibilité de décider, lors de la mise à jour d'une référence, des champs que l'on veut voir pris en compte dans la synchronisation - Closes #1329 Mise en place d'un nouveau système pour calculer les différences fines directement et utilisation sur les deux synchro de référentiels. Suppression de l'ancienne api de calcul de différences. - - - - - 30 changed files: - .gitlab-ci.yml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java - client-core/src/main/resources/icons/action-desactivateFromLeft.png → client-core/src/main/resources/icons/action-deactivateFromLeft.png - client-core/src/main/resources/icons/action-desactivateFromRight.png → client-core/src/main/resources/icons/action-deactivateFromRight.png - client-core/src/main/resources/icons/action-desactivateWithReplaceFromLeft.png → client-core/src/main/resources/icons/action-deactivateWithReplaceFromLeft.png - client-core/src/main/resources/icons/action-desactivateWithReplaceFromRight.png → client-core/src/main/resources/icons/action-deactivateWithReplaceFromRight.png - client-core/src/main/resources/observe-ui.properties - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/binder/referential/common/SpeciesDtoReferenceBinder.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/I18nTreeHelper.java → dto/src/main/java/fr/ird/observe/dto/tree/I18nTreeHelper.java - pom.xml - server-core/src/main/filtered-resources/mapping - server-runner/pom.xml - − services-client/src/main/java/fr/ird/observe/services/client/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceClient.java - services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java - − services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlGenerator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9527c1aa0e280bcc0d912cf1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9527c1aa0e280bcc0d912cf1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441
by Tony CHEMIT 19 Feb '20

19 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8439c329 by tchemit at 2020-02-19T16:41:34+01:00 [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441 - - - - - 9527c1aa by tchemit at 2020-02-19T17:01:11+01:00 fix ci docker jobs - - - - - 3 changed files: - .gitlab-ci.yml - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,7 +4,7 @@ stages: - Test - Release -image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:latest +image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker-8:lat… .stage_docker: &stage_docker stage: Docker @@ -22,7 +22,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-8 gitlab-ci-token $CI_BUILD_TOKEN; fi .build-for-release: &build-for-release environment: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java ===================================== @@ -293,7 +293,10 @@ public class ConfigModel extends AdminActionModel { // les deux bases (source et referentiel) doivent etre different validate = validateNotSameDataSources(); - + if (!validate) { + log.info("Data sources are equals!"); + return false; + } boolean atLeastOneWrite = false; ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); @@ -333,17 +336,12 @@ public class ConfigModel extends AdminActionModel { if (validate && uiModel.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { - // les deux bases (source et referentiel) doivent etre different - validate = validateNotSameDataSources(); - ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); if (leftDataSourceInformation == null) { return false; } if (!(leftDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on left data source"); - } + log.info("can not read and write referential on left data source"); return false; } @@ -353,12 +351,16 @@ public class ConfigModel extends AdminActionModel { } if (!(rightDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on right data source"); - } + log.info("can not read and write referential on right data source"); return false; } + // les deux bases (source et referentiel) doivent etre different + validate = validateNotSameDataSources(); + if (!validate) { + log.info("Data sources are equals!"); + return false; + } ReferentialSynchronizeMode synchronizeMode = uiModel.getReferentialSynchroModel().getSynchronizeMode(); if (synchronizeMode == null) { return false; @@ -407,6 +409,10 @@ public class ConfigModel extends AdminActionModel { // les deux bases (source et referentiel) doivent etre different validate = validateNotSameDataSources(); + if (!validate) { + log.info("Data sources are equals!"); + return false; + } } if (uiModel.containsOperation(AdminStep.EXPORT_DATA)) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -366,4 +366,6 @@ public class ReferentialSynchroModel extends AdminActionModel { setShowProperties(true); ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false); } + + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d986e1a1e24001f7e61b1d81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d986e1a1e24001f7e61b1d81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441
by Tony CHEMIT 19 Feb '20

19 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d986e1a1 by tchemit at 2020-02-19T16:40:58+01:00 [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java ===================================== @@ -333,17 +333,12 @@ public class ConfigModel extends AdminActionModel { if (validate && uiModel.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { - // les deux bases (source et referentiel) doivent etre different - validate = validateNotSameDataSources(); - ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); if (leftDataSourceInformation == null) { return false; } if (!(leftDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on left data source"); - } + log.info("can not read and write referential on left data source"); return false; } @@ -353,12 +348,16 @@ public class ConfigModel extends AdminActionModel { } if (!(rightDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on right data source"); - } + log.info("can not read and write referential on right data source"); return false; } + // les deux bases (source et referentiel) doivent etre different + validate = validateNotSameDataSources(); + if (!validate) { + log.info("Data sources are equals!"); + return false; + } ReferentialSynchronizeMode synchronizeMode = uiModel.getReferentialSynchroModel().getSynchronizeMode(); if (synchronizeMode == null) { return false; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -366,4 +366,6 @@ public class ReferentialSynchroModel extends AdminActionModel { setShowProperties(true); ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false); } + + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d986e1a1e24001f7e61b1d817… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d986e1a1e24001f7e61b1d817… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [SYNCHRO AVANCEE] Lorsqu'aucune action de synchro n'est empilée, 'Appliquer'...
by Tony CHEMIT 19 Feb '20

19 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c60939d4 by tchemit at 2020-02-19T16:19:50+01:00 [SYNCHRO AVANCEE] Lorsqu'aucune action de synchro n'est empilée, 'Appliquer' devrait être inactif - Closes #1444 - - - - - cecddb82 by tchemit at 2020-02-19T16:24:36+01:00 [SYNCHRO AVANCEE] Fonctionnement des sélections - Closes #1440 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -364,5 +364,6 @@ public class ReferentialSynchroModel extends AdminActionModel { setSynchronizeMode(ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT); setShowProperties(true); + ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java ===================================== @@ -226,6 +226,9 @@ public abstract class RegisterTasksActionSupport extends ObserveActionSupport { treeModel.removeReferenceNodes(removedNodes); ui.getStepModel().getTasks().addTasks(addedTasks); + if (!ui.getStepModel().getTasks().isEmpty()) { + ui.getApplyAction().setEnabled(true); + } } protected Collection<ReferenceReferentialSynchroNodeSupport> getReferenceReferentialSynchroNodes(Predicate<ReferenceReferentialSynchroNodeSupport> predicate) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java ===================================== @@ -120,9 +120,7 @@ public class ReferentialSelectionTree extends JXTree { ReferentialSynchroNodeSupport node = (ReferentialSynchroNodeSupport) lastPathComponent; boolean newValue = !node.isSelected(); log.info(String.format("Node: %s - new selected value: %s", node, newValue)); - node.setSelected(newValue); - getModel().valueForPathChanged(path, node.getUserObject()); - updateActions(); + getTreeModel().setValueAt(node, newValue); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0016aa37b80bf3e0f89720d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0016aa37b80bf3e0f89720d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Go to version 7.4.0 (and change model version)
by Tony CHEMIT 18 Feb '20

18 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 53375524 by tchemit at 2020-02-18T11:58:26+01:00 Go to version 7.4.0 (and change model version) - - - - - eea99bdc by tchemit at 2020-02-18T12:09:58+01:00 [V7-V8] Ajustement du modèle - Part 1 - See #1438 - - - - - 0016aa37 by tchemit at 2020-02-18T16:49:12+01:00 [V7-V8] Ajustement du modèle - Part 3 - Closes #1438 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthnessUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthStatusUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthnessUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthStatusUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthnessUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthStatusUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomacFullnessUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomachFullnessUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomacFullnessUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomachFullnessUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomacFullnessUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/StomachFullnessUIModel.java - client-runner/pom.xml - dto/pom.xml - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/binder/referential/longline/HealthnessDtoReferenceBinder.java → dto/src/main/java/fr/ird/observe/binder/referential/longline/HealthStatusDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/longline/StomacFullnessDtoReferenceBinder.java → dto/src/main/java/fr/ird/observe/binder/referential/longline/StomachFullnessDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe.model - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ec7af112eda9d89493e8ccb3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ec7af112eda9d89493e8ccb3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [V7-V8] Ajustement du modèle - Part 1 - See #1438
by Tony CHEMIT 18 Feb '20

18 Feb '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0ff6521a by tchemit at 2020-02-18T12:10:35+01:00 [V7-V8] Ajustement du modèle - Part 1 - See #1438 - - - - - 7aab79f2 by tchemit at 2020-02-18T12:38:04+01:00 [V7-V8] Ajustement du modèle - Part 2 - See #1438 - - - - - dfc54d99 by tchemit at 2020-02-18T19:30:23+01:00 [V7-V8] Ajustement du modèle - Part 3 - Closes #1438 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-datasource-editor-common/src/main/i18n/getters/jaxx.getter - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/ProgramUI.jaxx - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthnessUI.jaxx → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthStatusUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthnessUIHandler.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthStatusUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthnessUIModel.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/HealthStatusUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomacFullnessUI.jaxx → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomachFullnessUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomacFullnessUIHandler.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomachFullnessUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomacFullnessUIModel.java → client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/StomachFullnessUIModel.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/ProtectedIds.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlCommonModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlObservationModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-10-referential-ll-common.model - dto/src/main/models/Observe-11-referential-ll-observation.model - dto/src/main/models/Observe-20-data-ps-observation.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f8e27c3845e212f11957a933… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f8e27c3845e212f11957a933… You're receiving this email because of your account on gitlab.com.

1 0